Release 1.30.0-alpha.1 (#16563)

* Release 1.30.0-alpha.1

* Update tests for K8s v1.30

* Remove mentions of K8s v1.24

Makefile

@@ -66,16 +66,16 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always)
 # We lock the versions of our controllers also
 # We need to keep in sync with:
 # pkg/model/components/etcdmanager/model.go
-KOPS_UTILS_CP_TAG=1.29.0-beta.1
+KOPS_UTILS_CP_TAG=1.30.0-alpha.1
 KOPS_UTILS_CP_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_UTILS_CP_TAG | awk '{print $$2}')
 # upup/models/cloudup/resources/addons/dns-controller/
-DNS_CONTROLLER_TAG=1.29.0-beta.1
+DNS_CONTROLLER_TAG=1.30.0-alpha.1
 DNS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}')
 # upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
-KOPS_CONTROLLER_TAG=1.29.0-beta.1
+KOPS_CONTROLLER_TAG=1.30.0-alpha.1
 KOPS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_CONTROLLER_TAG | awk '{print $$2}')
 # pkg/model/components/kubeapiserver/model.go
-KUBE_APISERVER_HEALTHCHECK_TAG=1.29.0-beta.1
+KUBE_APISERVER_HEALTHCHECK_TAG=1.30.0-alpha.1
 KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}')
 
 CGO_ENABLED=0

cmd/kops/create_cluster_integration_test.go

@@ -46,12 +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.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.30", "v1alpha2")
  runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.26-arm64", "v1alpha2")
  runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.26-irsa", "v1alpha2")
 }

cmd/kops/integration_test.go

@@ -193,6 +193,15 @@ func (i integrationTest) withDefaultAddons24() *integrationTest {
  )
 }
 
+// withDefaultAddons24 adds the default addons for an AWS cluster running k8s 1.30
+func (i integrationTest) withDefaultAddons30() *integrationTest {
+ return i.withAddons(
+ awsCCMAddon,
+ awsEBSCSIAddon,
+ dnsControllerAddon,
+ )
+}
+
 func (i integrationTest) withDefaults24() *integrationTest {
  return i.withDefaultAddons24().withDefaultServiceAccountRoles24()
 }
@@ -232,18 +241,6 @@ func TestMinimalAWS(t *testing.T) {
  runTestTerraformAWS(t)
 }
 
-// TestMinimal runs the test on a minimum configuration
-func TestMinimal_v1_24(t *testing.T) {
- newIntegrationTest("minimal.example.com", "minimal-1.24").
- withAddons(
- awsEBSCSIAddon,
- dnsControllerAddon,
- awsCCMAddon,
- leaderElectionAddon,
- ).
- runTestTerraformAWS(t)
-}
-
 // TestMinimal runs the test on a minimum configuration
 func TestMinimal_v1_25(t *testing.T) {
  newIntegrationTest("minimal.example.com", "minimal-1.25").
@@ -308,6 +305,19 @@ func TestMinimal_v1_29(t *testing.T) {
  runTestTerraformAWS(t)
 }
 
+// TestMinimal runs the test on a minimum configuration
+func TestMinimal_v1_30(t *testing.T) {
+ t.Setenv("KOPS_RUN_TOO_NEW_VERSION", "1")
+
+ newIntegrationTest("minimal.example.com", "minimal-1.30").
+ 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")
@@ -482,7 +492,6 @@ func TestComplex(t *testing.T) {
  awsEBSCSIAddon,
  dnsControllerAddon,
  awsCCMAddon,
- leaderElectionAddon,
  awsAuthenticatorAddon,
  ).
  runTestTerraformAWS(t)
@@ -491,7 +500,6 @@ func TestComplex(t *testing.T) {
  awsEBSCSIAddon,
  dnsControllerAddon,
  awsCCMAddon,
- leaderElectionAddon,
  awsAuthenticatorAddon,
  ).
  runTestTerraformAWS(t)
@@ -650,7 +658,7 @@ func TestPrivateCilium(t *testing.T) {
 func TestPrivateCilium2(t *testing.T) {
  newIntegrationTest("privatecilium.example.com", "privatecilium2").
  withPrivate().
- withDefaultAddons24().
+ withDefaultAddons30().
  withAddons("networking.cilium.io-k8s-1.16").
  withAddons(certManagerAddon).
  runTestTerraformAWS(t)
@@ -771,7 +779,7 @@ func TestDiscoveryFeatureGate(t *testing.T) {
  newIntegrationTest("minimal.example.com", "public-jwks-apiserver").
  withDefaultServiceAccountRoles24().
  withServiceAccountRole("aws-node-termination-handler.kube-system", true).
- withDefaultAddons24().
+ withDefaultAddons30().
  withOIDCDiscovery().
  runTestTerraformAWS(t)
 }
@@ -845,30 +853,6 @@ func TestManyAddonsCCMIRSA(t *testing.T) {
  runTestTerraformAWS(t)
 }
 
-func TestManyAddonsCCMIRSA24(t *testing.T) {
- newIntegrationTest("minimal.example.com", "many-addons-ccm-irsa24").
- 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 TestManyAddonsCCMIRSA25(t *testing.T) {
  newIntegrationTest("minimal.example.com", "many-addons-ccm-irsa25").
  withOIDCDiscovery().

hack/generate-asset-hashes.sh

@@ -44,11 +44,9 @@ EOF
  --base https://dl.k8s.io/release/ \
  --prefix "v${version}/" \
  --exclude "**/arm/**" \
- --exclude "**/s390x/**" \
  --exclude "**/ppc64le/**" \
+ --exclude "**/s390x/**" \
  --exclude "**/windows/**" \
- --exclude "**/*-s390x.tar.gz" \
- --exclude "**/*-ppc64le.tar.gz" \
  --exclude "**/*.tar.gz" \
  | sed "s@files:@# kubernetes ${version}@g" >> "${REPO_ROOT}/pkg/assets/assetdata/k8s-${prefix}.yaml"
  done
@@ -80,13 +78,11 @@ EOF
  done
 }
 
-generate_k8s_hashes 1.24 17
 generate_k8s_hashes 1.25 16
 generate_k8s_hashes 1.26 15
 generate_k8s_hashes 1.27 13
 generate_k8s_hashes 1.28 9
 generate_k8s_hashes 1.29 4
 generate_k8s_hashes 1.30 0
 
-
 generate_runc_hashes 1.1 12

kops-version.go

@@ -21,8 +21,8 @@ var Version = KOPS_RELEASE_VERSION
 
 // These constants are parsed by build tooling - be careful about changing the formats
 const (
- KOPS_RELEASE_VERSION = "1.29.0-beta.1"
- KOPS_CI_VERSION = "1.29.0-beta.2"
+ KOPS_RELEASE_VERSION = "1.30.0-alpha.1"
+ KOPS_CI_VERSION = "1.30.0-alpha.2"
 )
 
 // GitVersion should be replaced by the makefile

pkg/apis/kops/validation/validation_test.go

@@ -372,17 +372,6 @@ func TestValidateKubeControllermanager(t *testing.T) {
  },
  ExpectedDetail: "experimentalClusterSigningDuration has been replaced with clusterSigningDuration as of kubernetes 1.25",
  },
- {
- Input: kops.KubeControllerManagerConfig{
- ExperimentalClusterSigningDuration: &metav1.Duration{Duration: time.Hour},
- },
- Cluster: &kops.Cluster{
- Spec: kops.ClusterSpec{
- KubernetesVersion: "1.24.0",
- },
- },
- ExpectedErrors: []string{},
- },
  }
  for _, g := range grid {
  if g.Cluster == nil {