mirror of https://github.com/kubernetes/kops.git
Merge pull request #15703 from johngmyers/ca-upgrade
Upgrade cluster-autoscaler
This commit is contained in:
commit
0bd7fb98b6
|
|
@ -48,13 +48,15 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o interface{}) error {
|
|||
case 23:
|
||||
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.1"
|
||||
case 24:
|
||||
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0"
|
||||
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.3"
|
||||
case 25:
|
||||
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0"
|
||||
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.3"
|
||||
case 26:
|
||||
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1"
|
||||
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.4"
|
||||
case 27:
|
||||
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.27.3"
|
||||
default:
|
||||
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1"
|
||||
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.27.3"
|
||||
}
|
||||
}
|
||||
cas.Image = fi.PtrTo(image)
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ spec:
|
|||
version: 9.99.0
|
||||
- id: k8s-1.15
|
||||
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
|
||||
manifestHash: d0155a29604d8ceb39798066ad7ad965f540488968df34a361bea4fdf2ee5388
|
||||
manifestHash: 41dc4453160d8f9ae80a1b9beb288252649912296ca56dc3f70dda6cf3cbfaa1
|
||||
name: cluster-autoscaler.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: cluster-autoscaler.addons.k8s.io
|
||||
|
|
|
|||
|
|
@ -372,7 +372,7 @@ spec:
|
|||
env:
|
||||
- name: AWS_REGION
|
||||
value: us-test-1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.4
|
||||
imagePullPolicy: IfNotPresent
|
||||
livenessProbe:
|
||||
failureThreshold: 3
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ spec:
|
|||
enabled: true
|
||||
expander: priority
|
||||
ignoreDaemonSetsUtilization: false
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.4
|
||||
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: f20652532bf2fe33a36ed1ba75d04d10c87286c1b9f86c38a975fc6005c8b1e8
|
||||
manifestHash: 9b04006b3916dbc0e5fe22f2a23a1fa72d1665e12fe1b96f4cd7707cb823f7d7
|
||||
name: cluster-autoscaler.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: cluster-autoscaler.addons.k8s.io
|
||||
|
|
|
|||
|
|
@ -372,7 +372,7 @@ spec:
|
|||
env:
|
||||
- name: AWS_REGION
|
||||
value: us-test-1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.4
|
||||
imagePullPolicy: IfNotPresent
|
||||
livenessProbe:
|
||||
failureThreshold: 3
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ spec:
|
|||
enabled: true
|
||||
expander: priority
|
||||
ignoreDaemonSetsUtilization: false
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.4
|
||||
maxNodeProvisionTime: 15m0s
|
||||
newPodScaleUpDelay: 0s
|
||||
scaleDownDelayAfterAdd: 10m0s
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ spec:
|
|||
enabled: true
|
||||
expander: random
|
||||
ignoreDaemonSetsUtilization: false
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.4
|
||||
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: f2143d6228cb74163f545f0269f2e54b4562193b3624634a1920d34d7053a97b
|
||||
manifestHash: 1bcf890bf91afc2141855d0a98429ee28f2e80b9659b052560f09c4ead0a52a4
|
||||
name: cluster-autoscaler.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: cluster-autoscaler.addons.k8s.io
|
||||
|
|
|
|||
|
|
@ -345,7 +345,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.26.1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.4
|
||||
imagePullPolicy: IfNotPresent
|
||||
livenessProbe:
|
||||
failureThreshold: 3
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ spec:
|
|||
enabled: true
|
||||
expander: random
|
||||
ignoreDaemonSetsUtilization: false
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.3
|
||||
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: e4bff9a2ea75d0998cbaf50cb4ec75a70a4b9e455fcee7ffa5acefabea6560a2
|
||||
manifestHash: c84d4e17a7da70def043b48499f44de24e95d66f4a5c86c876e256c7da9c66fb
|
||||
name: cluster-autoscaler.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: cluster-autoscaler.addons.k8s.io
|
||||
|
|
|
|||
|
|
@ -345,7 +345,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.24.3
|
||||
imagePullPolicy: IfNotPresent
|
||||
livenessProbe:
|
||||
failureThreshold: 3
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ spec:
|
|||
enabled: true
|
||||
expander: random
|
||||
ignoreDaemonSetsUtilization: false
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.3
|
||||
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: 938a4d98c22dea2da0244e52cf99986b09b097115baa604b43d54346f632ac80
|
||||
manifestHash: bcb9a7e407350351a72a9adcff81de63e1cbf714602db908c15aa163ddcbdecc
|
||||
name: cluster-autoscaler.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: cluster-autoscaler.addons.k8s.io
|
||||
|
|
|
|||
|
|
@ -345,7 +345,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.25.0
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.3
|
||||
imagePullPolicy: IfNotPresent
|
||||
livenessProbe:
|
||||
failureThreshold: 3
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ spec:
|
|||
enabled: true
|
||||
expander: random
|
||||
ignoreDaemonSetsUtilization: false
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.4
|
||||
maxNodeProvisionTime: 15m0s
|
||||
newPodScaleUpDelay: 0s
|
||||
scaleDownDelayAfterAdd: 10m0s
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ spec:
|
|||
version: 9.99.0
|
||||
- id: k8s-1.15
|
||||
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
|
||||
manifestHash: f2143d6228cb74163f545f0269f2e54b4562193b3624634a1920d34d7053a97b
|
||||
manifestHash: 1bcf890bf91afc2141855d0a98429ee28f2e80b9659b052560f09c4ead0a52a4
|
||||
name: cluster-autoscaler.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: cluster-autoscaler.addons.k8s.io
|
||||
|
|
|
|||
|
|
@ -345,7 +345,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.26.1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.4
|
||||
imagePullPolicy: IfNotPresent
|
||||
livenessProbe:
|
||||
failureThreshold: 3
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ spec:
|
|||
enabled: true
|
||||
expander: random
|
||||
ignoreDaemonSetsUtilization: false
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.4
|
||||
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: a42f68cd53cd69bccc7e1e19e99569b038d3d5d360e3cef21161c2f21b9bd704
|
||||
manifestHash: cee609f9fd7083943bc7b4647419a4fb0d9801bef2a6d3f049ef1e31ffdeb31d
|
||||
name: cluster-autoscaler.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: cluster-autoscaler.addons.k8s.io
|
||||
|
|
|
|||
|
|
@ -347,7 +347,7 @@ spec:
|
|||
env:
|
||||
- name: AWS_REGION
|
||||
value: us-test-1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.4
|
||||
imagePullPolicy: IfNotPresent
|
||||
livenessProbe:
|
||||
failureThreshold: 3
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ spec:
|
|||
enabled: true
|
||||
expander: random
|
||||
ignoreDaemonSetsUtilization: false
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.4
|
||||
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: ff5b90b8081567456315dacd3a1796048f3277529ca9f1a6e31ea80a5c47ed30
|
||||
manifestHash: bb8cb28548c334a078832b6652a77e2e96b099a8a6dc95eeac024a233ddee37b
|
||||
name: cluster-autoscaler.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: cluster-autoscaler.addons.k8s.io
|
||||
|
|
|
|||
|
|
@ -343,7 +343,7 @@ spec:
|
|||
- --logtostderr=true
|
||||
- --stderrthreshold=info
|
||||
- --v=4
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.4
|
||||
imagePullPolicy: IfNotPresent
|
||||
livenessProbe:
|
||||
failureThreshold: 3
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ spec:
|
|||
enabled: true
|
||||
expander: random
|
||||
ignoreDaemonSetsUtilization: false
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.4
|
||||
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: 4d573f9ce40fdb889103a77b1ae27e0adeda65e6a820dc876e968657a4df2592
|
||||
manifestHash: 6a987393768f7dd76735ec5451417a7f868120bcc9a05781f9cf033ea8c50904
|
||||
name: cluster-autoscaler.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: cluster-autoscaler.addons.k8s.io
|
||||
|
|
|
|||
|
|
@ -348,7 +348,7 @@ spec:
|
|||
env:
|
||||
- name: AWS_REGION
|
||||
value: us-test-1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1
|
||||
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.4
|
||||
imagePullPolicy: IfNotPresent
|
||||
livenessProbe:
|
||||
failureThreshold: 3
|
||||
|
|
|
|||
Loading…
Reference in New Issue