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

Merge pull request #14150 from olemarkus/cas-default-image2 

Add default image for CAS that exists
This commit is contained in:
Kubernetes Prow Robot 2022-08-20 03:29:46 -07:00 committed by GitHub
parent 8f20d22ef7 3265e9db0e
commit e8fcb0c132
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o interface{}) error {
if cas.Image == nil { if cas.Image == nil {
image := "registry.k8s.io/autoscaling/cluster-autoscaler:latest" image := ""
v, err := util.ParseKubernetesVersion(clusterSpec.KubernetesVersion) v, err := util.ParseKubernetesVersion(clusterSpec.KubernetesVersion)
if err == nil { if err == nil {
switch v.Minor { switch v.Minor {
@ -55,6 +55,8 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o interface{}) error {
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.2" image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.2"
case 20: case 20:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.20.1" image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.20.1"
default:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0"
} }
} }
cas.Image = fi.String(image) cas.Image = fi.String(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:latest image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.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: cd9be409ba7224ba3ec2f19262ae6b16cb96e332939b1b5e2a12c1874f7f839c manifestHash: 32c2d0d535f2a11e9034cf857011b214402f08c16b6bc1cf22cfbd54f2a62a5a
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

@ -340,7 +340,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:latest image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
failureThreshold: 3 failureThreshold: 3