mirror of https://github.com/kubernetes/kops.git
				
				
				
			Merge pull request #14235 from olemarkus/bump-cas-125
Bump cluster-autoscaler images
This commit is contained in:
		
						commit
						159bc6a484
					
				| 
						 | 
				
			
			@ -44,19 +44,19 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o interface{}) error {
 | 
			
		|||
		if err == nil {
 | 
			
		||||
			switch v.Minor {
 | 
			
		||||
			case 25:
 | 
			
		||||
				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0"
 | 
			
		||||
				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.0"
 | 
			
		||||
				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.1"
 | 
			
		||||
			case 22:
 | 
			
		||||
				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.2"
 | 
			
		||||
				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.3"
 | 
			
		||||
			case 21:
 | 
			
		||||
				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.2"
 | 
			
		||||
				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.3"
 | 
			
		||||
			case 20:
 | 
			
		||||
				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.20.1"
 | 
			
		||||
				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.20.3"
 | 
			
		||||
			default:
 | 
			
		||||
				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0"
 | 
			
		||||
				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0"
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		cas.Image = fi.String(image)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -33,7 +33,7 @@ spec:
 | 
			
		|||
    balanceSimilarNodeGroups: false
 | 
			
		||||
    enabled: true
 | 
			
		||||
    expander: random
 | 
			
		||||
    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.2
 | 
			
		||||
    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.3
 | 
			
		||||
    maxNodeProvisionTime: 15m0s
 | 
			
		||||
    newPodScaleUpDelay: 0s
 | 
			
		||||
    scaleDownDelayAfterAdd: 10m0s
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -41,7 +41,7 @@ spec:
 | 
			
		|||
    version: 9.99.0
 | 
			
		||||
  - id: k8s-1.15
 | 
			
		||||
    manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
 | 
			
		||||
    manifestHash: c20d5158b4c6343a85e02495db2ae251e06f1ada95bfde99b471dc4b8c447092
 | 
			
		||||
    manifestHash: 356aa2af7e37cb715c74cba3dc013b8e3982d2459b78cbf333bdad379d5d0055
 | 
			
		||||
    name: cluster-autoscaler.addons.k8s.io
 | 
			
		||||
    selector:
 | 
			
		||||
      k8s-addon: cluster-autoscaler.addons.k8s.io
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -340,7 +340,7 @@ spec:
 | 
			
		|||
          value: arn:aws-test:iam::123456789012:role/cluster-autoscaler.kube-system.sa.minimal.example.com
 | 
			
		||||
        - name: AWS_WEB_IDENTITY_TOKEN_FILE
 | 
			
		||||
          value: /var/run/secrets/amazonaws.com/token
 | 
			
		||||
        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.2
 | 
			
		||||
        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.3
 | 
			
		||||
        imagePullPolicy: IfNotPresent
 | 
			
		||||
        livenessProbe:
 | 
			
		||||
          failureThreshold: 3
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -33,7 +33,7 @@ spec:
 | 
			
		|||
    balanceSimilarNodeGroups: false
 | 
			
		||||
    enabled: true
 | 
			
		||||
    expander: random
 | 
			
		||||
    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.0
 | 
			
		||||
    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.1
 | 
			
		||||
    maxNodeProvisionTime: 15m0s
 | 
			
		||||
    newPodScaleUpDelay: 0s
 | 
			
		||||
    scaleDownDelayAfterAdd: 10m0s
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -48,7 +48,7 @@ spec:
 | 
			
		|||
    version: 9.99.0
 | 
			
		||||
  - id: k8s-1.15
 | 
			
		||||
    manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
 | 
			
		||||
    manifestHash: abb81e68a6726627a4b2b0d7baf06e73ea73be8c7965fec9d4ea85424ad0b8b2
 | 
			
		||||
    manifestHash: cd7dcf9f8dcee6c325f114c3581af77161cb94cd8ac2ee6f70c5e7b1dea0f48d
 | 
			
		||||
    name: cluster-autoscaler.addons.k8s.io
 | 
			
		||||
    selector:
 | 
			
		||||
      k8s-addon: cluster-autoscaler.addons.k8s.io
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -340,7 +340,7 @@ spec:
 | 
			
		|||
          value: arn:aws-test:iam::123456789012:role/cluster-autoscaler.kube-system.sa.minimal.example.com
 | 
			
		||||
        - name: AWS_WEB_IDENTITY_TOKEN_FILE
 | 
			
		||||
          value: /var/run/secrets/amazonaws.com/token
 | 
			
		||||
        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.0
 | 
			
		||||
        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.1
 | 
			
		||||
        imagePullPolicy: IfNotPresent
 | 
			
		||||
        livenessProbe:
 | 
			
		||||
          failureThreshold: 3
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -33,7 +33,7 @@ spec:
 | 
			
		|||
    balanceSimilarNodeGroups: false
 | 
			
		||||
    enabled: true
 | 
			
		||||
    expander: random
 | 
			
		||||
    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0
 | 
			
		||||
    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0
 | 
			
		||||
    maxNodeProvisionTime: 15m0s
 | 
			
		||||
    newPodScaleUpDelay: 0s
 | 
			
		||||
    scaleDownDelayAfterAdd: 10m0s
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -48,7 +48,7 @@ spec:
 | 
			
		|||
    version: 9.99.0
 | 
			
		||||
  - id: k8s-1.15
 | 
			
		||||
    manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
 | 
			
		||||
    manifestHash: 32c2d0d535f2a11e9034cf857011b214402f08c16b6bc1cf22cfbd54f2a62a5a
 | 
			
		||||
    manifestHash: e7077b9af47fa0146ed707c801cb96b86cc9b9fb318b40c3da386a43a956129c
 | 
			
		||||
    name: cluster-autoscaler.addons.k8s.io
 | 
			
		||||
    selector:
 | 
			
		||||
      k8s-addon: cluster-autoscaler.addons.k8s.io
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -340,7 +340,7 @@ spec:
 | 
			
		|||
          value: arn:aws-test:iam::123456789012:role/cluster-autoscaler.kube-system.sa.minimal.example.com
 | 
			
		||||
        - name: AWS_WEB_IDENTITY_TOKEN_FILE
 | 
			
		||||
          value: /var/run/secrets/amazonaws.com/token
 | 
			
		||||
        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0
 | 
			
		||||
        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0
 | 
			
		||||
        imagePullPolicy: IfNotPresent
 | 
			
		||||
        livenessProbe:
 | 
			
		||||
          failureThreshold: 3
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -33,7 +33,7 @@ spec:
 | 
			
		|||
    balanceSimilarNodeGroups: false
 | 
			
		||||
    enabled: true
 | 
			
		||||
    expander: random
 | 
			
		||||
    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0
 | 
			
		||||
    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0
 | 
			
		||||
    maxNodeProvisionTime: 15m0s
 | 
			
		||||
    newPodScaleUpDelay: 0s
 | 
			
		||||
    scaleDownDelayAfterAdd: 10m0s
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -41,7 +41,7 @@ spec:
 | 
			
		|||
    version: 9.99.0
 | 
			
		||||
  - id: k8s-1.15
 | 
			
		||||
    manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
 | 
			
		||||
    manifestHash: 32c2d0d535f2a11e9034cf857011b214402f08c16b6bc1cf22cfbd54f2a62a5a
 | 
			
		||||
    manifestHash: e7077b9af47fa0146ed707c801cb96b86cc9b9fb318b40c3da386a43a956129c
 | 
			
		||||
    name: cluster-autoscaler.addons.k8s.io
 | 
			
		||||
    selector:
 | 
			
		||||
      k8s-addon: cluster-autoscaler.addons.k8s.io
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -340,7 +340,7 @@ spec:
 | 
			
		|||
          value: arn:aws-test:iam::123456789012:role/cluster-autoscaler.kube-system.sa.minimal.example.com
 | 
			
		||||
        - name: AWS_WEB_IDENTITY_TOKEN_FILE
 | 
			
		||||
          value: /var/run/secrets/amazonaws.com/token
 | 
			
		||||
        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0
 | 
			
		||||
        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0
 | 
			
		||||
        imagePullPolicy: IfNotPresent
 | 
			
		||||
        livenessProbe:
 | 
			
		||||
          failureThreshold: 3
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -33,7 +33,7 @@ spec:
 | 
			
		|||
    balanceSimilarNodeGroups: false
 | 
			
		||||
    enabled: true
 | 
			
		||||
    expander: random
 | 
			
		||||
    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.2
 | 
			
		||||
    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.3
 | 
			
		||||
    maxNodeProvisionTime: 15m0s
 | 
			
		||||
    newPodScaleUpDelay: 0s
 | 
			
		||||
    scaleDownDelayAfterAdd: 10m0s
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -41,7 +41,7 @@ spec:
 | 
			
		|||
    version: 9.99.0
 | 
			
		||||
  - id: k8s-1.15
 | 
			
		||||
    manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
 | 
			
		||||
    manifestHash: b0ff8e67871acaff74c97c66a2db69b8b532a133176a8ce851891f4bb5ffaed3
 | 
			
		||||
    manifestHash: 6de82c3f846c3b3f7fb7cd92ab62635a6174e4c92c343374964a51e44a0691ca
 | 
			
		||||
    name: cluster-autoscaler.addons.k8s.io
 | 
			
		||||
    selector:
 | 
			
		||||
      k8s-addon: cluster-autoscaler.addons.k8s.io
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -339,7 +339,7 @@ spec:
 | 
			
		|||
        env:
 | 
			
		||||
        - name: AWS_REGION
 | 
			
		||||
          value: us-test-1
 | 
			
		||||
        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.2
 | 
			
		||||
        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.3
 | 
			
		||||
        imagePullPolicy: IfNotPresent
 | 
			
		||||
        livenessProbe:
 | 
			
		||||
          failureThreshold: 3
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,7 +24,7 @@ spec:
 | 
			
		|||
    balanceSimilarNodeGroups: false
 | 
			
		||||
    enabled: true
 | 
			
		||||
    expander: random
 | 
			
		||||
    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.2
 | 
			
		||||
    image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.3
 | 
			
		||||
    maxNodeProvisionTime: 15m0s
 | 
			
		||||
    newPodScaleUpDelay: 0s
 | 
			
		||||
    podAnnotations:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -41,7 +41,7 @@ spec:
 | 
			
		|||
    version: 9.99.0
 | 
			
		||||
  - id: k8s-1.15
 | 
			
		||||
    manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
 | 
			
		||||
    manifestHash: 0b7796d3ad2a8f30ea9c082d3148825ce8f729d2b41b3894fff1b73f0698c350
 | 
			
		||||
    manifestHash: 8234f4b6bdccbbeb8e3df94093a0ed737e8c3a333c5193d7fd7ffbe7640cf1ec
 | 
			
		||||
    name: cluster-autoscaler.addons.k8s.io
 | 
			
		||||
    selector:
 | 
			
		||||
      k8s-addon: cluster-autoscaler.addons.k8s.io
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -340,7 +340,7 @@ spec:
 | 
			
		|||
        env:
 | 
			
		||||
        - name: AWS_REGION
 | 
			
		||||
          value: us-test-1
 | 
			
		||||
        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.2
 | 
			
		||||
        image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.3
 | 
			
		||||
        imagePullPolicy: IfNotPresent
 | 
			
		||||
        livenessProbe:
 | 
			
		||||
          failureThreshold: 3
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue