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 071ff023bf..93b12c0562 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 @@ -52,7 +52,7 @@ spec: selector: null - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 921107cec6ff139ad757c3167c9d479ef87804e39efdf172d23b7b0b3c453a14 + manifestHash: 4197a26e91677e28e68617b12e8b2e9f2825d397578dcd7d8b6500e47a05c4c2 name: node-termination-handler.aws selector: k8s-addon: node-termination-handler.aws 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 a8c79c12e0..fdaffe5e6e 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 @@ -162,6 +162,8 @@ spec: value: "false" - name: LOG_LEVEL value: info + - name: EMIT_KUBERNETES_EVENTS + value: "true" - 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 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 a61157e334..8d19a4d33b 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 @@ -52,7 +52,7 @@ spec: selector: null - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: aff5c358e9068af057fc266041105328dd9e11e473cd051f393f67182edc47fb + manifestHash: dd42ae2f7510700d37bf0214e0afdd87c12968c5c67ec88791f20f06fef90caf name: node-termination-handler.aws selector: k8s-addon: node-termination-handler.aws 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 32fe6b63f7..f9a3343db9 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 @@ -162,6 +162,8 @@ spec: value: "false" - name: LOG_LEVEL value: info + - name: EMIT_KUBERNETES_EVENTS + value: "true" image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3 imagePullPolicy: IfNotPresent name: aws-node-termination-handler 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 ab49d70320..fec6cff3c6 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 @@ -52,7 +52,7 @@ spec: selector: null - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: aff5c358e9068af057fc266041105328dd9e11e473cd051f393f67182edc47fb + manifestHash: dd42ae2f7510700d37bf0214e0afdd87c12968c5c67ec88791f20f06fef90caf name: node-termination-handler.aws selector: k8s-addon: node-termination-handler.aws 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 32fe6b63f7..f9a3343db9 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 @@ -162,6 +162,8 @@ spec: value: "false" - name: LOG_LEVEL value: info + - name: EMIT_KUBERNETES_EVENTS + value: "true" image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3 imagePullPolicy: IfNotPresent name: aws-node-termination-handler diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.example.com-addons-bootstrap_content index 9189887420..d9bb71e6c6 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: k8s-addon: dns-controller.addons.k8s.io - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 0d47866cd451a44675257bc40b4902d3dce29ebe88ab3f9f43f31e246e6ce7f1 + manifestHash: c03c13e87cb8c6a7731fdbc08c9f99e1c960a9da71696fd33b781eca51de22dc name: node-termination-handler.aws selector: k8s-addon: node-termination-handler.aws diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.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.example.com-addons-node-termination-handler.aws-k8s-1.11_content index a55f796855..4a727a7de7 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.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.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -168,7 +168,7 @@ spec: - name: TAINT_NODE value: "false" - name: JSON_LOGGING - value: "false" + value: "true" - name: LOG_LEVEL value: info - name: WEBHOOK_PROXY @@ -199,6 +199,8 @@ spec: value: aws-node-termination-handler/managed - name: WORKERS value: "10" + - name: EMIT_KUBERNETES_EVENTS + value: "true" image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3 imagePullPolicy: IfNotPresent name: aws-node-termination-handler diff --git a/upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template b/upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template index 7454d67e64..b2baa93733 100644 --- a/upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template +++ b/upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template @@ -167,7 +167,7 @@ spec: - name: TAINT_NODE value: "false" - name: JSON_LOGGING - value: "false" + value: "true" - name: LOG_LEVEL value: "info" - name: WEBHOOK_PROXY @@ -198,6 +198,8 @@ spec: value: "{{ .ManagedASGTag }}" - name: WORKERS value: "10" + - name: EMIT_KUBERNETES_EVENTS + value: "true" resources: requests: cpu: {{ .CPURequest }} @@ -313,6 +315,8 @@ spec: value: "{{ .EnablePrometheusMetrics }}" - name: LOG_LEVEL value: "info" + - name: EMIT_KUBERNETES_EVENTS + value: "true" resources: requests: cpu: {{ .CPURequest }}