Bump default etcd to 3.6.6 and k0s to 1.34

Signed-off-by: Alexey Makhov <[email protected]>
Signed-off-by: makhov <[email protected]>

# Conflicts:
#	internal/controller/controlplane/k0s_controlplane_controller.go

Author: makhov

api/k0smotron.io/v1beta1/k0smotroncluster_types.go

@@ -108,7 +108,7 @@ type ClusterSpec struct {
 	//+kubebuilder:validation:Optional
 	Monitoring MonitoringSpec `json:"monitoring,omitempty"`
 	// Etcd defines the etcd configuration.
-	//+kubebuilder:default={"image":"quay.io/k0sproject/etcd:v3.6.6","persistence":{}}
+	//+kubebuilder:default={"image":"makhov/etcd:3.6.6","persistence":{}}
 	Etcd EtcdSpec `json:"etcd,omitempty"`
 
 	// TopologySpreadConstraints will be passed directly to BOTH etcd and k0s pods.
@@ -176,9 +176,9 @@ type Mount struct {
 
 const (
 	defaultK0SImage   = "quay.io/k0sproject/k0s"
-	DefaultK0SVersion = "v1.27.9-k0s.0"
+	DefaultK0SVersion = "v1.34.2-k0s.0"
 	DefaultK0SSuffix  = "k0s.0"
-	DefaultEtcdImage  = "quay.io/k0sproject/etcd:v3.5.13"
+	DefaultEtcdImage  = "makhov/etcd:3.6.6"
 )
 
 func (c *ClusterSpec) GetImage() string {

api/k0smotron.io/v1beta1/k0smotroncluster_types_test.go

@@ -32,7 +32,7 @@ func TestClusterSpec_GetImage(t *testing.T) {
 		{
 			name: "Nothing given",
 			spec: &ClusterSpec{},
-			want: "quay.io/k0sproject/k0s:v1.27.9-k0s.0",
+			want: "quay.io/k0sproject/k0s:v1.34.2-k0s.0",
 		},
 		{
 			name: "Only version given with suffix",
@@ -53,7 +53,7 @@ func TestClusterSpec_GetImage(t *testing.T) {
 			spec: &ClusterSpec{
 				Image: "foobar/k0s",
 			},
-			want: "foobar/k0s:v1.27.9-k0s.0",
+			want: "foobar/k0s:v1.34.2-k0s.0",
 		},
 		{
 			name: "Image and version given",

config/clusterapi/controlplane/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml

@@ -113,7 +113,7 @@ spec:
                 type: array
               etcd:
                 default:
-                  image: quay.io/k0sproject/etcd:v3.6.6
+                  image: makhov/etcd:3.6.6
                   persistence: {}
                 description: Etcd defines the etcd configuration.
                 properties:

config/clusterapi/controlplane/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanetemplates.yaml

@@ -94,7 +94,7 @@ spec:
                         type: array
                       etcd:
                         default:
-                          image: quay.io/k0sproject/etcd:v3.6.6
+                          image: makhov/etcd:3.6.6
                           persistence: {}
                         description: Etcd defines the etcd configuration.
                         properties:

config/clusterapi/k0smotron.io/bases/k0smotron.io_clusters.yaml

@@ -75,7 +75,7 @@ spec:
                 type: array
               etcd:
                 default:
-                  image: quay.io/k0sproject/etcd:v3.6.6
+                  image: makhov/etcd:3.6.6
                   persistence: {}
                 description: Etcd defines the etcd configuration.
                 properties:

config/crd/bases/controlplane/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml

@@ -113,7 +113,7 @@ spec:
                 type: array
               etcd:
                 default:
-                  image: quay.io/k0sproject/etcd:v3.6.6
+                  image: makhov/etcd:3.6.6
                   persistence: {}
                 description: Etcd defines the etcd configuration.
                 properties:

config/crd/bases/controlplane/controlplane.cluster.x-k8s.io_k0smotroncontrolplanetemplates.yaml

@@ -94,7 +94,7 @@ spec:
                         type: array
                       etcd:
                         default:
-                          image: quay.io/k0sproject/etcd:v3.6.6
+                          image: makhov/etcd:3.6.6
                           persistence: {}
                         description: Etcd defines the etcd configuration.
                         properties:

config/crd/bases/k0smotron.io/k0smotron.io_clusters.yaml

@@ -75,7 +75,7 @@ spec:
                 type: array
               etcd:
                 default:
-                  image: quay.io/k0sproject/etcd:v3.6.6
+                  image: makhov/etcd:3.6.6
                   persistence: {}
                 description: Etcd defines the etcd configuration.
                 properties:

docs/resource-reference/controlplane.cluster.x-k8s.io-v1beta1.md

@@ -1953,7 +1953,7 @@ be specified as a single string, e.g. --some-flag=argument<br/>
         <td>
           Etcd defines the etcd configuration.<br/>
           <br/>
-            <i>Default</i>: map[image:quay.io/k0sproject/etcd:v3.6.6 persistence:map[]]<br/>
+            <i>Default</i>: map[image:makhov/etcd:3.6.6 persistence:map[]]<br/>
         </td>
         <td>false</td>
       </tr><tr>
@@ -11719,7 +11719,7 @@ be specified as a single string, e.g. --some-flag=argument<br/>
         <td>
           Etcd defines the etcd configuration.<br/>
           <br/>
-            <i>Default</i>: map[image:quay.io/k0sproject/etcd:v3.6.6 persistence:map[]]<br/>
+            <i>Default</i>: map[image:makhov/etcd:3.6.6 persistence:map[]]<br/>
         </td>
         <td>false</td>
       </tr><tr>

docs/resource-reference/k0smotron.io-v1beta1.md

@@ -110,7 +110,7 @@ be specified as a single string, e.g. --some-flag=argument<br/>
         <td>
           Etcd defines the etcd configuration.<br/>
           <br/>
-            <i>Default</i>: map[image:quay.io/k0sproject/etcd:v3.6.6 persistence:map[]]<br/>
+            <i>Default</i>: map[image:makhov/etcd:3.6.6 persistence:map[]]<br/>
         </td>
         <td>false</td>
       </tr><tr>