Merge pull request #416 from HANXP-1/hanxp

add the version information of the node to kwok{{ Version }}
kubernetes-sigs · Mar 27, 2023 · c491052 · c491052
2 parents 7ce3d5b + f2c523d
commit c491052
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/pkg/kwok/controllers/controller.go b/pkg/kwok/controllers/controller.go
@@ -32,6 +32,7 @@ import (
 	"sigs.k8s.io/yaml"
 
 	"sigs.k8s.io/kwok/pkg/apis/internalversion"
+	"sigs.k8s.io/kwok/pkg/consts"
 )
 
 var (
@@ -57,6 +58,9 @@ var (
 			}
 			return data, nil
 		},
+		"Version": func() string {
+			return consts.Version
+		},
 	}
 )
 

diff --git a/stages/node-fast.yaml b/stages/node-fast.yaml
@@ -66,10 +66,10 @@ spec:
       nodeInfo:
         architecture: {{ with .architecture }} {{ . }} {{ else }} "amd64" {{ end }}
         bootID: {{ with .bootID }} {{ . }} {{ else }} "" {{ end }}
-        containerRuntimeVersion: {{ with .containerRuntimeVersion }} {{ . }} {{ else }} "" {{ end }}
-        kernelVersion: {{ with .kernelVersion }} {{ . }} {{ else }} "" {{ end }}
-        kubeProxyVersion: {{ with .kubeProxyVersion }} {{ . }} {{ else }} "fake" {{ end }}
-        kubeletVersion: {{ with .kubeletVersion }} {{ . }} {{ else }} "fake" {{ 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 }}