diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content index f6fce2bdb5..7de867fd77 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -215,6 +215,7 @@ spec: managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi prometheusEnable: false + version: v1.14.0 nonMasqueradeCIDR: 172.20.0.0/16 podCIDR: 172.20.128.0/17 secretStore: memfs://clusters.example.com/minimal.example.com/secrets 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 95662e9713..47ea9b4bd9 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: 263c1e815b72472dcd22a35e3edd0529d2d94d9a537f031ae4fe90772c5e5c03 + manifestHash: b0be9a82a9215b10ce4aefa09589e86d754b7484722db7488a8cf3bbaa2ccc3f 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 fc80298db3..2140f3ced8 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.14.0 + app.kubernetes.io/version: v1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -91,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.14.0 + app.kubernetes.io/version: v1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_cluster-completed.spec_content index 6be9f690e8..2e9bcc7fbb 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -217,6 +217,7 @@ spec: managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi prometheusEnable: false + version: v1.14.0 nonMasqueradeCIDR: 172.20.0.0/16 podCIDR: 172.20.128.0/17 secretStore: memfs://clusters.example.com/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 99bbfcc44d..2724983012 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -67,7 +67,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 263c1e815b72472dcd22a35e3edd0529d2d94d9a537f031ae4fe90772c5e5c03 + manifestHash: b0be9a82a9215b10ce4aefa09589e86d754b7484722db7488a8cf3bbaa2ccc3f name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/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-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index fc80298db3..2140f3ced8 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/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-irsa23/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.14.0 + app.kubernetes.io/version: v1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -91,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.14.0 + app.kubernetes.io/version: v1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content index 1a457390dd..d87f778fb2 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -214,6 +214,7 @@ spec: managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi prometheusEnable: false + version: v1.14.0 nonMasqueradeCIDR: 172.20.0.0/16 podCIDR: 172.20.128.0/17 secretStore: memfs://clusters.example.com/minimal.example.com/secrets 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 ae2f58c828..5b6bbcc7f3 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: 9b8cb680850a38ff8b73c49ffc2e864b832e7458f4e93db8dd204a7cf4b19a67 + manifestHash: bbdad2ac50bd56f8e8c0333fa0e26cea5434fc6621ba981b239ed52f62be2cee 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 e8289ba1e5..8d4a6eb79c 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.14.0 + app.kubernetes.io/version: v1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -91,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.14.0 + app.kubernetes.io/version: v1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content index d4a959e171..f0b2caa5e8 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -205,6 +205,7 @@ spec: managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi prometheusEnable: false + version: v1.14.0 nonMasqueradeCIDR: 172.20.0.0/16 podCIDR: 172.20.128.0/17 secretStore: memfs://clusters.example.com/minimal.example.com/secrets 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 92d13bf6a5..91a0b69c79 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: 9b8cb680850a38ff8b73c49ffc2e864b832e7458f4e93db8dd204a7cf4b19a67 + manifestHash: bbdad2ac50bd56f8e8c0333fa0e26cea5434fc6621ba981b239ed52f62be2cee 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 e8289ba1e5..8d4a6eb79c 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.14.0 + app.kubernetes.io/version: v1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -91,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.14.0 + app.kubernetes.io/version: v1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content index 0ab2d4f338..0e0e0d807e 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -170,6 +170,7 @@ spec: managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi prometheusEnable: false + version: v1.14.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/nthsqsresources.longclustername.example.com/secrets 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 88957caf54..871bdff3d7 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: 10d08b366893f1f11be9b722fd862b510c4aa8e66c1b89345d46a141cf2286ed + manifestHash: 99a2738356bc31978f60b253f83eeea29dd1d868b5b0203ef86d4c52dc4b45bc 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 0c10b28875..e2ebb9a654 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.14.0 + app.kubernetes.io/version: v1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -91,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.14.0 + app.kubernetes.io/version: v1.14.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler