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

Use cluster autoscaler 1.26 on k8s 1.26 clusters

This commit is contained in:
Ole Markus With 2022-12-20 20:29:47 +01:00
parent bfabf3752a
commit 8511b18b16
7 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,18 +43,20 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o interface{}) error {
v, err := util.ParseKubernetesVersion(clusterSpec.KubernetesVersion) v, err := util.ParseKubernetesVersion(clusterSpec.KubernetesVersion)
if err == nil { if err == nil {
switch v.Minor { switch v.Minor {
case 25:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0"
case 24:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0"
case 23:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.1"
case 22:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.3"
case 21: case 21:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.3" image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.3"
default: case 22:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.3"
case 23:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.1"
case 24:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0"
case 25:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0" image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0"
case 26:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0"
default:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0"
} }
} }
cas.Image = fi.PtrTo(image) cas.Image = fi.PtrTo(image)

2
tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content
View File

@ -33,7 +33,7 @@ spec:
balanceSimilarNodeGroups: false balanceSimilarNodeGroups: false
enabled: true enabled: true
expander: random expander: random
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0 image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0
maxNodeProvisionTime: 15m0s maxNodeProvisionTime: 15m0s
newPodScaleUpDelay: 0s newPodScaleUpDelay: 0s
scaleDownDelayAfterAdd: 10m0s scaleDownDelayAfterAdd: 10m0s

2
tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -41,7 +41,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.15 - id: k8s-1.15
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
manifestHash: 7b18a30ca3e842db84aabd59434c8d2c7de35a38c9ebaff9ba203b4cc3a82e1b manifestHash: 10c96e535d61975b58b27ac8beef2da578df330febaed51db73c249d545d20da
name: cluster-autoscaler.addons.k8s.io name: cluster-autoscaler.addons.k8s.io
selector: selector:
k8s-addon: cluster-autoscaler.addons.k8s.io k8s-addon: cluster-autoscaler.addons.k8s.io

2
tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
View File

@ -344,7 +344,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/cluster-autoscaler.kube-system.sa.minimal.example.com value: arn:aws-test:iam::123456789012:role/cluster-autoscaler.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE - name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token value: /var/run/secrets/amazonaws.com/token
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0 image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
failureThreshold: 3 failureThreshold: 3

2
tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content
View File

@ -31,7 +31,7 @@ spec:
balanceSimilarNodeGroups: false balanceSimilarNodeGroups: false
enabled: true enabled: true
expander: random expander: random
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0 image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0
maxNodeProvisionTime: 15m0s maxNodeProvisionTime: 15m0s
newPodScaleUpDelay: 0s newPodScaleUpDelay: 0s
scaleDownDelayAfterAdd: 10m0s scaleDownDelayAfterAdd: 10m0s

2
tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -41,7 +41,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.15 - id: k8s-1.15
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
manifestHash: 5253c30e7851d3ff94e7e8cda8fd4e780ce3d3abe0e25c2e5c4e395dc6a4b732 manifestHash: c4b9cdc4f3dc1724be5ea9e62abe442ec7afc53a64d290924b13f9ccdea95551
name: cluster-autoscaler.addons.k8s.io name: cluster-autoscaler.addons.k8s.io
selector: selector:
k8s-addon: cluster-autoscaler.addons.k8s.io k8s-addon: cluster-autoscaler.addons.k8s.io

2
tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
View File

@ -338,7 +338,7 @@ spec:
- --logtostderr=true - --logtostderr=true
- --stderrthreshold=info - --stderrthreshold=info
- --v=4 - --v=4
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0 image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
failureThreshold: 3 failureThreshold: 3