Skip to content

Commit 25122c8

Browse files
committed
./hack/update-expected.sh
1 parent 72eb366 commit 25122c8

204 files changed

Lines changed: 1029 additions & 461 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
version: 9.99.0
4141
- id: k8s-1.11
4242
manifest: node-termination-handler.aws/k8s-1.11.yaml
43-
manifestHash: 4bc2bbfaf8a4345bc74d6f7939d6c4880b04de781ea2851faf1936c4f582f43f
43+
manifestHash: 98a07542a75cd54fac9198a694c1c2f4bd7f0a46428fff6dd6be9a02d8117c7d
4444
name: node-termination-handler.aws
4545
prune:
4646
kinds:

tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-node-termination-handler.aws-k8s-1.11_content

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
app.kubernetes.io/managed-by: kops
88
app.kubernetes.io/name: aws-node-termination-handler
99
app.kubernetes.io/part-of: aws-node-termination-handler
10-
app.kubernetes.io/version: v1.22.0
10+
app.kubernetes.io/version: v1.25.5
1111
k8s-addon: node-termination-handler.aws
1212
k8s-app: aws-node-termination-handler
1313
name: aws-node-termination-handler
@@ -24,7 +24,7 @@ metadata:
2424
app.kubernetes.io/managed-by: kops
2525
app.kubernetes.io/name: aws-node-termination-handler
2626
app.kubernetes.io/part-of: aws-node-termination-handler
27-
app.kubernetes.io/version: v1.22.0
27+
app.kubernetes.io/version: v1.25.5
2828
k8s-addon: node-termination-handler.aws
2929
name: aws-node-termination-handler
3030
rules:
@@ -81,7 +81,7 @@ metadata:
8181
app.kubernetes.io/managed-by: kops
8282
app.kubernetes.io/name: aws-node-termination-handler
8383
app.kubernetes.io/part-of: aws-node-termination-handler
84-
app.kubernetes.io/version: v1.22.0
84+
app.kubernetes.io/version: v1.25.5
8585
k8s-addon: node-termination-handler.aws
8686
name: aws-node-termination-handler
8787
roleRef:
@@ -105,7 +105,7 @@ metadata:
105105
app.kubernetes.io/managed-by: kops
106106
app.kubernetes.io/name: aws-node-termination-handler
107107
app.kubernetes.io/part-of: aws-node-termination-handler
108-
app.kubernetes.io/version: v1.22.0
108+
app.kubernetes.io/version: v1.25.5
109109
k8s-addon: node-termination-handler.aws
110110
k8s-app: aws-node-termination-handler
111111
name: aws-node-termination-handler
@@ -180,6 +180,8 @@ spec:
180180
value: "false"
181181
- name: TAINT_NODE
182182
value: "false"
183+
- name: ENABLE_OUT_OF_SERVICE_TAINT
184+
value: "false"
183185
- name: EXCLUDE_FROM_LOAD_BALANCERS
184186
value: "true"
185187
- name: DELETE_LOCAL_DATA
@@ -202,7 +204,13 @@ spec:
202204
value: "false"
203205
- name: WORKERS
204206
value: "10"
205-
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0
207+
- name: HEARTBEAT_INTERVAL
208+
value: "-1"
209+
- name: HEARTBEAT_UNTIL
210+
value: "-1"
211+
- name: SQS_MSG_VISIBILITY_TIMEOUT_SEC
212+
value: "20"
213+
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.25.5
206214
imagePullPolicy: IfNotPresent
207215
livenessProbe:
208216
httpGet:

tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ spec:
184184
nodeTerminationHandler:
185185
cpuRequest: 50m
186186
deleteSQSMsgIfNodeNotFound: false
187+
enableOutOfServiceTaint: false
187188
enableRebalanceDraining: false
188189
enableRebalanceMonitoring: false
189190
enableScheduledEventDraining: true
@@ -195,7 +196,7 @@ spec:
195196
podTerminationGracePeriod: -1
196197
prometheusEnable: false
197198
taintNode: false
198-
version: v1.22.0
199+
version: v1.25.5
199200
nonMasqueradeCIDR: 100.64.0.0/10
200201
podCIDR: 100.96.0.0/11
201202
secretStore: memfs://tests/additionalobjects.example.com/secrets

tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ spec:
176176
nodeTerminationHandler:
177177
cpuRequest: 50m
178178
deleteSQSMsgIfNodeNotFound: false
179+
enableOutOfServiceTaint: false
179180
enableRebalanceDraining: false
180181
enableRebalanceMonitoring: false
181182
enableScheduledEventDraining: true
@@ -187,7 +188,7 @@ spec:
187188
podTerminationGracePeriod: -1
188189
prometheusEnable: false
189190
taintNode: false
190-
version: v1.22.0
191+
version: v1.25.5
191192
nonMasqueradeCIDR: 100.64.0.0/10
192193
podCIDR: 100.96.0.0/11
193194
secretStore: memfs://clusters.example.com/minimal.example.com/secrets

tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
version: 9.99.0
4141
- id: k8s-1.11
4242
manifest: node-termination-handler.aws/k8s-1.11.yaml
43-
manifestHash: 12afc26066e7270088e7ebeecc42df2e7aa789ac8be20c3b2f4a362f6eaac8d4
43+
manifestHash: 7c870dec7680a2e7098c630aaf4ef3e2649d25f9506caf6528f848b5effeff70
4444
name: node-termination-handler.aws
4545
prune:
4646
kinds:

tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
app.kubernetes.io/managed-by: kops
88
app.kubernetes.io/name: aws-node-termination-handler
99
app.kubernetes.io/part-of: aws-node-termination-handler
10-
app.kubernetes.io/version: v1.22.0
10+
app.kubernetes.io/version: v1.25.5
1111
k8s-addon: node-termination-handler.aws
1212
k8s-app: aws-node-termination-handler
1313
name: aws-node-termination-handler
@@ -24,7 +24,7 @@ metadata:
2424
app.kubernetes.io/managed-by: kops
2525
app.kubernetes.io/name: aws-node-termination-handler
2626
app.kubernetes.io/part-of: aws-node-termination-handler
27-
app.kubernetes.io/version: v1.22.0
27+
app.kubernetes.io/version: v1.25.5
2828
k8s-addon: node-termination-handler.aws
2929
name: aws-node-termination-handler
3030
rules:
@@ -81,7 +81,7 @@ metadata:
8181
app.kubernetes.io/managed-by: kops
8282
app.kubernetes.io/name: aws-node-termination-handler
8383
app.kubernetes.io/part-of: aws-node-termination-handler
84-
app.kubernetes.io/version: v1.22.0
84+
app.kubernetes.io/version: v1.25.5
8585
k8s-addon: node-termination-handler.aws
8686
name: aws-node-termination-handler
8787
roleRef:
@@ -105,7 +105,7 @@ metadata:
105105
app.kubernetes.io/managed-by: kops
106106
app.kubernetes.io/name: aws-node-termination-handler
107107
app.kubernetes.io/part-of: aws-node-termination-handler
108-
app.kubernetes.io/version: v1.22.0
108+
app.kubernetes.io/version: v1.25.5
109109
k8s-addon: node-termination-handler.aws
110110
k8s-app: aws-node-termination-handler
111111
name: aws-node-termination-handler
@@ -180,6 +180,8 @@ spec:
180180
value: "false"
181181
- name: TAINT_NODE
182182
value: "false"
183+
- name: ENABLE_OUT_OF_SERVICE_TAINT
184+
value: "false"
183185
- name: EXCLUDE_FROM_LOAD_BALANCERS
184186
value: "true"
185187
- name: DELETE_LOCAL_DATA
@@ -202,7 +204,13 @@ spec:
202204
value: "false"
203205
- name: WORKERS
204206
value: "10"
205-
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0
207+
- name: HEARTBEAT_INTERVAL
208+
value: "-1"
209+
- name: HEARTBEAT_UNTIL
210+
value: "-1"
211+
- name: SQS_MSG_VISIBILITY_TIMEOUT_SEC
212+
value: "20"
213+
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.25.5
206214
imagePullPolicy: IfNotPresent
207215
livenessProbe:
208216
httpGet:

tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ spec:
182182
nodeTerminationHandler:
183183
cpuRequest: 50m
184184
deleteSQSMsgIfNodeNotFound: false
185+
enableOutOfServiceTaint: false
185186
enableRebalanceDraining: false
186187
enableRebalanceMonitoring: false
187188
enableScheduledEventDraining: true
@@ -193,7 +194,7 @@ spec:
193194
podTerminationGracePeriod: -1
194195
prometheusEnable: false
195196
taintNode: false
196-
version: v1.22.0
197+
version: v1.25.5
197198
nonMasqueradeCIDR: 100.64.0.0/10
198199
podCIDR: 100.96.0.0/11
199200
secretStore: memfs://clusters.example.com/minimal.example.com/secrets

tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ spec:
9494
version: 9.99.0
9595
- id: k8s-1.11
9696
manifest: node-termination-handler.aws/k8s-1.11.yaml
97-
manifestHash: bbcbef76cac42897d1cdf9c85b8ff17c17839b436a3856d7e483589b2839fbcc
97+
manifestHash: e5e2fcca4e59f5299eecd611ada8b5cbf8419c69471c9385e710e89851d16bfb
9898
name: node-termination-handler.aws
9999
prune:
100100
kinds:

tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
app.kubernetes.io/managed-by: kops
88
app.kubernetes.io/name: aws-node-termination-handler
99
app.kubernetes.io/part-of: aws-node-termination-handler
10-
app.kubernetes.io/version: v1.22.0
10+
app.kubernetes.io/version: v1.25.5
1111
k8s-addon: node-termination-handler.aws
1212
k8s-app: aws-node-termination-handler
1313
name: aws-node-termination-handler
@@ -24,7 +24,7 @@ metadata:
2424
app.kubernetes.io/managed-by: kops
2525
app.kubernetes.io/name: aws-node-termination-handler
2626
app.kubernetes.io/part-of: aws-node-termination-handler
27-
app.kubernetes.io/version: v1.22.0
27+
app.kubernetes.io/version: v1.25.5
2828
k8s-addon: node-termination-handler.aws
2929
name: aws-node-termination-handler
3030
rules:
@@ -81,7 +81,7 @@ metadata:
8181
app.kubernetes.io/managed-by: kops
8282
app.kubernetes.io/name: aws-node-termination-handler
8383
app.kubernetes.io/part-of: aws-node-termination-handler
84-
app.kubernetes.io/version: v1.22.0
84+
app.kubernetes.io/version: v1.25.5
8585
k8s-addon: node-termination-handler.aws
8686
name: aws-node-termination-handler
8787
roleRef:
@@ -105,7 +105,7 @@ metadata:
105105
app.kubernetes.io/managed-by: kops
106106
app.kubernetes.io/name: aws-node-termination-handler
107107
app.kubernetes.io/part-of: aws-node-termination-handler
108-
app.kubernetes.io/version: v1.22.0
108+
app.kubernetes.io/version: v1.25.5
109109
k8s-addon: node-termination-handler.aws
110110
k8s-app: aws-node-termination-handler
111111
name: aws-node-termination-handler
@@ -170,6 +170,8 @@ spec:
170170
value: "false"
171171
- name: TAINT_NODE
172172
value: "false"
173+
- name: ENABLE_OUT_OF_SERVICE_TAINT
174+
value: "false"
173175
- name: EXCLUDE_FROM_LOAD_BALANCERS
174176
value: "true"
175177
- name: DELETE_LOCAL_DATA
@@ -192,11 +194,17 @@ spec:
192194
value: "false"
193195
- name: WORKERS
194196
value: "10"
197+
- name: HEARTBEAT_INTERVAL
198+
value: "-1"
199+
- name: HEARTBEAT_UNTIL
200+
value: "-1"
201+
- name: SQS_MSG_VISIBILITY_TIMEOUT_SEC
202+
value: "20"
195203
- name: AWS_ROLE_ARN
196204
value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.example.com
197205
- name: AWS_WEB_IDENTITY_TOKEN_FILE
198206
value: /var/run/secrets/amazonaws.com/token
199-
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0
207+
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.25.5
200208
imagePullPolicy: IfNotPresent
201209
livenessProbe:
202210
httpGet:

tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
version: 9.99.0
4141
- id: k8s-1.11
4242
manifest: node-termination-handler.aws/k8s-1.11.yaml
43-
manifestHash: 5a9410d96be1728e452abf03f6cd1b112e2e29c369a69db55e2c1c79f8c76e26
43+
manifestHash: 0ead4a2b1ed6f52c4ac7c36f4dbdea4b5a581344bba8e9e7d7a79748c5feac25
4444
name: node-termination-handler.aws
4545
prune:
4646
kinds:

0 commit comments

Comments
 (0)