Merge pull request #15860 from johngmyers/remove-23

Remove support for Kubernetes 1.23
kubernetes · Sep 4, 2023 · ccb3975 · ccb3975
2 parents f61939b + b3908e5
commit ccb3975
Show file tree

Hide file tree

Showing 208 changed files with 1,390 additions and 22,000 deletions.
diff --git a/channels/alpha b/channels/alpha
@@ -103,6 +103,9 @@ spec:
     networking:
       kubenet: {}
   kubernetesVersions:
+  - range: ">=1.28.0"
+    recommendedVersion: 1.28.1
+    requiredVersion: 1.28.0
   - range: ">=1.27.0"
     recommendedVersion: 1.27.5
     requiredVersion: 1.27.0

diff --git a/channels/stable b/channels/stable
@@ -103,6 +103,9 @@ spec:
     networking:
       kubenet: {}
   kubernetesVersions:
+  - range: ">=1.28.0"
+    recommendedVersion: 1.28.1
+    requiredVersion: 1.28.0
   - range: ">=1.27.0"
     recommendedVersion: 1.27.5
     requiredVersion: 1.27.0

diff --git a/cmd/kops/create_cluster_integration_test.go b/cmd/kops/create_cluster_integration_test.go
@@ -46,11 +46,12 @@ var MagicTimestamp = metav1.Time{Time: time.Date(2017, 1, 1, 0, 0, 0, 0, time.UT
 
 // TestCreateClusterMinimal runs kops create cluster minimal.example.com --zones us-test-1a
 func TestCreateClusterMinimal(t *testing.T) {
-	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.23", "v1alpha2")
 	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.24", "v1alpha2")
 	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.25", "v1alpha2")
 	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.26", "v1alpha2")
 	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.27", "v1alpha2")
+	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.28", "v1alpha2")
+	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.29", "v1alpha2")
 	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.26-arm64", "v1alpha2")
 	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.26-irsa", "v1alpha2")
 }

diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go
@@ -231,17 +231,6 @@ func TestMinimal(t *testing.T) {
 		runTestTerraformAWS(t)
 }
 
-// TestMinimal runs the test on a minimum configuration
-func TestMinimal_v1_23(t *testing.T) {
-	newIntegrationTest("minimal.example.com", "minimal-1.23").
-		withAddons(
-			awsEBSCSIAddon,
-			dnsControllerAddon,
-			leaderElectionAddon,
-		).
-		runTestTerraformAWS(t)
-}
-
 // TestMinimal runs the test on a minimum configuration
 func TestMinimal_v1_24(t *testing.T) {
 	newIntegrationTest("minimal.example.com", "minimal-1.24").
@@ -292,6 +281,32 @@ func TestMinimal_v1_27(t *testing.T) {
 		runTestTerraformAWS(t)
 }
 
+// TestMinimal runs the test on a minimum configuration
+func TestMinimal_v1_28(t *testing.T) {
+	t.Setenv("KOPS_RUN_TOO_NEW_VERSION", "1")
+
+	newIntegrationTest("minimal.example.com", "minimal-1.28").
+		withAddons(
+			awsEBSCSIAddon,
+			dnsControllerAddon,
+			awsCCMAddon,
+		).
+		runTestTerraformAWS(t)
+}
+
+// TestMinimal runs the test on a minimum configuration
+func TestMinimal_v1_29(t *testing.T) {
+	t.Setenv("KOPS_RUN_TOO_NEW_VERSION", "1")
+
+	newIntegrationTest("minimal.example.com", "minimal-1.29").
+		withAddons(
+			awsEBSCSIAddon,
+			dnsControllerAddon,
+			awsCCMAddon,
+		).
+		runTestTerraformAWS(t)
+}
+
 // TestMinimal_NoneDNS runs the test on a minimum configuration with --dns=none
 func TestMinimal_NoneDNS(t *testing.T) {
 	t.Setenv("KOPS_RUN_TOO_NEW_VERSION", "1")
@@ -828,30 +843,6 @@ func TestManyAddonsCCMIRSA(t *testing.T) {
 		runTestTerraformAWS(t)
 }
 
-func TestManyAddonsCCMIRSA23(t *testing.T) {
-	newIntegrationTest("minimal.example.com", "many-addons-ccm-irsa23").
-		withOIDCDiscovery().
-		withServiceAccountRole("aws-load-balancer-controller.kube-system", true).
-		withServiceAccountRole("dns-controller.kube-system", true).
-		withServiceAccountRole("aws-cloud-controller-manager.kube-system", true).
-		withServiceAccountRole("cluster-autoscaler.kube-system", true).
-		withServiceAccountRole("ebs-csi-controller-sa.kube-system", true).
-		withServiceAccountRole("aws-node-termination-handler.kube-system", true).
-		withAddons(
-			"aws-load-balancer-controller.addons.k8s.io-k8s-1.19",
-			"aws-ebs-csi-driver.addons.k8s.io-k8s-1.17",
-			"certmanager.io-k8s-1.16",
-			"cluster-autoscaler.addons.k8s.io-k8s-1.15",
-			"networking.amazon-vpc-routed-eni-k8s-1.16",
-			"snapshot-controller.addons.k8s.io-k8s-1.20",
-			"aws-cloud-controller.addons.k8s.io-k8s-1.18",
-			leaderElectionAddon,
-			metricsServerAddon,
-			dnsControllerAddon,
-		).
-		runTestTerraformAWS(t)
-}
-
 func TestManyAddonsCCMIRSA24(t *testing.T) {
 	newIntegrationTest("minimal.example.com", "many-addons-ccm-irsa24").
 		withOIDCDiscovery().
@@ -1099,7 +1090,7 @@ func TestMixedInstancesSpotASG(t *testing.T) {
 // TestAdditionalObjects runs the test on a configuration that includes additional objects
 func TestAdditionalObjects(t *testing.T) {
 	newIntegrationTest("additionalobjects.example.com", "additionalobjects").
-		withAddons(dnsControllerAddon, awsEBSCSIAddon, leaderElectionAddon).
+		withAddons(dnsControllerAddon, awsEBSCSIAddon, awsCCMAddon).
 		runTestTerraformAWS(t)
 }
 
@@ -1125,17 +1116,6 @@ func TestContainerdCustom(t *testing.T) {
 		runTestTerraformAWS(t)
 }
 
-// TestDockerCustom runs the test on a custom Docker URL configuration
-func TestDockerCustom(t *testing.T) {
-	newIntegrationTest("docker.example.com", "docker-custom").
-		withAddons(
-			awsEBSCSIAddon,
-			dnsControllerAddon,
-			leaderElectionAddon,
-		).
-		runTestTerraformAWS(t)
-}
-
 // TestAPIServerNodes runs a simple configuration with dedicated apiserver nodes
 func TestAPIServerNodes(t *testing.T) {
 	featureflag.ParseFlags("+APIServerNodes")

diff --git a/docs/releases/1.29-NOTES.md b/docs/releases/1.29-NOTES.md
@@ -0,0 +1,29 @@
+## Release notes for kOps 1.29 series
+
+**&#9888; kOps 1.29 has not been released yet! &#9888;**
+
+This is a document to gather the release notes prior to the release.
+
+# Significant changes
+
+## AWS
+
+## GCP
+
+## Openstack
+
+# Breaking changes
+
+## Other breaking changes
+
+* Support for Kubernetes version 1.23 has been removed.
+
+# Deprecations
+
+* Support for Kubernetes version 1.24 is deprecated and will be removed in kOps 1.30.
+
+* Support for Kubernetes version 1.25 is deprecated and will be removed in kOps 1.31.
+
+* Support for AWS Classic Load Balancer for API is deprecated and should not be used for newly created clusters.
+
+* All legacy addons are deprecated in favor of managed addons, including the [metrics server addon](https://github.com/kubernetes/kops/tree/master/addons/metrics-server) and the [autoscaler addon](https://github.com/kubernetes/kops/tree/master/addons/cluster-autoscaler).
diff --git a/nodeup/pkg/model/containerd.go b/nodeup/pkg/model/containerd.go
@@ -171,12 +171,6 @@ func (b *ContainerdBuilder) installContainerd(c *fi.NodeupModelBuilderContext) e
 		} else {
 			return fmt.Errorf("error finding contained version")
 		}
-	} else {
-		if b.NodeupConfig.Docker != nil {
-			containerRuntimeVersion = fi.ValueOf(b.NodeupConfig.Docker.Version)
-		} else {
-			return fmt.Errorf("error finding Docker version")
-		}
 	}
 	sv, err := semver.ParseTolerant(containerRuntimeVersion)
 	if err != nil {

diff --git a/nodeup/pkg/model/containerd_test.go b/nodeup/pkg/model/containerd_test.go
@@ -32,14 +32,6 @@ import (
 	"k8s.io/kops/util/pkg/distributions"
 )
 
-func TestContainerdBuilder_Docker_19_03_13(t *testing.T) {
-	runContainerdBuilderTest(t, "from_docker_19.03.11", distributions.DistributionUbuntu2004)
-}
-
-func TestContainerdBuilder_Docker_19_03_14(t *testing.T) {
-	runContainerdBuilderTest(t, "from_docker_19.03.14", distributions.DistributionUbuntu2004)
-}
-
 func TestContainerdBuilder_Simple(t *testing.T) {
 	runContainerdBuilderTest(t, "simple", distributions.DistributionUbuntu2004)
 }
@@ -49,7 +41,7 @@ func TestContainerdBuilder_Flatcar(t *testing.T) {
 }
 
 func TestContainerdBuilder_SkipInstall(t *testing.T) {
-	runDockerBuilderTest(t, "skipinstall")
+	runContainerdBuilderTest(t, "skipinstall", distributions.DistributionUbuntu2004)
 }
 
 func TestContainerdBuilder_BuildFlags(t *testing.T) {