Update old references

apedriza · apedriza · commit b3f7c05fb020 · 2025-11-19T10:44:36.000+01:00
Signed-off-by: apedriza &lt;adripedriza@gmail.com&gt;
diff --git a/api/k0smotron.io/v1beta1/k0smotroncluster_types.go b/api/k0smotron.io/v1beta1/k0smotroncluster_types.go
@@ -191,7 +191,8 @@ func (c *ClusterSpec) GetK0sImageRef() string {
 		k0sTag = DefaultK0SVersion
 	}
 
-	if !strings.Contains(k0sTag, "+k0s.") {
+	// Old references might contain "-k0s." suffix instead of "+k0s." so we check only for the presence of "k0s."
+	if !strings.Contains(k0sTag, "k0s.") {
 		k0sTag = fmt.Sprintf("%s+%s", k0sTag, DefaultK0SSuffix)
 	}
 
diff --git a/config/samples/capi/capi-controlplane-hetzner.yaml b/config/samples/capi/capi-controlplane-hetzner.yaml
@@ -24,7 +24,7 @@ kind: K0smotronControlPlane # This would somehow map to k0smotron
 metadata:
   name: cp-test
 spec:
-  version: v1.27.2-k0s.0
+  version: v1.27.2+k0s.0
   persistence:
     type: emptyDir
   service:
diff --git a/config/samples/capi/docker/cluster-with-machinedeployment.yaml b/config/samples/capi/docker/cluster-with-machinedeployment.yaml
@@ -26,7 +26,7 @@ kind: K0smotronControlPlane
 metadata:
   name: docker-md-test
 spec:
-  version: v1.27.2-k0s.0
+  version: v1.27.2+k0s.0
   persistence:
     type: emptyDir
   service:
diff --git a/config/samples/capi/docker/docker-cluster.yaml b/config/samples/capi/docker/docker-cluster.yaml
@@ -26,7 +26,7 @@ kind: K0smotronControlPlane
 metadata:
   name: docker-test
 spec:
-  version: v1.27.2-k0s.0
+  version: v1.27.2+k0s.0
   persistence:
     type: emptyDir
   service:
diff --git a/docs/capi-aws.md b/docs/capi-aws.md
@@ -50,7 +50,7 @@ kind: K0smotronControlPlane # This is the config for the controlplane
 metadata:
   name: k0s-aws-test-cp
 spec:
-  version: v1.27.2-k0s.0
+  version: v1.27.2+k0s.0
   persistence:
     type: emptyDir
   service:
diff --git a/docs/capi-controlplane.md b/docs/capi-controlplane.md
@@ -30,7 +30,7 @@ kind: K0smotronControlPlane
 metadata:
   name: cp-test
 spec:
-  version: v1.27.2-k0s.0
+  version: v1.27.2+k0s.0
   persistence:
     type: emptyDir
   service:
diff --git a/docs/capi-docker.md b/docs/capi-docker.md
@@ -54,7 +54,7 @@ metadata:
   name: docker-test-cp
   namespace: default
 spec:
-  version: v1.27.2-k0s.0
+  version: v1.27.2+k0s.0
   persistence:
     type: emptyDir
   service:
diff --git a/docs/capi-hetzner.md b/docs/capi-hetzner.md
@@ -51,7 +51,7 @@ kind: K0smotronControlPlane # This is the config for the controlplane
 metadata:
   name: hetzner-test-cp
 spec:
-  version: v1.27.2-k0s.0
+  version: v1.27.2+k0s.0
   persistence:
     type: emptyDir
   service:
diff --git a/docs/capi-kubevirt.md b/docs/capi-kubevirt.md
@@ -64,7 +64,7 @@ kind: K0smotronControlPlane # This is the config for the controlplane
 metadata:
   name: k0s-test-cp
 spec:
-  version: v1.27.4-k0s.0
+  version: v1.27.4+k0s.0
   persistence:
     type: emptyDir
   service:
diff --git a/docs/capi-remote.md b/docs/capi-remote.md
@@ -41,7 +41,7 @@ metadata:
   name: remote-test
   namespace: default
 spec:
-  version: v1.27.2-k0s.0
+  version: v1.27.2+k0s.0
   persistence:
     type: emptyDir
   service:
diff --git a/docs/capi-vsphere.md b/docs/capi-vsphere.md
@@ -5,19 +5,19 @@ This example demonstrates how k0smotron can be used with CAPV (Cluster API Provi
 **Table of Contents**
 
 - [Cluster API - VMware](#cluster-api---vmware)
-  * [Setting the scene](#setting-the-scene)
-  * [Preparations](#preparations)
-    + [Configure clusterctl on the local machine](#configure-clusterctl-on-the-local-machine)
-    + [Deploy Cluster API in the management cluster](#deploy-cluster-api-in-the-management-cluster)
-    + [(Optional) IPAM IP pool creation](#optional-ipam-ip-pool-creation)
-  * [(Optional) MetalLB as Load Balancer solution in the management cluster](#optional-metallb-as-load-balancer-solution-in-the-management-cluster)
-  * [Operating child clusters](#operating-child-clusters)
-    + [Generate a child cluster definition using the template](#generate-a-child-cluster-definition-using-the-template)
-      - [Control plane in Pods](#control-plane-in-pods)
-      - [Control plane in VMs](#control-plane-in-vms)
-    + [Deploy the child clusters](#deploy-the-child-clusters)
-    + [Observe the child cluster objects](#observe-the-child-cluster-objects)
-    + [Deleting the child cluster](#deleting-the-child-cluster)
+  - [Setting the scene](#setting-the-scene)
+  - [Preparations](#preparations)
+    - [Configure clusterctl on the local machine](#configure-clusterctl-on-the-local-machine)
+    - [Deploy Cluster API in the management cluster](#deploy-cluster-api-in-the-management-cluster)
+    - [(Optional) IPAM IP pool creation](#optional-ipam-ip-pool-creation)
+  - [(Optional) MetalLB as Load Balancer solution in the management cluster](#optional-metallb-as-load-balancer-solution-in-the-management-cluster)
+  - [Operating child clusters](#operating-child-clusters)
+    - [Generate a child cluster definition using the template](#generate-a-child-cluster-definition-using-the-template)
+      - [Control plane in Pods:](#control-plane-in-pods)
+      - [Control plane in VMs:](#control-plane-in-vms)
+    - [Deploy the child clusters](#deploy-the-child-clusters)
+    - [Observe the child cluster objects](#observe-the-child-cluster-objects)
+    - [Deleting the child cluster](#deleting-the-child-cluster)
 
 ## Setting the scene
 
@@ -63,7 +63,7 @@ VSPHERE_STORAGE_POLICY: ""                                    # This is the vSph
                                                               #  Keep this close to the minimum Kubernetes version of the cluster being created.
 CSI_INSECURE: "1"
 K0S_VERSION: "v1.29.1+k0s.1"
-K0S_CP_VERSION: "v1.29.1-k0s.1"
+K0S_CP_VERSION: "v1.29.1+k0s.1"
 NODE_IPAM_POOL_NAME: "ipam-ip-pool"
 NODE_IPAM_POOL_API_GROUP: "ipam.cluster.x-k8s.io"
 NODE_IPAM_POOL_KIND: "InClusterIPPool"
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -10,7 +10,7 @@ metadata:
 spec:
   replicas: 1
   image: quay.io/k0sproject/k0s
-  version: v1.27.1-k0s.0
+  version: v1.27.1+k0s.0
   service:
     type: NodePort
     apiPort: 30443
diff --git a/docs/hcp-autoscaling.md b/docs/hcp-autoscaling.md
@@ -38,7 +38,7 @@ metadata:
   namespace: default
 spec:
   replicas: 1
-  version: "v1.31.5-k0s.0"
+  version: "v1.31.5+k0s.0"
   service:
     type: NodePort
   resources:
diff --git a/docs/ingress-support.md b/docs/ingress-support.md
@@ -59,7 +59,7 @@ metadata:
   name: my-cluster-cp
   namespace: default
 spec:
-  version: v1.34.0-k0s.0
+  version: v1.34.0+k0s.0
   ingress:
     apiHost: kube-api.example.com
     konnectivityHost: konnectivity.example.com
@@ -80,7 +80,7 @@ metadata:
   name: my-cluster
   namespace: default
 spec:
-  version: v1.34.0-k0s.0
+  version: v1.34.0+k0s.0
   ingress:
     apiHost: kube-api.example.com
     konnectivityHost: konnectivity.example.com
diff --git a/docs/update/hcp-autopilot.md b/docs/update/hcp-autopilot.md
@@ -20,7 +20,7 @@ metadata:
 spec:
   replicas: 1
   k0sImage: quay.io/k0sproject/k0s
-  version: v1.33.1-k0s.0 # new k0s version
+  version: v1.33.1+k0s.0 # new k0s version
 ```
 
 !!! warning
diff --git a/docs/update/update-cluster-pod.md b/docs/update/update-cluster-pod.md
@@ -34,7 +34,7 @@ the k0s version and machine names in the YAML configuration file:
     metadata:
       name: docker-test-cp
     spec:
-      version: v1.27.2-k0s.0
+      version: v1.27.2+k0s.0
     ```
 2. Make sure that the [persistence](../resource-reference/k0smotron.io-v1beta1.md#clusterspecpersistence) is configured
 to prevent data loss. For example:
@@ -46,7 +46,7 @@ to prevent data loss. For example:
     metadata:
       name: docker-test-cp
     spec:
-      version: v1.27.2-k0s.0
+      version: v1.27.2+k0s.0
       persistence:
         type: hostPath
         hostPath: "/tmp/kmc-test" # k0smotron will mount a basic hostPath volume to avoid data loss.
@@ -64,7 +64,7 @@ to prevent data loss. For example:
    metadata:
      name: cp-test
    spec:
-     version: v1.28.7-k0s.0 # new k0s version
+     version: v1.28.7+k0s.0 # new k0s version
    ```
 
 4. In the same configuration, replace the names of machines running the old k0smotron version
diff --git a/docs/update/update-standalone.md b/docs/update/update-standalone.md
@@ -13,7 +13,7 @@ in the YAML configuration file:
     spec:
       replicas: 1
       k0sImage: quay.io/k0sproject/k0s
-      version: v1.27.1-k0s.0
+      version: v1.27.1+k0s.0
     ```
 
 2. Change all the k0s versions to the target one. For example:
@@ -26,7 +26,7 @@ in the YAML configuration file:
     spec:
       replicas: 1
       k0sImage: quay.io/k0sproject/k0s
-      version: v1.28.7-k0s.0 # new k0s version
+      version: v1.28.7+k0s.0 # new k0s version
     ```
 
 3. Update the resources:
diff --git a/e2e/data/infrastructure-docker/main/bases/cluster-with-hcp.yaml b/e2e/data/infrastructure-docker/main/bases/cluster-with-hcp.yaml
@@ -29,7 +29,7 @@ metadata:
   namespace: ${NAMESPACE}
 spec:
   replicas: ${CONTROL_PLANE_MACHINE_COUNT}
-  version: v1.30.1-k0s.0
+  version: v1.30.1+k0s.0
   service:
     type: NodePort
 
diff --git a/e2e/data/infrastructure-docker/main/cluster-template-ingress/cluster-with-ingress.yaml b/e2e/data/infrastructure-docker/main/cluster-template-ingress/cluster-with-ingress.yaml
@@ -27,7 +27,7 @@ kind: K0smotronControlPlane
 metadata:
   name: ${CLUSTER_NAME}-cp
 spec:
-  version: v1.34.1-k0s.0
+  version: v1.34.1+k0s.0
   ingress:
     apiHost: kube-api.${KIND_IP}.nip.io
     konnectivityHost: konnectivity.${KIND_IP}.nip.io
diff --git a/e2e/data/infrastructure-docker/main/cluster-template-remote-hcp/hcp-with-external-cluster-patch.yaml b/e2e/data/infrastructure-docker/main/cluster-template-remote-hcp/hcp-with-external-cluster-patch.yaml
@@ -9,7 +9,7 @@ spec:
     namespace: ${NAMESPACE}
     key: value
   replicas: ${CONTROL_PLANE_MACHINE_COUNT}
-  version: v1.30.1-k0s.0
+  version: v1.30.1+k0s.0
   service:
     type: NodePort
 
diff --git a/inttest/capi-docker/capi_docker_test.go b/inttest/capi-docker/capi_docker_test.go
@@ -258,7 +258,7 @@ kind: K0smotronControlPlane
 metadata:
   name: docker-test-cp
 spec:
-  version: v1.31.2-k0s.0
+  version: v1.31.2+k0s.0
   certificateRefs:
     - name: docker-test-ca
       type: ca
diff --git a/inttest/capi-remote-machine-job-provision/capi_remote_machine_job_provision_test.go b/inttest/capi-remote-machine-job-provision/capi_remote_machine_job_provision_test.go
@@ -274,7 +274,7 @@ metadata:
   name: remote-test
   namespace: default
 spec:
-  version: v1.27.2-k0s.0
+  version: v1.27.2+k0s.0
   persistence:
     type: emptyDir
   service:
diff --git a/inttest/capi-remote-machine/capi_remote_machine_test.go b/inttest/capi-remote-machine/capi_remote_machine_test.go
@@ -291,7 +291,7 @@ metadata:
   name: remote-test
   namespace: default
 spec:
-  version: {{ .K0SVersion }}-k0s.0
+  version: {{ .K0SVersion }}+k0s.0
   persistence:
     type: emptyDir
   service:
diff --git a/inttest/config-update-hcp/config_update_test.go b/inttest/config-update-hcp/config_update_test.go
@@ -205,7 +205,7 @@ metadata:
 		  "namespace": "kmc-test"
 		},
 		"spec": {
-			"version": "v1.31.5-k0s.0",
+			"version": "v1.31.5+k0s.0",
 			"service":{
 				"type": "NodePort"
 			},
diff --git a/inttest/ha-controller-etcd/ha_controller_etcd_test.go b/inttest/ha-controller-etcd/ha_controller_etcd_test.go
@@ -133,7 +133,7 @@ func (s *HAControllerEtcdSuite) createK0smotronCluster(ctx context.Context, kc *
 		},
 		"spec": {
 		    "replicas": 3,
-			"version": "v1.31.2-k0s.0",
+			"version": "v1.31.2+k0s.0",
 			"service":{
 				"type": "NodePort"
 			},
@@ -161,7 +161,7 @@ func (s *HAControllerEtcdSuite) updateK0smotronCluster(ctx context.Context, rc *
 	crdRestClient, err := rest.UnversionedRESTClientFor(&crdConfig)
 	s.Require().NoError(err)
 
-	patch := `[{"op": "replace", "path": "/spec/version", "value": "v1.31.5-k0s.0"}]`
+	patch := `[{"op": "replace", "path": "/spec/version", "value": "v1.31.5+k0s.0"}]`
 	res := crdRestClient.
 		Patch(types.JSONPatchType).
 		Resource("clusters").
diff --git a/inttest/ha-controller-secret/ha_controller_secret_test.go b/inttest/ha-controller-secret/ha_controller_secret_test.go
@@ -149,7 +149,7 @@ func (s *HAControllerSecretSuite) createK0smotronClusterWithSecretRef(ctx contex
 		},
 		"spec": {
 			"replicas": 3,
-			"version": "v1.31.5-k0s.0",
+			"version": "v1.31.5+k0s.0",
 			"service":{
 				"type": "NodePort"
 			},
diff --git a/inttest/hostpath/hostpath_test.go b/inttest/hostpath/hostpath_test.go
@@ -123,7 +123,7 @@ func (s *HostPathSuite) createK0smotronCluster(ctx context.Context, kc *kubernet
 			"service":{
 				"type": "NodePort"
 			},
-			"version": "v1.31.5-k0s.0",
+			"version": "v1.31.5+k0s.0",
 			"persistence": {
 				"type": "hostPath",
 				"hostPath": "/tmp/kmc-test"
diff --git a/inttest/jointoken/jointoken_test.go b/inttest/jointoken/jointoken_test.go
@@ -108,7 +108,7 @@ func (s *JoinTokenSuite) createK0smotronCluster(ctx context.Context, kc *kuberne
 		  "namespace": "kmc-test"
 		},
 		"spec": {
-			"version": "v1.31.5-k0s.0",
+			"version": "v1.31.5+k0s.0",
 			"k0sConfig": {
 				"apiVersion": "k0s.k0sproject.io/v1beta1",
 				"kind": "ClusterConfig",
diff --git a/inttest/monitoring/monitoring_test.go b/inttest/monitoring/monitoring_test.go
@@ -134,7 +134,7 @@ func (s *MonitoringSuite) createK0smotronCluster(ctx context.Context, kc *kubern
 		  "namespace": "kmc-test"
 		},
 		"spec": {
-   			"version": "v1.31.5-k0s.0",
+   			"version": "v1.31.5+k0s.0",
 			"monitoring": {
 				"enabled": true
 			},
diff --git a/inttest/pvc/pvc_test.go b/inttest/pvc/pvc_test.go
@@ -163,7 +163,7 @@ func (s *PVCSuite) createK0smotronCluster(ctx context.Context, kc *kubernetes.Cl
 		  "namespace": "kmc-test"
 		},
 		"spec": {
-   			"version": "v1.31.5-k0s.0",
+   			"version": "v1.31.5+k0s.0",
 			"etcd":{
 				"persistence": {"size": "50Mi", "storageClass": "seaweedfs-storage"}
 			},
diff --git a/inttest/scaling-etcd/scaling_etcd_test.go b/inttest/scaling-etcd/scaling_etcd_test.go
@@ -200,7 +200,7 @@ var clusterResource = `
 		},
 		"spec": {
 			"replicas": 1,
-   			"version": "v1.31.5-k0s.0",
+   			"version": "v1.31.5+k0s.0",
 			"service":{
 				"type": "NodePort"
 			},
diff --git a/inttest/upgrade/upgrade_test.go b/inttest/upgrade/upgrade_test.go
@@ -211,7 +211,7 @@ metadata:
 		  "namespace": "kmc-test"
 		},
 		"spec": {
-   			"version": "v1.31.5-k0s.0",
+   			"version": "v1.31.5+k0s.0",
 			"service":{
 				"type": "NodePort"
 			},
diff --git a/templates/cluster-template-hcp.yaml b/templates/cluster-template-hcp.yaml
@@ -24,7 +24,7 @@ metadata:
   name: ${CLUSTER_NAME}-control-plane
 spec:
   replicas: ${CONTROL_PLANE_MACHINE_COUNT}
-  version: ${KUBERNETES_VERSION}-k0s.0
+  version: ${KUBERNETES_VERSION}+k0s.0
   persistence:
     type: emptyDir
   service:

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,8 @@ func (c *ClusterSpec) GetK0sImageRef() string {`
`191`	`191`	`k0sTag = DefaultK0SVersion`
`192`	`192`	`}`
`193`	`193`
`194`		`- if !strings.Contains(k0sTag, "+k0s.") {`
	`194`	`+ // Old references might contain "-k0s." suffix instead of "+k0s." so we check only for the presence of "k0s."`
	`195`	`+ if !strings.Contains(k0sTag, "k0s.") {`
`195`	`196`	`k0sTag = fmt.Sprintf("%s+%s", k0sTag, DefaultK0SSuffix)`
`196`	`197`	`}`
`197`	`198`