Fix node info not filling

kubernetes-sigs · May 13, 2024 · 8f7fefc · 8f7fefc
1 parent 3b622ae
commit 8f7fefc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/kustomize/stage/node/fast/node-initialize.yaml b/kustomize/stage/node/fast/node-initialize.yaml
@@ -62,17 +62,18 @@ spec:
         memory: 1Ti
         pods: 1M
       {{ end }}
-      {{ with .status.nodeInfo }}
+
+      {{ $nodeInfo := .status.nodeInfo }}
+      {{ $kwokVersion := printf "kwok-%s" Version }}
       nodeInfo:
-        architecture: {{ with .architecture }} {{ . }} {{ else }} "amd64" {{ end }}
-        bootID: {{ with .bootID }} {{ . }} {{ else }} "" {{ end }}
-        containerRuntimeVersion: {{ with .containerRuntimeVersion }} {{ . }} {{ else }} "kwok-{{ Version }}" {{ end }}
-        kernelVersion: {{ with .kernelVersion }} {{ . }} {{ else }} "kwok-{{ Version }}" {{ end }}
-        kubeProxyVersion: {{ with .kubeProxyVersion }} {{ . }} {{ else }} "kwok-{{ Version }}" {{ end }}
-        kubeletVersion: {{ with .kubeletVersion }} {{ . }} {{ else }} "kwok-{{ Version }}" {{ end }}
-        machineID: {{ with .machineID }} {{ . }} {{ else }} "" {{ end }}
-        operatingSystem: {{ with .operatingSystem }} {{ . }} {{ else }} "linux" {{ end }}
-        osImage: {{ with .osImage }} {{ . }} {{ else }} "" {{ end }}
-        systemUUID: {{ with .systemUUID }} {{ . }} {{ else }} "" {{ end }}
-      {{ end }}
+        architecture: {{ or $nodeInfo.architecture "amd64" }}
+        bootID: {{ or $nodeInfo.bootID `""` }}
+        containerRuntimeVersion: {{ or $nodeInfo.containerRuntimeVersion $kwokVersion }}
+        kernelVersion: {{ or $nodeInfo.kernelVersion $kwokVersion }}
+        kubeProxyVersion: {{ or $nodeInfo.kubeProxyVersion $kwokVersion }}
+        kubeletVersion: {{ or $nodeInfo.kubeletVersion $kwokVersion }}
+        machineID: {{ or $nodeInfo.machineID `""` }}
+        operatingSystem: {{ or $nodeInfo.operatingSystem "linux" }}
+        osImage: {{ or $nodeInfo.osImage `""` }}
+        systemUUID: {{ or $nodeInfo.systemUUID `""` }}
       phase: Running
diff --git a/kustomize/stage/node/fast/testdata/node-pending.output.yaml b/kustomize/stage/node/fast/testdata/node-pending.output.yaml
@@ -52,6 +52,17 @@ stages:
         daemonEndpoints:
           kubeletEndpoint:
             Port: <NodePort>
+        nodeInfo:
+          architecture: amd64
+          bootID: ""
+          containerRuntimeVersion: kwok-<Version>
+          kernelVersion: kwok-<Version>
+          kubeProxyVersion: kwok-<Version>
+          kubeletVersion: kwok-<Version>
+          machineID: ""
+          operatingSystem: linux
+          osImage: ""
+          systemUUID: ""
         phase: Running
     kind: patch
     subresource: status