Update k8s versions to latest patch (#1868)

Signed-off-by: Waleed Malik <[email protected]>
kubermatic · Oct 11, 2024 · 95ee8c0 · 95ee8c0
1 parent 4465175
commit 95ee8c0
Show file tree

Hide file tree

Showing 21 changed files with 34 additions and 34 deletions.
diff --git a/examples/alibaba-machinedeployment.yaml b/examples/alibaba-machinedeployment.yaml
@@ -62,4 +62,4 @@ spec:
             distUpgradeOnBoot: false
             disableAutoUpdate: true
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/anexia-machinedeployment.yaml b/examples/anexia-machinedeployment.yaml
@@ -70,7 +70,7 @@ spec:
                 # least one Prefix, because we have to know (and thus, reserve)
                 # at least one IP address for each Machine.
                 prefixes:
-                - "<< ANEXIA_PREFIX_ID >>"
+                  - "<< ANEXIA_PREFIX_ID >>"
 
             # You may have this old disk config attribute in your config - please migrate to the disks attribute.
             # For now it is still recognized though.
@@ -83,4 +83,4 @@ spec:
             distUpgradeOnBoot: false
             disableAutoUpdate: true
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/aws-machinedeployment.yaml b/examples/aws-machinedeployment.yaml
@@ -79,4 +79,4 @@ spec:
             # provided the rhsm will be disabled and any created subscription won't be removed automatically
             rhsmOfflineToken: "<< REDHAT_SUBSCRIPTIONS_OFFLINE_TOKEN >>"
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/azure-machinedeployment.yaml b/examples/azure-machinedeployment.yaml
@@ -91,4 +91,4 @@ spec:
             # provided the rhsm will be disabled and any created subscription won't be removed automatically
             rhsmOfflineToken: "<< REDHAT_SUBSCRIPTIONS_OFFLINE_TOKEN >>"
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/digitalocean-machinedeployment.yaml b/examples/digitalocean-machinedeployment.yaml
@@ -57,4 +57,4 @@ spec:
           operatingSystemSpec:
             disableAutoUpdate: true
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/equinixmetal-machinedeployment.yaml b/examples/equinixmetal-machinedeployment.yaml
@@ -51,4 +51,4 @@ spec:
           operatingSystemSpec:
             distUpgradeOnBoot: false
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/gce-machinedeployment.yaml b/examples/gce-machinedeployment.yaml
@@ -90,4 +90,4 @@ spec:
             # provided the rhsm will be disabled and any created subscription won't be removed automatically
             rhsmOfflineToken: "<< REDHAT_SUBSCRIPTIONS_OFFLINE_TOKEN >>"
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/hetzner-machinedeployment.yaml b/examples/hetzner-machinedeployment.yaml
@@ -67,4 +67,4 @@ spec:
           operatingSystemSpec:
             distUpgradeOnBoot: false
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/kubevirt-machinedeployment.yaml b/examples/kubevirt-machinedeployment.yaml
@@ -69,4 +69,4 @@ spec:
             # provided the rhsm will be disabled and any created subscription won't be removed automatically
             rhsmOfflineToken: "<< REDHAT_SUBSCRIPTIONS_OFFLINE_TOKEN >>"
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/linode-machinedeployment.yaml b/examples/linode-machinedeployment.yaml
@@ -53,4 +53,4 @@ spec:
           operatingSystemSpec:
             disableAutoUpdate: true
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/nutanix-machinedeployment.yaml b/examples/nutanix-machinedeployment.yaml
@@ -82,4 +82,4 @@ spec:
             distUpgradeOnBoot: false
             disableAutoUpdate: true
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/opennebula-machinedeployment.yaml b/examples/opennebula-machinedeployment.yaml
@@ -67,4 +67,4 @@ spec:
             # use cloud-init for flatcar as ignition doesn't know anything about OpenNebula yet
             provisioningUtility: "cloud-init"
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/openstack-machinedeployment.yaml b/examples/openstack-machinedeployment.yaml
@@ -166,4 +166,4 @@ spec:
             # provided the rhsm will be disabled and any created subscription won't be removed automatically
             rhsmOfflineToken: "<< REDHAT_SUBSCRIPTIONS_OFFLINE_TOKEN >>"
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/scaleway-machinedeployment.yaml b/examples/scaleway-machinedeployment.yaml
@@ -61,4 +61,4 @@ spec:
           operatingSystemSpec:
             disableAutoUpdate: true
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/vmware-cloud-director-machinedeployment.yaml b/examples/vmware-cloud-director-machinedeployment.yaml
@@ -89,4 +89,4 @@ spec:
           operatingSystemSpec:
             distUpgradeOnBoot: false
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/vsphere-datastore-cluster-machinedeployment.yaml b/examples/vsphere-datastore-cluster-machinedeployment.yaml
@@ -79,4 +79,4 @@ spec:
             # provided the rhsm will be disabled and any created subscription won't be removed automatically
             rhsmOfflineToken: "<< REDHAT_SUBSCRIPTIONS_OFFLINE_TOKEN >>"
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/vsphere-machinedeployment.yaml b/examples/vsphere-machinedeployment.yaml
@@ -81,4 +81,4 @@ spec:
             # provided the rhsm will be disabled and any created subscription won't be removed automatically
             rhsmOfflineToken: "<< REDHAT_SUBSCRIPTIONS_OFFLINE_TOKEN >>"
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/examples/vultr-machinedeployment.yaml b/examples/vultr-machinedeployment.yaml
@@ -70,4 +70,4 @@ spec:
             distUpgradeOnBoot: false
             disableAutoUpdate: true
       versions:
-        kubelet: 1.30.4
+        kubelet: 1.30.5
diff --git a/test/e2e/provisioning/all_e2e_test.go b/test/e2e/provisioning/all_e2e_test.go
@@ -85,7 +85,7 @@ const (
 )
 
 const (
-	defaultKubernetesVersion    = "1.29.8"
+	defaultKubernetesVersion    = "1.29.9"
 	awsDefaultKubernetesVersion = "1.26.12"
 	defaultContainerRuntime     = "containerd"
 )
@@ -348,7 +348,7 @@ func TestOpenstackProvisioningE2E(t *testing.T) {
 	}
 
 	// In-tree cloud provider is not supported from Kubernetes v1.26.
-	selector := And(Not(OsSelector("amzn2")), Not(VersionSelector("1.28.12", "1.29.8", "1.30.4", "1.31.0")))
+	selector := And(Not(OsSelector("amzn2")), Not(VersionSelector("1.28.14", "1.29.9", "1.30.5", "1.31.1")))
 	runScenarios(context.Background(), t, selector, params, OSManifest, fmt.Sprintf("os-%s", *testRunIdentifier))
 }
 
