Merge pull request #5508 from makhov/add-version-to-controlnode-status

Publish version in controlnode status

Author: makhov

pkg/apis/autopilot/v1beta2/types.go

@@ -36,7 +36,8 @@ type ControlNode struct {
 
 // ControlNodeStatus has the runtime status info of the controller such as address etc.
 type ControlNodeStatus struct {
-	Addresses []corev1.NodeAddress `json:"addresses,omitempty"`
+	Addresses  []corev1.NodeAddress `json:"addresses,omitempty"`
+	K0sVersion string               `json:"k0sVersion,omitempty"`
 }
 
 // GetInternalIP returns the internal IP address for the object. Returns empty string if the object does not have InternalIP set.

pkg/autopilot/controller/setup.go

@@ -26,6 +26,7 @@ import (
 	apcli "github.com/k0sproject/k0s/pkg/autopilot/client"
 	apcomm "github.com/k0sproject/k0s/pkg/autopilot/common"
 	apconst "github.com/k0sproject/k0s/pkg/autopilot/constant"
+	"github.com/k0sproject/k0s/pkg/build"
 	"github.com/k0sproject/k0s/pkg/component/status"
 	"github.com/k0sproject/k0s/pkg/kubernetes/watch"
 
@@ -174,7 +175,8 @@ func (sc *setupController) createControlNode(ctx context.Context, cf apcli.Facto
 	}
 
 	node.Status = apv1beta2.ControlNodeStatus{
-		Addresses: addresses,
+		Addresses:  addresses,
+		K0sVersion: build.Version,
 	}
 
 	logger.Infof("Updating controlnode status '%s'", name)

static/_crds/autopilot/autopilot.k0sproject.io_controlnodes.yaml

@@ -58,6 +58,8 @@ spec:
                   - type
                   type: object
                 type: array
+              k0sVersion:
+                type: string
             type: object
         type: object
     served: true