Drop support for kubernetes 1.26 (#1769)

* Drop support for kubernetes 1.26 Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com> * Update matrix for e2e tests Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com> * Built in cloud providers are disabled in k8s 1.26 Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com> --------- Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
kubermatic · Mar 6, 2024 · 4342ca2 · 4342ca2
1 parent 8cef3ec
commit 4342ca2
Show file tree

Hide file tree

Showing 56 changed files with 901 additions and 1,716 deletions.
diff --git a/.prow/provider-aws.yaml b/.prow/provider-aws.yaml
@@ -14,7 +14,8 @@
 
 presubmits:
   - name: pull-machine-controller-e2e-aws
-    run_if_changed: "(pkg/cloudprovider/provider/aws/|pkg/userdata)"
+    # In-tree CCM is not supported for AWS starting from k8s 1.27. Please see https://github.com/kubermatic/machine-controller/issues/1626 for updates.
+    # run_if_changed: "(pkg/cloudprovider/provider/aws/|pkg/userdata)"
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git"
     labels:
@@ -46,7 +47,8 @@ presubmits:
               memory: 7Gi
 
   - name: pull-machine-controller-e2e-aws-spot-instance-legacy-userdata
-    always_run: true
+    # In-tree CCM is not supported for AWS starting from k8s 1.27. Please see https://github.com/kubermatic/machine-controller/issues/1626 for updates.
+    # run_if_changed: "(pkg/cloudprovider/provider/aws/|pkg/userdata)"
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git"
     labels:
@@ -142,7 +144,8 @@ presubmits:
               memory: 7Gi
 
   - name: pull-machine-controller-e2e-aws-spot-instance
-    always_run: true
+    # In-tree CCM is not supported for AWS starting from k8s 1.27. Please see https://github.com/kubermatic/machine-controller/issues/1626 for updates.
+    # run_if_changed: "(pkg/cloudprovider/provider/aws/|pkg/userdata)"
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git"
     labels:

diff --git a/.prow/provider-gcp.yaml b/.prow/provider-gcp.yaml
@@ -14,7 +14,7 @@
 
 presubmits:
   - name: pull-machine-controller-e2e-gce
-    run_if_changed: "(pkg/cloudprovider/provider/gce/|pkg/userdata)"
+    always_run: true
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git"
     labels:
@@ -44,3 +44,37 @@ presubmits:
               cpu: 2
             limits:
               memory: 7Gi
+
+  - name: pull-machine-controller-e2e-gce-legacy-userdata
+    always_run: true
+    decorate: true
+    clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git"
+    labels:
+      preset-gce: "true"
+      preset-hetzner: "true"
+      preset-e2e-ssh: "true"
+      preset-rhel: "true"
+      preset-goproxy: "true"
+      preset-kind-volume-mounts: "true"
+      preset-docker-mirror: "true"
+      preset-kubeconfig-ci: "true"
+    spec:
+      containers:
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
+          command:
+            - "./hack/ci/run-e2e-tests.sh"
+          args:
+            - "TestGCEProvisioningE2E"
+          env:
+            - name: OPERATING_SYSTEM_MANAGER
+              value: "false"
+            - name: CLOUD_PROVIDER
+              value: gce
+          securityContext:
+            privileged: true
+          resources:
+            requests:
+              memory: 7Gi
+              cpu: 2
+            limits:
+              memory: 7Gi
diff --git a/README.md b/README.md
@@ -2,7 +2,6 @@
 
 **Important Note: User data plugins for machine-controller are deprecated and will soon be removed. [Operating System Manager](https://github.com/kubermatic/operating-system-manager) is the successor of user data plugins. It's responsible for creating and managing the required configurations for worker nodes in a Kubernetes cluster with better modularity and extensibility. Please refer to [Operating System Manager][8] for more details.**
 
-
 ## Table of Contents
 
 - [Kubermatic machine-controller](#kubermatic-machine-controller)
@@ -47,7 +46,6 @@ Currently supported K8S versions are:
 - 1.29
 - 1.28
 - 1.27
-- 1.26
 
 ### Community Providers
 

diff --git a/pkg/userdata/amzn2/provider_test.go b/pkg/userdata/amzn2/provider_test.go
@@ -102,40 +102,40 @@ func TestUserDataGeneration(t *testing.T) {
 
 	tests := []userDataTestCase{
 		{
-			name: "kubelet-v1.26.6-aws",
+			name: "kubelet-v1.29.2-aws",
 			spec: clusterv1alpha1.MachineSpec{
 				ObjectMeta: metav1.ObjectMeta{Name: "node1"},
 				Versions: clusterv1alpha1.MachineVersionInfo{
-					Kubelet: "1.26.6",
+					Kubelet: "1.29.2",
 				},
 			},
 		},
 		{
-			name: "kubelet-v1.26.6-aws-external",
+			name: "kubelet-v1.29.2-aws-external",
 			spec: clusterv1alpha1.MachineSpec{
 				ObjectMeta: metav1.ObjectMeta{Name: "node1"},
 				Versions: clusterv1alpha1.MachineVersionInfo{
-					Kubelet: "1.26.6",
+					Kubelet: "1.29.2",
 				},
 			},
 			externalCloudProvider: true,
 		},
 		{
-			name: "kubelet-v1.26.6-vsphere",
+			name: "kubelet-v1.29.2-vsphere",
 			spec: clusterv1alpha1.MachineSpec{
 				ObjectMeta: metav1.ObjectMeta{Name: "node1"},
 				Versions: clusterv1alpha1.MachineVersionInfo{
-					Kubelet: "1.26.6",
+					Kubelet: "1.29.2",
 				},
 			},
 			cloudProviderName: stringPtr("vsphere"),
 		},
 		{
-			name: "kubelet-v1.26.6-vsphere-proxy",
+			name: "kubelet-v1.29.2-vsphere-proxy",
 			spec: clusterv1alpha1.MachineSpec{
 				ObjectMeta: metav1.ObjectMeta{Name: "node1"},
 				Versions: clusterv1alpha1.MachineVersionInfo{
-					Kubelet: "1.26.6",
+					Kubelet: "1.29.2",
 				},
 			},
 			cloudProviderName:  stringPtr("vsphere"),
@@ -145,11 +145,11 @@ func TestUserDataGeneration(t *testing.T) {
 			pauseImage:         "192.168.100.100:5000/kubernetes/pause:v3.1",
 		},
 		{
-			name: "kubelet-v1.26.6-vsphere-mirrors",
+			name: "kubelet-v1.29.2-vsphere-mirrors",
 			spec: clusterv1alpha1.MachineSpec{
 				ObjectMeta: metav1.ObjectMeta{Name: "node1"},
 				Versions: clusterv1alpha1.MachineVersionInfo{
-					Kubelet: "1.26.6",
+					Kubelet: "1.29.2",
 				},
 			},
 			cloudProviderName: stringPtr("vsphere"),
@@ -158,15 +158,6 @@ func TestUserDataGeneration(t *testing.T) {
 			registryMirrors:   "https://registry.docker-cn.com",
 			pauseImage:        "192.168.100.100:5000/kubernetes/pause:v3.1",
 		},
-		{
-			name: "kubelet-v1.26-aws",
-			spec: clusterv1alpha1.MachineSpec{
-				ObjectMeta: metav1.ObjectMeta{Name: "node1"},
-				Versions: clusterv1alpha1.MachineVersionInfo{
-					Kubelet: "1.26.0",
-				},
-			},
-		},
 		{
 			name: "kubelet-v1.28-aws",
 			spec: clusterv1alpha1.MachineSpec{

diff --git a/...estdata/kubelet-v1.26.6-aws-external.yaml → ...estdata/kubelet-v1.29.2-aws-external.yaml b/...estdata/kubelet-v1.26.6-aws-external.yaml → ...estdata/kubelet-v1.29.2-aws-external.yaml
@@ -143,7 +143,7 @@ write_files:
     rm -f "$cri_tools_filename"
     ln -sf "$opt_bin/crictl" "$usr_local_bin"/crictl || echo "symbolic link is skipped"
     cd -
-    KUBE_VERSION="${KUBE_VERSION:-v1.26.6}"
+    KUBE_VERSION="${KUBE_VERSION:-v1.29.2}"
     kube_dir="$opt_bin/kubernetes-$KUBE_VERSION"
     kube_base_url="https://dl.k8s.io/$KUBE_VERSION/bin/linux/$arch"
     kube_sum_file="$kube_dir/sha256"

diff --git a/...ata/amzn2/testdata/kubelet-v1.26-aws.yaml → ...a/amzn2/testdata/kubelet-v1.29.2-aws.yaml b/...ata/amzn2/testdata/kubelet-v1.26-aws.yaml → ...a/amzn2/testdata/kubelet-v1.29.2-aws.yaml
@@ -143,7 +143,7 @@ write_files:
     rm -f "$cri_tools_filename"
     ln -sf "$opt_bin/crictl" "$usr_local_bin"/crictl || echo "symbolic link is skipped"
     cd -
-    KUBE_VERSION="${KUBE_VERSION:-v1.26.0}"
+    KUBE_VERSION="${KUBE_VERSION:-v1.29.2}"
     kube_dir="$opt_bin/kubernetes-$KUBE_VERSION"
     kube_base_url="https://dl.k8s.io/$KUBE_VERSION/bin/linux/$arch"
     kube_sum_file="$kube_dir/sha256"

diff --git a/...data/kubelet-v1.26.6-vsphere-mirrors.yaml → ...data/kubelet-v1.29.2-vsphere-mirrors.yaml b/...data/kubelet-v1.26.6-vsphere-mirrors.yaml → ...data/kubelet-v1.29.2-vsphere-mirrors.yaml
@@ -156,7 +156,7 @@ write_files:
     rm -f "$cri_tools_filename"
     ln -sf "$opt_bin/crictl" "$usr_local_bin"/crictl || echo "symbolic link is skipped"
     cd -
-    KUBE_VERSION="${KUBE_VERSION:-v1.26.6}"
+    KUBE_VERSION="${KUBE_VERSION:-v1.29.2}"
     kube_dir="$opt_bin/kubernetes-$KUBE_VERSION"
     kube_base_url="https://dl.k8s.io/$KUBE_VERSION/bin/linux/$arch"
     kube_sum_file="$kube_dir/sha256"

diff --git a/...stdata/kubelet-v1.26.6-vsphere-proxy.yaml → ...stdata/kubelet-v1.29.2-vsphere-proxy.yaml b/...stdata/kubelet-v1.26.6-vsphere-proxy.yaml → ...stdata/kubelet-v1.29.2-vsphere-proxy.yaml
@@ -156,7 +156,7 @@ write_files:
     rm -f "$cri_tools_filename"
     ln -sf "$opt_bin/crictl" "$usr_local_bin"/crictl || echo "symbolic link is skipped"
     cd -
-    KUBE_VERSION="${KUBE_VERSION:-v1.26.6}"
+    KUBE_VERSION="${KUBE_VERSION:-v1.29.2}"
     kube_dir="$opt_bin/kubernetes-$KUBE_VERSION"
     kube_base_url="https://dl.k8s.io/$KUBE_VERSION/bin/linux/$arch"
     kube_sum_file="$kube_dir/sha256"

diff --git a/...zn2/testdata/kubelet-v1.26.6-vsphere.yaml → ...zn2/testdata/kubelet-v1.29.2-vsphere.yaml b/...zn2/testdata/kubelet-v1.26.6-vsphere.yaml → ...zn2/testdata/kubelet-v1.29.2-vsphere.yaml
@@ -148,7 +148,7 @@ write_files:
     rm -f "$cri_tools_filename"
     ln -sf "$opt_bin/crictl" "$usr_local_bin"/crictl || echo "symbolic link is skipped"
     cd -
-    KUBE_VERSION="${KUBE_VERSION:-v1.26.6}"
+    KUBE_VERSION="${KUBE_VERSION:-v1.29.2}"
     kube_dir="$opt_bin/kubernetes-$KUBE_VERSION"
     kube_base_url="https://dl.k8s.io/$KUBE_VERSION/bin/linux/$arch"
     kube_sum_file="$kube_dir/sha256"

diff --git a/pkg/userdata/centos/provider_test.go b/pkg/userdata/centos/provider_test.go
@@ -102,50 +102,50 @@ func TestUserDataGeneration(t *testing.T) {
 
 	tests := []userDataTestCase{
 		{
-			name: "kubelet-v1.26.6-aws",
+			name: "kubelet-v1.29.2-aws",
 			spec: clusterv1alpha1.MachineSpec{
 				ObjectMeta: metav1.ObjectMeta{Name: "node1"},
 				Versions: clusterv1alpha1.MachineVersionInfo{
-					Kubelet: "1.26.6",
+					Kubelet: "1.29.2",
 				},
 			},
 		},
 		{
-			name: "kubelet-v1.26.6-nutanix",
+			name: "kubelet-v1.29.2-nutanix",
 			spec: clusterv1alpha1.MachineSpec{
 				ObjectMeta: metav1.ObjectMeta{Name: "node1"},
 				Versions: clusterv1alpha1.MachineVersionInfo{
-					Kubelet: "1.26.6",
+					Kubelet: "1.29.2",
 				},
 			},
 			cloudProviderName: stringPtr("nutanix"),
 		},
 		{
-			name: "kubelet-v1.26.6-aws-external",
+			name: "kubelet-v1.29.2-aws-external",
 			spec: clusterv1alpha1.MachineSpec{
 				ObjectMeta: metav1.ObjectMeta{Name: "node1"},
 				Versions: clusterv1alpha1.MachineVersionInfo{
-					Kubelet: "1.26.6",
+					Kubelet: "1.29.2",
 				},
 			},
 			externalCloudProvider: true,
 		},
 		{
-			name: "kubelet-v1.26.6-vsphere",
+			name: "kubelet-v1.29.2-vsphere",
 			spec: clusterv1alpha1.MachineSpec{
 				ObjectMeta: metav1.ObjectMeta{Name: "node1"},
 				Versions: clusterv1alpha1.MachineVersionInfo{
-					Kubelet: "1.26.6",
+					Kubelet: "1.29.2",
 				},
 			},
 			cloudProviderName: stringPtr("vsphere"),
 		},
 		{
-			name: "kubelet-v1.26.6-vsphere-proxy",
+			name: "kubelet-v1.29.2-vsphere-proxy",
 			spec: clusterv1alpha1.MachineSpec{
 				ObjectMeta: metav1.ObjectMeta{Name: "node1"},
 				Versions: clusterv1alpha1.MachineVersionInfo{
-					Kubelet: "1.26.6",
+					Kubelet: "1.29.2",
 				},
 			},
 			cloudProviderName:  stringPtr("vsphere"),
@@ -155,11 +155,11 @@ func TestUserDataGeneration(t *testing.T) {
 			pauseImage:         "192.168.100.100:5000/kubernetes/pause:v3.1",
 		},
 		{
-			name: "kubelet-v1.26.6-vsphere-mirrors",
+			name: "kubelet-v1.29.2-vsphere-mirrors",
 			spec: clusterv1alpha1.MachineSpec{
 				ObjectMeta: metav1.ObjectMeta{Name: "node1"},
 				Versions: clusterv1alpha1.MachineVersionInfo{
-					Kubelet: "1.26.6",
+					Kubelet: "1.29.2",
 				},
 			},
 			cloudProviderName: stringPtr("vsphere"),