fix: add kubernetes node_name in json

wiremind · May 31, 2024 · 90da789 · 90da789
1 parent c5c21ae
commit 90da789
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 5 deletions.
diff --git a/bs/bs.go b/bs/bs.go
@@ -13,5 +13,6 @@ type BlockStorageInfos struct {
 	Type      string            `json:"type"`
 	BlockDev  string            `json:"block_dev"`
 	Status    string            `json:"status"`
+	NodeName  string            `json:"node_name"`
 	Metadata  map[string]string `json:"metadata"`
 }
diff --git a/bs/fs_linux.go b/bs/fs_linux.go
@@ -359,6 +359,9 @@ func ExtractBsInfos(m *machine.MachineInfos) map[uuid.UUID]*BlockStorageInfos {
 
 		// Add machine UUID
 		i.MachineId = m.Uuid
+
+		// Add machine node name
+		i.NodeName = m.KubeNodeName
 		infos[i.Uuid] = i
 	}
 

diff --git a/bs/openstack.go b/bs/openstack.go
@@ -50,6 +50,7 @@ func openstackVolumesServiceAuth() (*gophercloud.ServiceClient, error) {
 }
 
 type MultiAttachments struct {
+	NodeName    string      `json:"node_name"`
 	MultiAttach MultiAttach `json:"multi-attach"`
 }
 
@@ -64,6 +65,7 @@ type OpenstackAttach struct {
 	HostName     string `json:"host_name"`
 	ServerId     string `json:"server_id"`
 	VolumeId     string `json:"volume_id"`
+	NodeName     string `json:"node_name"`
 }
 
 func openstackAllVolumes() ([]volumes.Volume, error) {
@@ -121,6 +123,7 @@ func OpenstackGetMultiAttachments(machineInfos *machine.MachineInfos) (*MultiAtt
 						HostName:     attachment.HostName,
 						ServerId:     attachment.ServerID,
 						VolumeId:     attachment.VolumeID,
+						NodeName:     machineInfos.KubeNodeName,
 					}
 					attachments = append(attachments, openstack_attach)
 				}
@@ -129,6 +132,7 @@ func OpenstackGetMultiAttachments(machineInfos *machine.MachineInfos) (*MultiAtt
 	}
 
 	multiAttachments := MultiAttachments{
+		NodeName: machineInfos.KubeNodeName,
 		MultiAttach: MultiAttach{
 			Count: len(attachments),
 			Data:  attachments,
@@ -214,6 +218,7 @@ func OpenstackGetBlockStorage(machineInfos *machine.MachineInfos) (map[uuid.UUID
 			Type:      machine.BsUnknown,
 			BlockDev:  "unknown",
 			Status:    vol.Status,
+			NodeName:  machineInfos.KubeNodeName,
 			Metadata:  vol.Metadata,
 		}
 	}

diff --git a/cmd/koherence/check/bs.go b/cmd/koherence/check/bs.go
@@ -22,8 +22,9 @@ type bsTuple struct {
 type IncoherenceError struct{}
 
 type All struct {
-	Merged Merged `json:"merged"`
-	Diff   Diff   `json:"diff"`
+	NodeName string `json:"node_name"`
+	Merged   Merged `json:"merged"`
+	Diff     Diff   `json:"diff"`
 }
 
 type Merged struct {
@@ -60,7 +61,7 @@ func GetBsProvider(machineInfos *machine.MachineInfos) (map[uuid.UUID]*bs.BlockS
 	}
 }
 
-func BsMerge(bsFs map[uuid.UUID]*bs.BlockStorageInfos, bsProvider map[uuid.UUID]*bs.BlockStorageInfos) ([]byte, error) {
+func BsMerge(machineInfos *machine.MachineInfos, bsFs map[uuid.UUID]*bs.BlockStorageInfos, bsProvider map[uuid.UUID]*bs.BlockStorageInfos) ([]byte, error) {
 	var b []byte
 	var err error
 
@@ -104,6 +105,7 @@ func BsMerge(bsFs map[uuid.UUID]*bs.BlockStorageInfos, bsProvider map[uuid.UUID]
 				Type:      v.Type,
 				BlockDev:  v.BlockDev,
 				Status:    p.Status,
+				NodeName:  v.NodeName,
 				Metadata:  p.Metadata,
 			}
 		}
@@ -119,6 +121,7 @@ func BsMerge(bsFs map[uuid.UUID]*bs.BlockStorageInfos, bsProvider map[uuid.UUID]
 	}
 
 	all := All{
+		NodeName: machineInfos.KubeNodeName,
 		Merged: Merged{
 			Count: len(BsMerged),
 			Data:  merged,
@@ -157,7 +160,7 @@ func bsCheckerCommand(clicontext *cli.Context) error {
 		return err
 	}
 
-	b, err := BsMerge(bsFs, bsProvider)
+	b, err := BsMerge(machineInfos, bsFs, bsProvider)
 
 	if b != nil {
 		fmt.Fprintln(os.Stdout, string(b))

diff --git a/cmd/koherence/serve.go b/cmd/koherence/serve.go
@@ -128,7 +128,7 @@ func checkBsHandler(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	b, _ := check.BsMerge(bsFs, bsProvider)
+	b, _ := check.BsMerge(machineInfos, bsFs, bsProvider)
 
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)

diff --git a/machine/fs_linux.go b/machine/fs_linux.go
@@ -105,5 +105,6 @@ func ReadFsInfos() (*MachineInfos, error) {
 		SysVendor:        string(sysVendor),
 		ChassisVendor:    string(chassisVendor),
 		BlockStorageType: getBSType(),
+		KubeNodeName:     os.Getenv("KUBE_NODE_NAME"),
 	}, nil
 }
diff --git a/machine/machine.go b/machine/machine.go
@@ -23,4 +23,5 @@ type MachineInfos struct {
 	SysVendor        string    `json:"sys_vendor"`
 	ChassisVendor    string    `json:"chassis_vendor"`
 	BlockStorageType string    `json:"block_storage_type"`
+	KubeNodeName     string    `json:"node_name"`
 }
diff --git a/machine/openstack_linklocal.go b/machine/openstack_linklocal.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"log/slog"
 	"net/http"
+	"os"
 	"time"
 
 	"github.com/google/uuid"
@@ -103,5 +104,6 @@ func ReadOpenstackInfos() (*MachineInfos, error) {
 		SysVendor:        ProviderOpenstack,
 		ChassisVendor:    "QEMU",
 		BlockStorageType: "None",
+		KubeNodeName:     os.Getenv("KUBE_NODE_NAME"),
 	}, nil
 }