Skip to content

Commit 86f5d45

Browse files
hakmanhakman
authored
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
1 parent 22eea4e commit 86f5d45

File tree

638 files changed

+1589
-23986
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

638 files changed

+1589
-23986
lines changed

‎Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always)
6666
# We lock the versions of our controllers also
6767
# We need to keep in sync with:
6868
# pkg/model/components/etcdmanager/model.go
69-
KOPS_UTILS_CP_TAG=1.29.0-beta.1
69+
KOPS_UTILS_CP_TAG=1.30.0-alpha.1
7070
KOPS_UTILS_CP_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_UTILS_CP_TAG | awk '{print $$2}')
7171
# upup/models/cloudup/resources/addons/dns-controller/
72-
DNS_CONTROLLER_TAG=1.29.0-beta.1
72+
DNS_CONTROLLER_TAG=1.30.0-alpha.1
7373
DNS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}')
7474
# upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
75-
KOPS_CONTROLLER_TAG=1.29.0-beta.1
75+
KOPS_CONTROLLER_TAG=1.30.0-alpha.1
7676
KOPS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_CONTROLLER_TAG | awk '{print $$2}')
7777
# pkg/model/components/kubeapiserver/model.go
78-
KUBE_APISERVER_HEALTHCHECK_TAG=1.29.0-beta.1
78+
KUBE_APISERVER_HEALTHCHECK_TAG=1.30.0-alpha.1
7979
KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}')
8080

8181
CGO_ENABLED=0

‎cmd/kops/create_cluster_integration_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ var MagicTimestamp = metav1.Time{Time: time.Date(2017, 1, 1, 0, 0, 0, 0, time.UT
4646

4747
// TestCreateClusterMinimal runs kops create cluster minimal.example.com --zones us-test-1a
4848
func TestCreateClusterMinimal(t *testing.T) {
49-
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.24", "v1alpha2")
5049
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.25", "v1alpha2")
5150
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.26", "v1alpha2")
5251
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.27", "v1alpha2")
5352
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.28", "v1alpha2")
5453
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.29", "v1alpha2")
54+
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.30", "v1alpha2")
5555
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.26-arm64", "v1alpha2")
5656
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.26-irsa", "v1alpha2")
5757
}

‎cmd/kops/integration_test.go

+24-40
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,15 @@ func (i integrationTest) withDefaultAddons24() *integrationTest {
193193
)
194194
}
195195

196+
// withDefaultAddons24 adds the default addons for an AWS cluster running k8s 1.30
197+
func (i integrationTest) withDefaultAddons30() *integrationTest {
198+
return i.withAddons(
199+
awsCCMAddon,
200+
awsEBSCSIAddon,
201+
dnsControllerAddon,
202+
)
203+
}
204+
196205
func (i integrationTest) withDefaults24() *integrationTest {
197206
return i.withDefaultAddons24().withDefaultServiceAccountRoles24()
198207
}
@@ -232,18 +241,6 @@ func TestMinimalAWS(t *testing.T) {
232241
runTestTerraformAWS(t)
233242
}
234243

235-
// TestMinimal runs the test on a minimum configuration
236-
func TestMinimal_v1_24(t *testing.T) {
237-
newIntegrationTest("minimal.example.com", "minimal-1.24").
238-
withAddons(
239-
awsEBSCSIAddon,
240-
dnsControllerAddon,
241-
awsCCMAddon,
242-
leaderElectionAddon,
243-
).
244-
runTestTerraformAWS(t)
245-
}
246-
247244
// TestMinimal runs the test on a minimum configuration
248245
func TestMinimal_v1_25(t *testing.T) {
249246
newIntegrationTest("minimal.example.com", "minimal-1.25").
@@ -308,6 +305,19 @@ func TestMinimal_v1_29(t *testing.T) {
308305
runTestTerraformAWS(t)
309306
}
310307

308+
// TestMinimal runs the test on a minimum configuration
309+
func TestMinimal_v1_30(t *testing.T) {
310+
t.Setenv("KOPS_RUN_TOO_NEW_VERSION", "1")
311+
312+
newIntegrationTest("minimal.example.com", "minimal-1.30").
313+
withAddons(
314+
awsEBSCSIAddon,
315+
dnsControllerAddon,
316+
awsCCMAddon,
317+
).
318+
runTestTerraformAWS(t)
319+
}
320+
311321
// TestMinimal_NoneDNS runs the test on a minimum configuration with --dns=none
312322
func TestMinimal_NoneDNS(t *testing.T) {
313323
t.Setenv("KOPS_RUN_TOO_NEW_VERSION", "1")
@@ -482,7 +492,6 @@ func TestComplex(t *testing.T) {
482492
awsEBSCSIAddon,
483493
dnsControllerAddon,
484494
awsCCMAddon,
485-
leaderElectionAddon,
486495
awsAuthenticatorAddon,
487496
).
488497
runTestTerraformAWS(t)
@@ -491,7 +500,6 @@ func TestComplex(t *testing.T) {
491500
awsEBSCSIAddon,
492501
dnsControllerAddon,
493502
awsCCMAddon,
494-
leaderElectionAddon,
495503
awsAuthenticatorAddon,
496504
).
497505
runTestTerraformAWS(t)
@@ -650,7 +658,7 @@ func TestPrivateCilium(t *testing.T) {
650658
func TestPrivateCilium2(t *testing.T) {
651659
newIntegrationTest("privatecilium.example.com", "privatecilium2").
652660
withPrivate().
653-
withDefaultAddons24().
661+
withDefaultAddons30().
654662
withAddons("networking.cilium.io-k8s-1.16").
655663
withAddons(certManagerAddon).
656664
runTestTerraformAWS(t)
@@ -771,7 +779,7 @@ func TestDiscoveryFeatureGate(t *testing.T) {
771779
newIntegrationTest("minimal.example.com", "public-jwks-apiserver").
772780
withDefaultServiceAccountRoles24().
773781
withServiceAccountRole("aws-node-termination-handler.kube-system", true).
774-
withDefaultAddons24().
782+
withDefaultAddons30().
775783
withOIDCDiscovery().
776784
runTestTerraformAWS(t)
777785
}
@@ -845,30 +853,6 @@ func TestManyAddonsCCMIRSA(t *testing.T) {
845853
runTestTerraformAWS(t)
846854
}
847855

848-
func TestManyAddonsCCMIRSA24(t *testing.T) {
849-
newIntegrationTest("minimal.example.com", "many-addons-ccm-irsa24").
850-
withOIDCDiscovery().
851-
withServiceAccountRole("aws-load-balancer-controller.kube-system", true).
852-
withServiceAccountRole("dns-controller.kube-system", true).
853-
withServiceAccountRole("aws-cloud-controller-manager.kube-system", true).
854-
withServiceAccountRole("cluster-autoscaler.kube-system", true).
855-
withServiceAccountRole("ebs-csi-controller-sa.kube-system", true).
856-
withServiceAccountRole("aws-node-termination-handler.kube-system", true).
857-
withAddons(
858-
"aws-load-balancer-controller.addons.k8s.io-k8s-1.19",
859-
"aws-ebs-csi-driver.addons.k8s.io-k8s-1.17",
860-
"certmanager.io-k8s-1.16",
861-
"cluster-autoscaler.addons.k8s.io-k8s-1.15",
862-
"networking.amazon-vpc-routed-eni-k8s-1.16",
863-
"snapshot-controller.addons.k8s.io-k8s-1.20",
864-
"aws-cloud-controller.addons.k8s.io-k8s-1.18",
865-
leaderElectionAddon,
866-
metricsServerAddon,
867-
dnsControllerAddon,
868-
).
869-
runTestTerraformAWS(t)
870-
}
871-
872856
func TestManyAddonsCCMIRSA25(t *testing.T) {
873857
newIntegrationTest("minimal.example.com", "many-addons-ccm-irsa25").
874858
withOIDCDiscovery().

‎hack/generate-asset-hashes.sh

+1-5
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,9 @@ EOF
4444
--base https://dl.k8s.io/release/ \
4545
--prefix "v${version}/" \
4646
--exclude "**/arm/**" \
47-
--exclude "**/s390x/**" \
4847
--exclude "**/ppc64le/**" \
48+
--exclude "**/s390x/**" \
4949
--exclude "**/windows/**" \
50-
--exclude "**/*-s390x.tar.gz" \
51-
--exclude "**/*-ppc64le.tar.gz" \
5250
--exclude "**/*.tar.gz" \
5351
| sed "s@files:@# kubernetes ${version}@g" >> "${REPO_ROOT}/pkg/assets/assetdata/k8s-${prefix}.yaml"
5452
done
@@ -80,13 +78,11 @@ EOF
8078
done
8179
}
8280

83-
generate_k8s_hashes 1.24 17
8481
generate_k8s_hashes 1.25 16
8582
generate_k8s_hashes 1.26 15
8683
generate_k8s_hashes 1.27 13
8784
generate_k8s_hashes 1.28 9
8885
generate_k8s_hashes 1.29 4
8986
generate_k8s_hashes 1.30 0
9087

91-
9288
generate_runc_hashes 1.1 12

‎kops-version.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ var Version = KOPS_RELEASE_VERSION
2121

2222
// These constants are parsed by build tooling - be careful about changing the formats
2323
const (
24-
KOPS_RELEASE_VERSION = "1.29.0-beta.1"
25-
KOPS_CI_VERSION = "1.29.0-beta.2"
24+
KOPS_RELEASE_VERSION = "1.30.0-alpha.1"
25+
KOPS_CI_VERSION = "1.30.0-alpha.2"
2626
)
2727

2828
// GitVersion should be replaced by the makefile

‎pkg/apis/kops/validation/validation_test.go

-11
Original file line numberDiff line numberDiff line change
@@ -372,17 +372,6 @@ func TestValidateKubeControllermanager(t *testing.T) {
372372
},
373373
ExpectedDetail: "experimentalClusterSigningDuration has been replaced with clusterSigningDuration as of kubernetes 1.25",
374374
},
375-
{
376-
Input: kops.KubeControllerManagerConfig{
377-
ExperimentalClusterSigningDuration: &metav1.Duration{Duration: time.Hour},
378-
},
379-
Cluster: &kops.Cluster{
380-
Spec: kops.ClusterSpec{
381-
KubernetesVersion: "1.24.0",
382-
},
383-
},
384-
ExpectedErrors: []string{},
385-
},
386375
}
387376
for _, g := range grid {
388377
if g.Cluster == nil {

0 commit comments

Comments
 (0)