Merge pull request #18202 from hakman/remove-too-old

chore: Remove support for Kubernetes 1.30 in kOps 1.36

Author: k8s-ci-robot

cmd/kops/create_cluster_integration_test.go

@@ -46,10 +46,10 @@ 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.29", "v1alpha2")
-	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.30", "v1alpha2")
 	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.31", "v1alpha2")
 	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.32", "v1alpha2")
+	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.35", "v1alpha2")
+	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.36", "v1alpha2")
 	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-arm64", "v1alpha2")
 	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-irsa", "v1alpha2")
 }

cmd/kops/integration_test.go

@@ -258,8 +258,8 @@ func TestMinimalAWS(t *testing.T) {
 }
 
 // TestMinimal runs the test on a minimum configuration
-func TestMinimal_v1_29(t *testing.T) {
-	newIntegrationTest("minimal.example.com", "minimal-1.29").
+func TestMinimal_v1_31(t *testing.T) {
+	newIntegrationTest("minimal.example.com", "minimal-1.31").
 		withAddons(
 			awsEBSCSIAddon,
 			dnsControllerAddon,
@@ -269,8 +269,8 @@ func TestMinimal_v1_29(t *testing.T) {
 }
 
 // TestMinimal runs the test on a minimum configuration
-func TestMinimal_v1_30(t *testing.T) {
-	newIntegrationTest("minimal.example.com", "minimal-1.30").
+func TestMinimal_v1_32(t *testing.T) {
+	newIntegrationTest("minimal.example.com", "minimal-1.32").
 		withAddons(
 			awsEBSCSIAddon,
 			dnsControllerAddon,
@@ -280,8 +280,8 @@ func TestMinimal_v1_30(t *testing.T) {
 }
 
 // TestMinimal runs the test on a minimum configuration
-func TestMinimal_v1_31(t *testing.T) {
-	newIntegrationTest("minimal.example.com", "minimal-1.31").
+func TestMinimal_v1_33(t *testing.T) {
+	newIntegrationTest("minimal.example.com", "minimal-1.33").
 		withAddons(
 			awsEBSCSIAddon,
 			dnsControllerAddon,
@@ -291,8 +291,8 @@ func TestMinimal_v1_31(t *testing.T) {
 }
 
 // TestMinimal runs the test on a minimum configuration
-func TestMinimal_v1_32(t *testing.T) {
-	newIntegrationTest("minimal.example.com", "minimal-1.32").
+func TestMinimal_v1_34(t *testing.T) {
+	newIntegrationTest("minimal.example.com", "minimal-1.34").
 		withAddons(
 			awsEBSCSIAddon,
 			dnsControllerAddon,
@@ -302,8 +302,8 @@ func TestMinimal_v1_32(t *testing.T) {
 }
 
 // TestMinimal runs the test on a minimum configuration
-func TestMinimal_v1_33(t *testing.T) {
-	newIntegrationTest("minimal.example.com", "minimal-1.33").
+func TestMinimal_v1_35(t *testing.T) {
+	newIntegrationTest("minimal.example.com", "minimal-1.35").
 		withAddons(
 			awsEBSCSIAddon,
 			dnsControllerAddon,
@@ -313,8 +313,8 @@ func TestMinimal_v1_33(t *testing.T) {
 }
 
 // TestMinimal runs the test on a minimum configuration
-func TestMinimal_v1_34(t *testing.T) {
-	newIntegrationTest("minimal.example.com", "minimal-1.34").
+func TestMinimal_v1_36(t *testing.T) {
+	newIntegrationTest("minimal.example.com", "minimal-1.36").
 		withAddons(
 			awsEBSCSIAddon,
 			dnsControllerAddon,

hack/update-expected.sh

@@ -25,6 +25,12 @@ cd "${KOPS_ROOT}"
 # Accept an optional argument overriding the package to update
 PKG="${1:-./...}"
 
+# Accept an optional second argument to filter tests by name (-run)
+RUN_FILTER=()
+if [[ -n "${2:-}" ]]; then
+  RUN_FILTER=(-run "$2")
+fi
+
 # Don't override variables that are commonly used in dev, but shouldn't be in our tests
 unset KOPS_BASE_URL DNSCONTROLLER_IMAGE KOPSCONTROLLER_IMAGE KUBE_APISERVER_HEALTHCHECK_IMAGE KOPS_FEATURE_FLAGS KOPS_ARCH
 unset AWS_ACCESS_KEY_ID AWS_REGION AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN CNI_VERSION_URL DNS_IGNORE_NS_CHECK DO_ACCESS_TOKEN GOOGLE_APPLICATION_CREDENTIALS HCLOUD_TOKEN
@@ -35,4 +41,4 @@ unset AZURE_CLIENT_ID AZURE_CLIENT_SECRET AZURE_STORAGE_ACCOUNT AZURE_SUBSCRIPTI
 unset DIGITALOCEAN_ACCESS_TOKEN
 
 # Run the tests in "autofix mode"
-HACK_UPDATE_EXPECTED_IN_PLACE=1 go test "${PKG}" -count=1
+HACK_UPDATE_EXPECTED_IN_PLACE=1 go test "${PKG}" "${RUN_FILTER[@]}" -count=1

nodeup/pkg/model/kube_apiserver.go

@@ -714,22 +714,6 @@ func (b *KubeAPIServerBuilder) buildPod(ctx context.Context, kubeAPIServer *kops
 		}
 	}
 
-	if b.IsKubernetesLT("1.31") {
-		// Compatibility: Use the old healthz probe for older clusters
-		for _, probe := range allProbes {
-			probe.HTTPGet.Path = "/healthz"
-		}
-
-		// Compatibility: Don't use startup probe / readiness probe
-		startupProbe = nil
-		readinessProbe = nil
-
-		// Compatibility: use old livenessProbe values
-		livenessProbe.FailureThreshold = 0
-		livenessProbe.PeriodSeconds = 0
-		livenessProbe.InitialDelaySeconds = 45
-	}
-
 	resourceRequests := v1.ResourceList{}
 	resourceLimits := v1.ResourceList{}
 

nodeup/pkg/model/kube_proxy.go

@@ -112,12 +112,8 @@ func (b *KubeProxyBuilder) buildPod() (*v1.Pod, error) {
 	// In particular when we forced nftables on rhel10, we should also pass the --proxy-mode=nftables flag.
 	if b.Distribution.ForceNftables() {
 		if c.ProxyMode == "" || c.ProxyMode == "iptables" {
-			if b.IsKubernetesLT("1.29") {
-				klog.Warningf("Distribution %v requires nftables proxy mode, but Kubernetes %s does not support it (requires 1.29+)", b.Distribution, b.NodeupConfig.KubernetesVersion)
-			} else {
-				klog.Infof("Distribution %v requires nftables; overriding kube-proxy mode from %q to nftables", b.Distribution, c.ProxyMode)
-				c.ProxyMode = "nftables"
-			}
+			klog.Infof("Distribution %v requires nftables; overriding kube-proxy mode from %q to nftables", b.Distribution, c.ProxyMode)
+			c.ProxyMode = "nftables"
 		}
 	}
 

nodeup/pkg/model/kube_proxy_test.go

@@ -66,11 +66,11 @@ func TestKubeProxyBuilder_buildPod(t *testing.T) {
 		wantErr bool
 	}{
 		{
-			"Setup KubeProxy for kubernetes version 1.20",
+			"Setup KubeProxy for kubernetes version 1.35",
 			fields{
 				&NodeupModelContext{
 					NodeupConfig:      nodeupConfig,
-					kubernetesVersion: kopsmodel.MustParseKubernetesVersion("1.20"),
+					kubernetesVersion: kopsmodel.MustParseKubernetesVersion("1.35"),
 				},
 			},
 			&v1.Pod{

nodeup/pkg/model/kube_scheduler.go

@@ -111,9 +111,6 @@ func (b *KubeSchedulerBuilder) Build(c *fi.NodeupModelBuilderContext) error {
 		// We didn't get a kubescheduler configuration; warn as we're aiming to move this to generation in the kops CLI
 		klog.Warningf("using embedded kubescheduler configuration")
 		config := NewSchedulerConfig("kubescheduler.config.k8s.io/v1")
-		if b.IsKubernetesLT("1.25") {
-			config = NewSchedulerConfig("kubescheduler.config.k8s.io/v1beta2")
-		}
 
 		kubeSchedulerConfig, err := configbuilder.BuildConfigYaml(&kubeScheduler, config)
 		if err != nil {

nodeup/pkg/model/kubelet_test.go

@@ -48,7 +48,7 @@ func TestTaintsApplied(t *testing.T) {
 		expectTaints []string
 	}{
 		{
-			version:      "1.29.0",
+			version:      "1.31.0",
 			taints:       []string{"foo", "bar", "baz"},
 			expectTaints: []string{"foo", "bar", "baz", "node-role.kubernetes.io/control-plane=:NoSchedule"},
 		},