@@ -424,7 +424,7 @@ func TestAWSProvisioningE2E(t *testing.T) {
 	}
 
 	// In-tree cloud provider is not supported from Kubernetes v1.27.
-	selector := Not(VersionSelector("1.28.12", "1.29.8", "1.30.4", "1.31.0"))
+	selector := Not(VersionSelector("1.28.14", "1.29.9", "1.30.5", "1.31.1"))
 
 	// act
 	params := []string{fmt.Sprintf("<< AWS_ACCESS_KEY_ID >>=%s", awsKeyID),
@@ -478,7 +478,7 @@ func TestAWSSpotInstanceProvisioningE2E(t *testing.T) {
 	}
 	// Since we are only testing the spot instance functionality, testing it against a single OS is sufficient.
 	// In-tree cloud provider is not supported from Kubernetes v1.27.
-	selector := And(OsSelector("ubuntu"), Not(VersionSelector("1.28.12", "1.29.8", "1.30.4", "1.31.0")))
+	selector := And(OsSelector("ubuntu"), Not(VersionSelector("1.28.14", "1.29.9", "1.30.5", "1.31.1")))
 
 	// act
 	params := []string{fmt.Sprintf("<< AWS_ACCESS_KEY_ID >>=%s", awsKeyID),
@@ -500,7 +500,7 @@ func TestAWSARMProvisioningE2E(t *testing.T) {
 		t.Fatal("Unable to run the test suite, AWS_E2E_TESTS_KEY_ID or AWS_E2E_TESTS_SECRET environment variables cannot be empty")
 	}
 	// In-tree cloud provider is not supported from Kubernetes v1.27.
-	selector := And(OsSelector("ubuntu"), Not(VersionSelector("1.28.12", "1.29.8", "1.30.4", "1.31.0")))
+	selector := And(OsSelector("ubuntu"), Not(VersionSelector("1.28.14", "1.29.9", "1.30.5", "1.31.1")))
 
 	// act
 	params := []string{fmt.Sprintf("<< AWS_ACCESS_KEY_ID >>=%s", awsKeyID),
@@ -573,7 +573,7 @@ func TestAzureProvisioningE2E(t *testing.T) {
 	}
 
 	// In-tree cloud provider is not supported from Kubernetes v1.30.
-	selector := And(Not(OsSelector("amzn2")), Not(VersionSelector("1.30.4", "1.31.0")))
+	selector := And(Not(OsSelector("amzn2")), Not(VersionSelector("1.30.5", "1.31.1")))
 
 	// act
 	params := []string{
@@ -602,7 +602,7 @@ func TestAzureCustomImageReferenceProvisioningE2E(t *testing.T) {
 	}
 
 	// In-tree cloud provider is not supported from Kubernetes v1.30.
-	selector := And(OsSelector("ubuntu"), Not(VersionSelector("1.30.4", "1.31.0")))
+	selector := And(OsSelector("ubuntu"), Not(VersionSelector("1.30.5", "1.31.1")))
 	// act
 	params := []string{
 		fmt.Sprintf("<< AZURE_TENANT_ID >>=%s", azureTenantID),
@@ -816,7 +816,7 @@ func TestVsphereProvisioningE2E(t *testing.T) {
 	t.Parallel()
 
 	// In-tree cloud provider is not supported from Kubernetes v1.30.
-	selector := And(OsSelector("ubuntu"), Not(VersionSelector("1.30.4", "1.31.0")))
+	selector := And(OsSelector("ubuntu"), Not(VersionSelector("1.30.5", "1.31.1")))
 	params := getVSphereTestParams(t)
 
 	runScenarios(context.Background(), t, selector, params, VSPhereManifest, fmt.Sprintf("vs-%s", *testRunIdentifier))
@@ -828,7 +828,7 @@ func TestVsphereMultipleNICProvisioningE2E(t *testing.T) {
 	t.Parallel()
 
 	// In-tree cloud provider is not supported from Kubernetes v1.30.
-	selector := And(OsSelector("ubuntu"), Not(VersionSelector("1.30.4", "1.31.0")))
+	selector := And(OsSelector("ubuntu"), Not(VersionSelector("1.30.5", "1.31.1")))
 	params := getVSphereTestParams(t)
 
 	runScenarios(context.Background(), t, selector, params, VSPhereMultipleNICManifest, fmt.Sprintf("vs-%s", *testRunIdentifier))
@@ -857,7 +857,7 @@ func TestVsphereDatastoreClusterProvisioningE2E(t *testing.T) {
 	t.Parallel()
 
 	// In-tree cloud provider is not supported from Kubernetes v1.30.
-	selector := And(OsSelector("ubuntu", "rhel", "flatcar"), Not(VersionSelector("1.30.4", "1.31.0")))
+	selector := And(OsSelector("ubuntu", "rhel", "flatcar"), Not(VersionSelector("1.30.5", "1.31.1")))
 
 	params := getVSphereTestParams(t)
 	runScenarios(context.Background(), t, selector, params, VSPhereDSCManifest, fmt.Sprintf("vs-dsc-%s", *testRunIdentifier))

diff --git a/test/e2e/provisioning/helper.go b/test/e2e/provisioning/helper.go
@@ -34,10 +34,10 @@ var (
 	scenarios = buildScenarios()
 
 	versions = []*semver.Version{
-		semver.MustParse("v1.28.12"),
-		semver.MustParse("v1.29.8"),
-		semver.MustParse("v1.30.4"),
-		semver.MustParse("v1.31.0"),
+		semver.MustParse("v1.28.14"),
+		semver.MustParse("v1.29.9"),
+		semver.MustParse("v1.30.5"),
+		semver.MustParse("v1.31.1"),
 	}
 
 	operatingSystems = []providerconfigtypes.OperatingSystem{

diff --git a/test/e2e/provisioning/testdata/machinedeployment-azure-redhat-satellite.yaml b/test/e2e/provisioning/testdata/machinedeployment-azure-redhat-satellite.yaml
@@ -55,4 +55,4 @@ spec:
             rhelOrganizationName: ""
             rhelActivationKey: ""
       versions:
-        kubelet: 1.29.8
+        kubelet: 1.29.9