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

Merge pull request #14177 from olemarkus/bump-nth-125 

Bump node termination handler to 1.17.0
This commit is contained in:
Kubernetes Prow Robot 2022-08-24 19:12:05 -07:00 committed by GitHub
parent 32e2ac55f1 0cd110d723
commit fa377131b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 71 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
k8s/crds/kops.k8s.io_clusters.yaml
View File

@ -5333,7 +5333,10 @@ spec:
type: boolean
managedASGTag:
description: ManagedASGTag is the tag used to determine which
nodes NTH can take action on
nodes NTH can take action on This field has kept its name even
though it now maps to the --managed-tag flag due to keeping
the API stable. Node termination handler does no longer check
the ASG for this tag, but the actual EC2 instances.
type: string
memoryRequest:
anyOf:

2
pkg/apis/kops/componentconfig.go
View File

@ -945,6 +945,8 @@ type NodeTerminationHandlerConfig struct {
ExcludeFromLoadBalancers *bool `json:"excludeFromLoadBalancers,omitempty"`
// ManagedASGTag is the tag used to determine which nodes NTH can take action on
// This field has kept its name even though it now maps to the --managed-tag flag due to keeping the API stable.
// Node termination handler does no longer check the ASG for this tag, but the actual EC2 instances.
ManagedASGTag *string `json:"managedASGTag,omitempty"`
// MemoryRequest of NodeTerminationHandler container.

2
pkg/apis/kops/v1alpha2/componentconfig.go
View File

@ -971,6 +971,8 @@ type NodeTerminationHandlerConfig struct {
ExcludeFromLoadBalancers *bool `json:"excludeFromLoadBalancers,omitempty"`
// ManagedASGTag is the tag used to determine which nodes NTH can take action on
// This field has kept its name even though it now maps to the --managed-tag flag due to keeping the API stable.
// Node termination handler does no longer check the ASG for this tag, but the actual EC2 instances.
ManagedASGTag *string `json:"managedASGTag,omitempty"`
// MemoryRequest of NodeTerminationHandler container.

2
pkg/apis/kops/v1alpha3/componentconfig.go
View File

@ -938,6 +938,8 @@ type NodeTerminationHandlerConfig struct {
EnableSQSTerminationDraining *bool `json:"enableSQSTerminationDraining,omitempty"`
// ManagedASGTag is the tag used to determine which nodes NTH can take action on
// This field has kept its name even though it now maps to the --managed-tag flag due to keeping the API stable.
// Node termination handler does no longer check the ASG for this tag, but the actual EC2 instances.
ManagedASGTag *string `json:"managedASGTag,omitempty"`
// ExcludeFromLoadBalancers makes node termination handler will mark for exclusion from load balancers before node are cordoned.

2
pkg/model/components/nodeterminationhandler.go
View File

@ -79,7 +79,7 @@ func (b *NodeTerminationHandlerOptionsBuilder) BuildOptions(o interface{}) error
}
if nth.Version == nil {
nth.Version = fi.String("v1.16.5")
nth.Version = fi.String("v1.17.1")
}
return nil

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

@ -216,7 +216,7 @@ spec:
managedASGTag: aws-node-termination-handler/managed
memoryRequest: 64Mi
prometheusEnable: false
version: v1.16.5
version: v1.17.1
nonMasqueradeCIDR: 172.20.0.0/16
podCIDR: 172.20.128.0/17
secretStore: memfs://clusters.example.com/minimal.example.com/secrets

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

@ -54,7 +54,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: f50a81fbd3bef6963e6ad6011e58cce70f5b2fdf5674260953e6cfbcee7f4108
manifestHash: 5f21dc42466306ed965b192b9067f8fe30d87a9c780e14765f432ca11772b8b8
name: node-termination-handler.aws
prune:
kinds:

10
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
name: aws-node-termination-handler
rules:
@ -87,7 +87,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
name: aws-node-termination-handler
roleRef:
@ -110,7 +110,7 @@ metadata:
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -195,7 +195,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.16.5
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.17.1
imagePullPolicy: IfNotPresent
name: aws-node-termination-handler
resources:

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

@ -220,7 +220,7 @@ spec:
managedASGTag: aws-node-termination-handler/managed
memoryRequest: 64Mi
prometheusEnable: false
version: v1.16.5
version: v1.17.1
nonMasqueradeCIDR: 172.20.0.0/16
podCIDR: 172.20.128.0/17
secretStore: memfs://clusters.example.com/minimal.example.com/secrets

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

@ -61,7 +61,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: f50a81fbd3bef6963e6ad6011e58cce70f5b2fdf5674260953e6cfbcee7f4108
manifestHash: 5f21dc42466306ed965b192b9067f8fe30d87a9c780e14765f432ca11772b8b8
name: node-termination-handler.aws
prune:
kinds:

10
tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
name: aws-node-termination-handler
rules:
@ -87,7 +87,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
name: aws-node-termination-handler
roleRef:
@ -110,7 +110,7 @@ metadata:
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -195,7 +195,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.16.5
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.17.1
imagePullPolicy: IfNotPresent
name: aws-node-termination-handler
resources:

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

@ -219,7 +219,7 @@ spec:
managedASGTag: aws-node-termination-handler/managed
memoryRequest: 64Mi
prometheusEnable: false
version: v1.16.5
version: v1.17.1
nonMasqueradeCIDR: 172.20.0.0/16
podCIDR: 172.20.128.0/17
secretStore: memfs://clusters.example.com/minimal.example.com/secrets

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

@ -61,7 +61,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: f50a81fbd3bef6963e6ad6011e58cce70f5b2fdf5674260953e6cfbcee7f4108
manifestHash: 5f21dc42466306ed965b192b9067f8fe30d87a9c780e14765f432ca11772b8b8
name: node-termination-handler.aws
prune:
kinds:

10
tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
name: aws-node-termination-handler
rules:
@ -87,7 +87,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
name: aws-node-termination-handler
roleRef:
@ -110,7 +110,7 @@ metadata:
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -195,7 +195,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.16.5
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.17.1
imagePullPolicy: IfNotPresent
name: aws-node-termination-handler
resources:

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

@ -218,7 +218,7 @@ spec:
managedASGTag: aws-node-termination-handler/managed
memoryRequest: 64Mi
prometheusEnable: false
version: v1.16.5
version: v1.17.1
nonMasqueradeCIDR: 172.20.0.0/16
podCIDR: 172.20.128.0/17
secretStore: memfs://clusters.example.com/minimal.example.com/secrets

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

@ -61,7 +61,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: f50a81fbd3bef6963e6ad6011e58cce70f5b2fdf5674260953e6cfbcee7f4108
manifestHash: 5f21dc42466306ed965b192b9067f8fe30d87a9c780e14765f432ca11772b8b8
name: node-termination-handler.aws
prune:
kinds:

10
tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
name: aws-node-termination-handler
rules:
@ -87,7 +87,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
name: aws-node-termination-handler
roleRef:
@ -110,7 +110,7 @@ metadata:
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -195,7 +195,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.16.5
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.17.1
imagePullPolicy: IfNotPresent
name: aws-node-termination-handler
resources:

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

@ -218,7 +218,7 @@ spec:
managedASGTag: aws-node-termination-handler/managed
memoryRequest: 64Mi
prometheusEnable: false
version: v1.16.5
version: v1.17.1
nonMasqueradeCIDR: 172.20.0.0/16
podCIDR: 172.20.128.0/17
secretStore: memfs://clusters.example.com/minimal.example.com/secrets

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

@ -54,7 +54,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: f50a81fbd3bef6963e6ad6011e58cce70f5b2fdf5674260953e6cfbcee7f4108
manifestHash: 5f21dc42466306ed965b192b9067f8fe30d87a9c780e14765f432ca11772b8b8
name: node-termination-handler.aws
prune:
kinds:

10
tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
name: aws-node-termination-handler
rules:
@ -87,7 +87,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
name: aws-node-termination-handler
roleRef:
@ -110,7 +110,7 @@ metadata:
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -195,7 +195,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.16.5
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.17.1
imagePullPolicy: IfNotPresent
name: aws-node-termination-handler
resources:

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

@ -215,7 +215,7 @@ spec:
managedASGTag: aws-node-termination-handler/managed
memoryRequest: 64Mi
prometheusEnable: false
version: v1.16.5
version: v1.17.1
nonMasqueradeCIDR: 172.20.0.0/16
podCIDR: 172.20.128.0/17
secretStore: memfs://clusters.example.com/minimal.example.com/secrets

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

@ -54,7 +54,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: d18275202eb86bb5157044a0da19a56f55f8203f0fe2b84f5b4d6904a8c77e0b
manifestHash: 749d88a585c57157987ec4169511408be5d0b75118d37f222aa64d9e043fd9b6
name: node-termination-handler.aws
prune:
kinds:

10
tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
name: aws-node-termination-handler
rules:
@ -87,7 +87,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
name: aws-node-termination-handler
roleRef:
@ -110,7 +110,7 @@ metadata:
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -191,7 +191,7 @@ spec:
value: "false"
- name: UPTIME_FROM_FILE
value: /proc/uptime
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.16.5
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.17.1
imagePullPolicy: IfNotPresent
name: aws-node-termination-handler
resources:

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

@ -208,7 +208,7 @@ spec:
managedASGTag: aws-node-termination-handler/managed
memoryRequest: 64Mi
prometheusEnable: false
version: v1.16.5
version: v1.17.1
nonMasqueradeCIDR: 172.20.0.0/16
podCIDR: 172.20.128.0/17
secretStore: memfs://clusters.example.com/minimal.example.com/secrets

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

@ -54,7 +54,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: d18275202eb86bb5157044a0da19a56f55f8203f0fe2b84f5b4d6904a8c77e0b
manifestHash: 749d88a585c57157987ec4169511408be5d0b75118d37f222aa64d9e043fd9b6
name: node-termination-handler.aws
prune:
kinds:

10
tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
name: aws-node-termination-handler
rules:
@ -87,7 +87,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
name: aws-node-termination-handler
roleRef:
@ -110,7 +110,7 @@ metadata:
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -191,7 +191,7 @@ spec:
value: "false"
- name: UPTIME_FROM_FILE
value: /proc/uptime
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.16.5
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.17.1
imagePullPolicy: IfNotPresent
name: aws-node-termination-handler
resources:

2
tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_cluster-completed.spec_content
View File

@ -171,7 +171,7 @@ spec:
managedASGTag: aws-node-termination-handler/managed
memoryRequest: 64Mi
prometheusEnable: false
version: v1.16.5
version: v1.17.1
nonMasqueradeCIDR: 100.64.0.0/10
podCIDR: 100.96.0.0/11
secretStore: memfs://clusters.example.com/nthsqsresources.longclustername.example.com/secrets

2
tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content
View File

@ -41,7 +41,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: da86a57a95265f04686e7d5be0a9b987f376ebc513f0b3c0937c269b4c13ccc3
manifestHash: a383a07194c3bc355de31f8ae0bea06f756bd586dd2ca55d50b5e03621217a3c
name: node-termination-handler.aws
prune:
kinds:

14
tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_nthsqsresources.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
name: aws-node-termination-handler
rules:
@ -87,7 +87,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/part-of: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
name: aws-node-termination-handler
roleRef:
@ -110,7 +110,7 @@ metadata:
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/version: v1.16.5
app.kubernetes.io/version: v1.17.1
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -171,9 +171,9 @@ spec:
value: "false"
- name: PROMETHEUS_SERVER_PORT
value: "9092"
- name: CHECK_ASG_TAG_BEFORE_DRAINING
- name: CHECK_TAG_BEFORE_DRAINING
value: "true"
- name: MANAGED_ASG_TAG
- name: MANAGED_TAG
value: aws-node-termination-handler/managed
- name: ASSUME_ASG_TAG_PROPAGATION
value: "false"
@ -209,7 +209,7 @@ spec:
value: https://sqs.us-test-1.amazonaws.com/123456789012/nthsqsresources-longclustername-example-com-nth
- name: WORKERS
value: "10"
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.16.5
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.17.1
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:

4
upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template
View File

@ -171,9 +171,9 @@ spec:
value: "{{ WithDefaultBool .EnablePrometheusMetrics false }}"
- name: PROMETHEUS_SERVER_PORT
value: "9092"
- name: CHECK_ASG_TAG_BEFORE_DRAINING
- name: CHECK_TAG_BEFORE_DRAINING
value: "true"
- name: MANAGED_ASG_TAG
- name: MANAGED_TAG
value: "{{ .ManagedASGTag }}"
- name: ASSUME_ASG_TAG_PROPAGATION
value: "false"