diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 5e12a9f4bc..e0edc4a4a7 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -60,7 +60,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 4197a26e91677e28e68617b12e8b2e9f2825d397578dcd7d8b6500e47a05c4c2 + manifestHash: 4d14f9d427728f8eb9c712ccde59cb82eda5129e201b82ac9af8fc637d27ddb2 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index fdaffe5e6e..199ccbbb74 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -7,7 +7,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: 1.13.3 + app.kubernetes.io/version: 1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -40,6 +40,7 @@ rules: - pods verbs: - list + - get - apiGroups: - "" resources: @@ -90,7 +91,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: 1.13.3 + app.kubernetes.io/version: 1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -138,16 +139,17 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - - name: SPOT_POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - name: DELETE_LOCAL_DATA value: "true" - name: IGNORE_DAEMON_SETS value: "true" - name: POD_TERMINATION_GRACE_PERIOD value: "-1" + - name: INSTANCE_METADATA_URL + - name: NODE_TERMINATION_GRACE_PERIOD + - name: WEBHOOK_URL + - name: WEBHOOK_HEADERS + - name: WEBHOOK_TEMPLATE - name: ENABLE_SPOT_INTERRUPTION_DRAINING value: "true" - name: ENABLE_SCHEDULED_EVENT_DRAINING @@ -156,19 +158,40 @@ spec: value: "false" - name: ENABLE_REBALANCE_DRAINING value: "false" + - name: CHECK_ASG_TAG_BEFORE_DRAINING + value: "true" + - name: MANAGED_ASG_TAG + value: aws-node-termination-handler/managed + - name: METADATA_TRIES + value: "3" + - name: CORDON_ONLY + value: "false" + - name: TAINT_NODE + value: "false" - name: JSON_LOGGING value: "true" - name: ENABLE_PROMETHEUS_SERVER value: "false" + - name: PROMETHEUS_SERVER_PORT + value: "9092" - name: LOG_LEVEL value: info + - name: WEBHOOK_PROXY + - name: UPTIME_FROM_FILE - name: EMIT_KUBERNETES_EVENTS value: "true" + - name: KUBERNETES_EVENTS_EXTRA_ANNOTATIONS + - name: ENABLE_PROBES_SERVER + value: "false" + - name: PROBES_SERVER_PORT + value: "8080" + - name: PROBES_SERVER_ENDPOINT + value: /healthz - name: AWS_ROLE_ARN 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.13.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.14.0 imagePullPolicy: IfNotPresent name: aws-node-termination-handler resources: diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index b6ad1b4f4e..0d91219c1a 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -60,7 +60,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: dd42ae2f7510700d37bf0214e0afdd87c12968c5c67ec88791f20f06fef90caf + manifestHash: 782aabecd3d4aac80cac5c7b9c3631bd81eb7a19c8d1b53f8f9f7f0354c4b3e2 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index f9a3343db9..b7b25513ed 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -7,7 +7,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: 1.13.3 + app.kubernetes.io/version: 1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -40,6 +40,7 @@ rules: - pods verbs: - list + - get - apiGroups: - "" resources: @@ -90,7 +91,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: 1.13.3 + app.kubernetes.io/version: 1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -138,16 +139,22 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - - name: SPOT_POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - name: DELETE_LOCAL_DATA value: "true" - name: IGNORE_DAEMON_SETS value: "true" - name: POD_TERMINATION_GRACE_PERIOD value: "-1" + - name: INSTANCE_METADATA_URL + value: "" + - name: NODE_TERMINATION_GRACE_PERIOD + value: "" + - name: WEBHOOK_URL + value: "" + - name: WEBHOOK_HEADERS + value: "" + - name: WEBHOOK_TEMPLATE + value: "" - name: ENABLE_SPOT_INTERRUPTION_DRAINING value: "true" - name: ENABLE_SCHEDULED_EVENT_DRAINING @@ -156,15 +163,39 @@ spec: value: "false" - name: ENABLE_REBALANCE_DRAINING value: "false" + - name: CHECK_ASG_TAG_BEFORE_DRAINING + value: "true" + - name: MANAGED_ASG_TAG + value: aws-node-termination-handler/managed + - name: METADATA_TRIES + value: "3" + - name: CORDON_ONLY + value: "false" + - name: TAINT_NODE + value: "false" - name: JSON_LOGGING value: "true" - name: ENABLE_PROMETHEUS_SERVER value: "false" + - name: PROMETHEUS_SERVER_PORT + value: "9092" - name: LOG_LEVEL value: info + - name: WEBHOOK_PROXY + value: "" + - name: UPTIME_FROM_FILE + value: "" - name: EMIT_KUBERNETES_EVENTS value: "true" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3 + - name: KUBERNETES_EVENTS_EXTRA_ANNOTATIONS + value: "" + - name: ENABLE_PROBES_SERVER + value: "false" + - name: PROBES_SERVER_PORT + value: "8080" + - name: PROBES_SERVER_ENDPOINT + value: /healthz + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.14.0 imagePullPolicy: IfNotPresent name: aws-node-termination-handler resources: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index b17d434fc2..6bbae98594 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -60,7 +60,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: dd42ae2f7510700d37bf0214e0afdd87c12968c5c67ec88791f20f06fef90caf + manifestHash: 782aabecd3d4aac80cac5c7b9c3631bd81eb7a19c8d1b53f8f9f7f0354c4b3e2 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index f9a3343db9..b7b25513ed 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -7,7 +7,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: 1.13.3 + app.kubernetes.io/version: 1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -40,6 +40,7 @@ rules: - pods verbs: - list + - get - apiGroups: - "" resources: @@ -90,7 +91,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: 1.13.3 + app.kubernetes.io/version: 1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -138,16 +139,22 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - - name: SPOT_POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - name: DELETE_LOCAL_DATA value: "true" - name: IGNORE_DAEMON_SETS value: "true" - name: POD_TERMINATION_GRACE_PERIOD value: "-1" + - name: INSTANCE_METADATA_URL + value: "" + - name: NODE_TERMINATION_GRACE_PERIOD + value: "" + - name: WEBHOOK_URL + value: "" + - name: WEBHOOK_HEADERS + value: "" + - name: WEBHOOK_TEMPLATE + value: "" - name: ENABLE_SPOT_INTERRUPTION_DRAINING value: "true" - name: ENABLE_SCHEDULED_EVENT_DRAINING @@ -156,15 +163,39 @@ spec: value: "false" - name: ENABLE_REBALANCE_DRAINING value: "false" + - name: CHECK_ASG_TAG_BEFORE_DRAINING + value: "true" + - name: MANAGED_ASG_TAG + value: aws-node-termination-handler/managed + - name: METADATA_TRIES + value: "3" + - name: CORDON_ONLY + value: "false" + - name: TAINT_NODE + value: "false" - name: JSON_LOGGING value: "true" - name: ENABLE_PROMETHEUS_SERVER value: "false" + - name: PROMETHEUS_SERVER_PORT + value: "9092" - name: LOG_LEVEL value: info + - name: WEBHOOK_PROXY + value: "" + - name: UPTIME_FROM_FILE + value: "" - name: EMIT_KUBERNETES_EVENTS value: "true" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3 + - name: KUBERNETES_EVENTS_EXTRA_ANNOTATIONS + value: "" + - name: ENABLE_PROBES_SERVER + value: "false" + - name: PROBES_SERVER_PORT + value: "8080" + - name: PROBES_SERVER_ENDPOINT + value: /healthz + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.14.0 imagePullPolicy: IfNotPresent name: aws-node-termination-handler resources: diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content index 2cb474c850..08ae174bdf 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content @@ -47,7 +47,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 424354959edcf24bcc3e1a3099b5b0a4525d59e2336a36940995ae51ead4ab08 + manifestHash: 039a11470a3c929d92e63e79b9927ed3e81b1df90bf2dc43dd95ddd418d8dc4f name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content index fffc3c2804..8ad752f7cb 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -7,7 +7,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: 1.13.3 + app.kubernetes.io/version: 1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -40,6 +40,7 @@ rules: - pods verbs: - list + - get - apiGroups: - "" resources: @@ -90,7 +91,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: 1.13.3 + app.kubernetes.io/version: 1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -139,10 +140,6 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - - name: SPOT_POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - name: DELETE_LOCAL_DATA value: "" - name: IGNORE_DAEMON_SETS @@ -175,6 +172,8 @@ spec: value: "" - name: ENABLE_PROMETHEUS_SERVER value: "false" + - name: ENABLE_PROBES_SERVER + value: "false" - name: ENABLE_SPOT_INTERRUPTION_DRAINING value: "false" - name: ENABLE_SCHEDULED_EVENT_DRAINING @@ -189,6 +188,10 @@ spec: value: https://sqs.us-test-1.amazonaws.com/123456789012/nthsqsresources-longclustername-example-com-nth - name: PROMETHEUS_SERVER_PORT value: "9092" + - name: PROBES_SERVER_PORT + value: "8080" + - name: PROBES_SERVER_ENDPOINT + value: /healthz - name: AWS_REGION value: "" - name: AWS_ENDPOINT @@ -201,7 +204,9 @@ spec: value: "10" - name: EMIT_KUBERNETES_EVENTS value: "true" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3 + - name: KUBERNETES_EVENTS_EXTRA_ANNOTATIONS + value: "" + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.14.0 imagePullPolicy: IfNotPresent name: aws-node-termination-handler resources: