From a649c474fc8000cf31d9011f94d6258f92e053e5 Mon Sep 17 00:00:00 2001 From: Moshe Vayner Date: Thu, 2 Jan 2025 12:12:34 -0500 Subject: [PATCH] test: hack/update-expected --- ..._minimal.example.com-addons-bootstrap_content | 2 +- ...orking.amazon-vpc-routed-eni-k8s-1.16_content | 16 ++++++++-------- ..._minimal.example.com-addons-bootstrap_content | 2 +- ...orking.amazon-vpc-routed-eni-k8s-1.16_content | 16 ++++++++-------- ..._minimal.example.com-addons-bootstrap_content | 2 +- ...orking.amazon-vpc-routed-eni-k8s-1.16_content | 16 ++++++++-------- ..._minimal.example.com-addons-bootstrap_content | 2 +- ...orking.amazon-vpc-routed-eni-k8s-1.16_content | 10 +++++----- ...y-addons.example.com-addons-bootstrap_content | 2 +- ...orking.amazon-vpc-routed-eni-k8s-1.16_content | 16 ++++++++-------- .../amazonvpc-containerd/manifest.yaml | 2 +- ...etworking.amazon-vpc-routed-eni-k8s-1.16.yaml | 16 ++++++++-------- .../amazonvpc/manifest.yaml | 2 +- ...etworking.amazon-vpc-routed-eni-k8s-1.16.yaml | 16 ++++++++-------- 14 files changed, 60 insertions(+), 60 deletions(-) diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 28bfcad92b30d..29cb04918c166 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -178,7 +178,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: 94d5200ff951131a7adc37178cc7b39084653e19cb2f3bcc6794b0236a924a5b + manifestHash: f7c29b8c7ecc81826fbb05c53bc443f4e387a0e1dd375b9dbdd71de95674a479 name: networking.amazon-vpc-routed-eni needsRollingUpdate: all selector: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content index 8c669bc2e6d66..d0a993d01a3ad 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content @@ -309,7 +309,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -334,7 +334,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: amazon-vpc-cni @@ -432,7 +432,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -456,7 +456,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -543,7 +543,7 @@ spec: - name: WARM_PREFIX_TARGET value: "1" - name: VPC_CNI_VERSION - value: v1.19.0 + value: v1.19.2 - name: MY_NODE_NAME valueFrom: fieldRef: @@ -556,7 +556,7 @@ spec: fieldPath: metadata.name - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.0 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.2 livenessProbe: exec: command: @@ -613,7 +613,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.5 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.6 name: aws-eks-nodeagent resources: requests: @@ -639,7 +639,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.0 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.2 name: aws-vpc-cni-init resources: requests: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 8167d57ad9e3e..0f20499bdea9f 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -185,7 +185,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: 94d5200ff951131a7adc37178cc7b39084653e19cb2f3bcc6794b0236a924a5b + manifestHash: f7c29b8c7ecc81826fbb05c53bc443f4e387a0e1dd375b9dbdd71de95674a479 name: networking.amazon-vpc-routed-eni needsRollingUpdate: all selector: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content index 8c669bc2e6d66..d0a993d01a3ad 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content @@ -309,7 +309,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -334,7 +334,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: amazon-vpc-cni @@ -432,7 +432,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -456,7 +456,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -543,7 +543,7 @@ spec: - name: WARM_PREFIX_TARGET value: "1" - name: VPC_CNI_VERSION - value: v1.19.0 + value: v1.19.2 - name: MY_NODE_NAME valueFrom: fieldRef: @@ -556,7 +556,7 @@ spec: fieldPath: metadata.name - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.0 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.2 livenessProbe: exec: command: @@ -613,7 +613,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.5 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.6 name: aws-eks-nodeagent resources: requests: @@ -639,7 +639,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.0 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.2 name: aws-vpc-cni-init resources: requests: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 61a96313577f2..a1cbcf707618a 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -186,7 +186,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: 94d5200ff951131a7adc37178cc7b39084653e19cb2f3bcc6794b0236a924a5b + manifestHash: f7c29b8c7ecc81826fbb05c53bc443f4e387a0e1dd375b9dbdd71de95674a479 name: networking.amazon-vpc-routed-eni needsRollingUpdate: all selector: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content index 8c669bc2e6d66..d0a993d01a3ad 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content @@ -309,7 +309,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -334,7 +334,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: amazon-vpc-cni @@ -432,7 +432,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -456,7 +456,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -543,7 +543,7 @@ spec: - name: WARM_PREFIX_TARGET value: "1" - name: VPC_CNI_VERSION - value: v1.19.0 + value: v1.19.2 - name: MY_NODE_NAME valueFrom: fieldRef: @@ -556,7 +556,7 @@ spec: fieldPath: metadata.name - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.0 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.2 livenessProbe: exec: command: @@ -613,7 +613,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.5 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.6 name: aws-eks-nodeagent resources: requests: @@ -639,7 +639,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.0 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.2 name: aws-vpc-cni-init resources: requests: diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 7e5e7a808b54f..be80061b0c321 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -178,7 +178,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: 868a230efadf50ca9baa354d9fadbd7b210568044b11b51ae2f05367f5be802e + manifestHash: d0da1a35c40afb854d38096ddb3c4f5b6feefef979eb46937a7b984fe00a221c name: networking.amazon-vpc-routed-eni needsRollingUpdate: all selector: diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content index 8ee98a6a0be1e..5e6b616dc2794 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content @@ -309,7 +309,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -334,7 +334,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: amazon-vpc-cni @@ -432,7 +432,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -456,7 +456,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -543,7 +543,7 @@ spec: - name: WARM_PREFIX_TARGET value: "1" - name: VPC_CNI_VERSION - value: v1.19.0 + value: v1.19.2 - name: MY_NODE_NAME valueFrom: fieldRef: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content index 3b095dd7c7241..71dd7584f56bb 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content @@ -227,7 +227,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: 21266ea37b64b0db7e2c1cb673c5dfdc5c70481f8fc44ec7247a17d31b594500 + manifestHash: b23994ffa73213979b206b3917c3de9146ac8b1709b7d94d1d287b7f00a2c3b9 name: networking.amazon-vpc-routed-eni needsRollingUpdate: all selector: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content index 738772ef8a59e..1a223e7d108c4 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content @@ -309,7 +309,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -334,7 +334,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: amazon-vpc-cni @@ -432,7 +432,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -456,7 +456,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -543,7 +543,7 @@ spec: - name: WARM_PREFIX_TARGET value: "1" - name: VPC_CNI_VERSION - value: v1.19.0 + value: v1.19.2 - name: MY_NODE_NAME valueFrom: fieldRef: @@ -556,7 +556,7 @@ spec: fieldPath: metadata.name - name: CLUSTER_NAME value: many-addons.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.0 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.2 livenessProbe: exec: command: @@ -613,7 +613,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.5 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.6 name: aws-eks-nodeagent resources: requests: @@ -639,7 +639,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.0 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.2 name: aws-vpc-cni-init resources: requests: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml index 1d97da8c93660..a5c04d183ffd5 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml @@ -99,7 +99,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: 80c02a4d61457eb958d78a20b5785501c1a3cfac4cc2a34baf654ef1b4b857e9 + manifestHash: e20b7ce8c38cbb474ba6869f076add0a1e10d57ac63acaa82d53c44f126db2a5 name: networking.amazon-vpc-routed-eni needsRollingUpdate: all selector: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.16.yaml index becbde7157f03..ecc863f0d8732 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.16.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.16.yaml @@ -309,7 +309,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -334,7 +334,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: amazon-vpc-cni @@ -432,7 +432,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -456,7 +456,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -545,7 +545,7 @@ spec: - name: WARM_PREFIX_TARGET value: "1" - name: VPC_CNI_VERSION - value: v1.19.0 + value: v1.19.2 - name: MY_NODE_NAME valueFrom: fieldRef: @@ -558,7 +558,7 @@ spec: fieldPath: metadata.name - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.0 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.2 livenessProbe: exec: command: @@ -615,7 +615,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.5 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.6 name: aws-eks-nodeagent resources: requests: @@ -641,7 +641,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.0 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.2 name: aws-vpc-cni-init resources: requests: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index 1d97da8c93660..a5c04d183ffd5 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -99,7 +99,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: 80c02a4d61457eb958d78a20b5785501c1a3cfac4cc2a34baf654ef1b4b857e9 + manifestHash: e20b7ce8c38cbb474ba6869f076add0a1e10d57ac63acaa82d53c44f126db2a5 name: networking.amazon-vpc-routed-eni needsRollingUpdate: all selector: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml index becbde7157f03..ecc863f0d8732 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml @@ -309,7 +309,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -334,7 +334,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: amazon-vpc-cni @@ -432,7 +432,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -456,7 +456,7 @@ metadata: app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node - app.kubernetes.io/version: v1.19.0 + app.kubernetes.io/version: v1.19.2 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -545,7 +545,7 @@ spec: - name: WARM_PREFIX_TARGET value: "1" - name: VPC_CNI_VERSION - value: v1.19.0 + value: v1.19.2 - name: MY_NODE_NAME valueFrom: fieldRef: @@ -558,7 +558,7 @@ spec: fieldPath: metadata.name - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.0 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.2 livenessProbe: exec: command: @@ -615,7 +615,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.5 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.6 name: aws-eks-nodeagent resources: requests: @@ -641,7 +641,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.0 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.2 name: aws-vpc-cni-init resources: requests: