kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More kops 1.23 updates

This commit is contained in:
John Gardiner Myers 2021-08-27 22:52:25 -07:00
parent 6655022ce1
commit f041bdafdc
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kops/create_cluster_integration_test.go
View File

@ -44,12 +44,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.17", "v1alpha2")
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.18", "v1alpha2")
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.19", "v1alpha2")
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.20", "v1alpha2")
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.21", "v1alpha2")
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.22", "v1alpha2")
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.23", "v1alpha2")
}
// TestCreateClusterOverride tests the override flag

8
pkg/model/components/clusterautoscaler.go
View File

@ -43,6 +43,8 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o interface{}) error {
v, err := util.ParseKubernetesVersion(clusterSpec.KubernetesVersion)
if err == nil {
switch v.Minor {
case 23:
image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.23.0"
case 22:
image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.22.0"
case 21:
@ -53,12 +55,6 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o interface{}) error {
image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.19.1"
case 18:
image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.18.3"
case 17:
image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.17.4"
case 16:
image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.16.7"
case 15:
image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.15.7"
}
}
cas.Image = fi.String(image)

12
tests/integration/create_cluster/minimal-1.17/expected-v1alpha2.yaml → tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml
View File

@ -34,7 +34,7 @@ spec:
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.17.0
kubernetesVersion: v1.23.0
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16
networking:
@ -64,7 +64,10 @@ metadata:
kops.k8s.io/cluster: minimal.example.com
name: master-us-test-1a
spec:
image: kope.io/k8s-1.17-debian-stretch-amd64-hvm-ebs-2021-02-05
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
instanceMetadata:
httpPutResponseHopLimit: 3
httpTokens: required
machineType: m3.medium
maxSize: 1
minSize: 1
@ -84,7 +87,10 @@ metadata:
kops.k8s.io/cluster: minimal.example.com
name: nodes-us-test-1a
spec:
image: kope.io/k8s-1.17-debian-stretch-amd64-hvm-ebs-2021-02-05
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium
maxSize: 1
minSize: 1

2
tests/integration/create_cluster/minimal-1.17/options.yaml → tests/integration/create_cluster/minimal-1.23/options.yaml
View File

@ -3,4 +3,4 @@ Zones:
- us-test-1a
CloudProvider: aws
Networking: cni
KubernetesVersion: v1.17.0
KubernetesVersion: v1.23.0