From 00e09d777371b548cadebb4494dcfcdc2bb5ebbd Mon Sep 17 00:00:00 2001 From: Moshe Vayner Date: Fri, 13 Dec 2024 15:37:10 -0500 Subject: [PATCH 1/2] chore(upup): bump aws-cni to 1.19.0 --- .../k8s-1.16.yaml.template | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template index 039f4911d4350..a807e58bb743a 100644 --- a/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template @@ -1,4 +1,4 @@ -# Vendored from https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/v1.18.6/config/master/aws-k8s-cni.yaml +# Vendored from https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/v1.19.0/config/master/aws-k8s-cni.yaml --- # Source: aws-vpc-cni/crds/customresourcedefinition.yaml apiVersion: apiextensions.k8s.io/v1 @@ -301,7 +301,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.18.6" + app.kubernetes.io/version: "v1.19.0" --- # Source: aws-vpc-cni/templates/configmap.yaml apiVersion: v1 @@ -313,7 +313,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.18.6" + app.kubernetes.io/version: "v1.19.0" data: enable-windows-ipam: "false" enable-network-policy-controller: "false" @@ -332,7 +332,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.18.6" + app.kubernetes.io/version: "v1.19.0" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -385,7 +385,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.18.6" + app.kubernetes.io/version: "v1.19.0" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -405,7 +405,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.18.6" + app.kubernetes.io/version: "v1.19.0" spec: updateStrategy: rollingUpdate: @@ -426,7 +426,7 @@ spec: hostNetwork: true initContainers: - name: aws-vpc-cni-init - image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.18.6" }}" + image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.0" }}" env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -451,7 +451,7 @@ spec: {{ end }} containers: - name: aws-node - image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.18.6" }}" + image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.0" }}" ports: - containerPort: 61678 name: metrics @@ -521,7 +521,7 @@ spec: # - name: NETWORK_POLICY_ENFORCING_MODE # value: "standard" - name: VPC_CNI_VERSION - value: "v1.18.6" + value: "v1.19.0" # - name: WARM_ENI_TARGET # value: "1" # - name: WARM_PREFIX_TARGET @@ -558,7 +558,7 @@ spec: - mountPath: /run/xtables.lock name: xtables-lock - name: aws-eks-nodeagent - image: "{{- or .Networking.AmazonVPC.NetworkPolicyAgentImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.4" }}" + image: "{{- or .Networking.AmazonVPC.NetworkPolicyAgentImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.5" }}" env: - name: MY_NODE_NAME valueFrom: @@ -631,3 +631,5 @@ spec: operator: NotIn values: - fargate + - hybrid + - auto From 0c71cbd3f69ad60aa01e7b38a6fb633de9c4263c Mon Sep 17 00:00:00 2001 From: Moshe Vayner Date: Fri, 13 Dec 2024 15:40:41 -0500 Subject: [PATCH 2/2] test: hack/update-expected --- ...nimal.example.com-addons-bootstrap_content | 2 +- ...ing.amazon-vpc-routed-eni-k8s-1.16_content | 20 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...ing.amazon-vpc-routed-eni-k8s-1.16_content | 20 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...ing.amazon-vpc-routed-eni-k8s-1.16_content | 20 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...ing.amazon-vpc-routed-eni-k8s-1.16_content | 14 +++++++------ ...ddons.example.com-addons-bootstrap_content | 2 +- ...ing.amazon-vpc-routed-eni-k8s-1.16_content | 20 ++++++++++--------- .../amazonvpc-containerd/manifest.yaml | 2 +- ...orking.amazon-vpc-routed-eni-k8s-1.16.yaml | 20 ++++++++++--------- .../amazonvpc/manifest.yaml | 2 +- ...orking.amazon-vpc-routed-eni-k8s-1.16.yaml | 20 ++++++++++--------- 14 files changed, 81 insertions(+), 67 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 ddb19a613bd73..67330c6dc5ca8 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: ecf65b1b55dd4a867a6498bb565b774853286453e32d6514ee7d8ab4e5b697ab + manifestHash: 94d5200ff951131a7adc37178cc7b39084653e19cb2f3bcc6794b0236a924a5b 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 e999fe256fb5f..8c669bc2e6d66 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.18.6 + app.kubernetes.io/version: v1.19.0 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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: amazon-vpc-cni @@ -351,7 +351,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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -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.18.6 + app.kubernetes.io/version: v1.19.0 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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -492,6 +492,8 @@ spec: operator: NotIn values: - fargate + - hybrid + - auto containers: - env: - name: ADDITIONAL_ENI_TAGS @@ -541,7 +543,7 @@ spec: - name: WARM_PREFIX_TARGET value: "1" - name: VPC_CNI_VERSION - value: v1.18.6 + value: v1.19.0 - name: MY_NODE_NAME valueFrom: fieldRef: @@ -554,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.18.6 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.0 livenessProbe: exec: command: @@ -611,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.4 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.5 name: aws-eks-nodeagent resources: requests: @@ -637,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.18.6 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.0 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 5834aa4a0ce42..37139f21b9e75 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: ecf65b1b55dd4a867a6498bb565b774853286453e32d6514ee7d8ab4e5b697ab + manifestHash: 94d5200ff951131a7adc37178cc7b39084653e19cb2f3bcc6794b0236a924a5b 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 e999fe256fb5f..8c669bc2e6d66 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.18.6 + app.kubernetes.io/version: v1.19.0 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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: amazon-vpc-cni @@ -351,7 +351,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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -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.18.6 + app.kubernetes.io/version: v1.19.0 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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -492,6 +492,8 @@ spec: operator: NotIn values: - fargate + - hybrid + - auto containers: - env: - name: ADDITIONAL_ENI_TAGS @@ -541,7 +543,7 @@ spec: - name: WARM_PREFIX_TARGET value: "1" - name: VPC_CNI_VERSION - value: v1.18.6 + value: v1.19.0 - name: MY_NODE_NAME valueFrom: fieldRef: @@ -554,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.18.6 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.0 livenessProbe: exec: command: @@ -611,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.4 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.5 name: aws-eks-nodeagent resources: requests: @@ -637,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.18.6 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.0 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 400eba21403f8..d6984e98de725 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: ecf65b1b55dd4a867a6498bb565b774853286453e32d6514ee7d8ab4e5b697ab + manifestHash: 94d5200ff951131a7adc37178cc7b39084653e19cb2f3bcc6794b0236a924a5b 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 e999fe256fb5f..8c669bc2e6d66 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.18.6 + app.kubernetes.io/version: v1.19.0 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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: amazon-vpc-cni @@ -351,7 +351,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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -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.18.6 + app.kubernetes.io/version: v1.19.0 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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -492,6 +492,8 @@ spec: operator: NotIn values: - fargate + - hybrid + - auto containers: - env: - name: ADDITIONAL_ENI_TAGS @@ -541,7 +543,7 @@ spec: - name: WARM_PREFIX_TARGET value: "1" - name: VPC_CNI_VERSION - value: v1.18.6 + value: v1.19.0 - name: MY_NODE_NAME valueFrom: fieldRef: @@ -554,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.18.6 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.0 livenessProbe: exec: command: @@ -611,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.4 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.5 name: aws-eks-nodeagent resources: requests: @@ -637,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.18.6 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.0 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 4b2f37fec7adf..a9cabc4a4a1d7 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: f5a437508506974e0bf3d82525a12611804d318b480e236ce3493aafcb5a67f6 + manifestHash: 868a230efadf50ca9baa354d9fadbd7b210568044b11b51ae2f05367f5be802e 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 da611174268ed..8ee98a6a0be1e 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.18.6 + app.kubernetes.io/version: v1.19.0 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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: amazon-vpc-cni @@ -351,7 +351,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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -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.18.6 + app.kubernetes.io/version: v1.19.0 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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -492,6 +492,8 @@ spec: operator: NotIn values: - fargate + - hybrid + - auto containers: - env: - name: ADDITIONAL_ENI_TAGS @@ -541,7 +543,7 @@ spec: - name: WARM_PREFIX_TARGET value: "1" - name: VPC_CNI_VERSION - value: v1.18.6 + value: v1.19.0 - 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 88367547a0194..30b5b02b9ea56 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: c6e10f9f0805a127ae6da3f8566725d6415d63f38cc73774e8e8471d390be761 + manifestHash: 21266ea37b64b0db7e2c1cb673c5dfdc5c70481f8fc44ec7247a17d31b594500 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 74e0057fef4b5..738772ef8a59e 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.18.6 + app.kubernetes.io/version: v1.19.0 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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: amazon-vpc-cni @@ -351,7 +351,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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -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.18.6 + app.kubernetes.io/version: v1.19.0 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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -492,6 +492,8 @@ spec: operator: NotIn values: - fargate + - hybrid + - auto containers: - env: - name: ADDITIONAL_ENI_TAGS @@ -541,7 +543,7 @@ spec: - name: WARM_PREFIX_TARGET value: "1" - name: VPC_CNI_VERSION - value: v1.18.6 + value: v1.19.0 - name: MY_NODE_NAME valueFrom: fieldRef: @@ -554,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.18.6 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.0 livenessProbe: exec: command: @@ -611,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.4 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.5 name: aws-eks-nodeagent resources: requests: @@ -637,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.18.6 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.0 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 c6abb090d20c6..fa538e26e022c 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: 4406f84e1d2ea774c4fe28c46e39508ac923c961f3f2528f17df3b2f62604624 + manifestHash: 80c02a4d61457eb958d78a20b5785501c1a3cfac4cc2a34baf654ef1b4b857e9 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 e0bc803b32b91..becbde7157f03 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.18.6 + app.kubernetes.io/version: v1.19.0 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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: amazon-vpc-cni @@ -351,7 +351,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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -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.18.6 + app.kubernetes.io/version: v1.19.0 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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -492,6 +492,8 @@ spec: operator: NotIn values: - fargate + - hybrid + - auto containers: - env: - name: ADDITIONAL_ENI_TAGS @@ -543,7 +545,7 @@ spec: - name: WARM_PREFIX_TARGET value: "1" - name: VPC_CNI_VERSION - value: v1.18.6 + value: v1.19.0 - name: MY_NODE_NAME valueFrom: fieldRef: @@ -556,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.18.6 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.0 livenessProbe: exec: command: @@ -613,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.4 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.5 name: aws-eks-nodeagent resources: requests: @@ -639,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.18.6 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.0 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 c6abb090d20c6..fa538e26e022c 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: 4406f84e1d2ea774c4fe28c46e39508ac923c961f3f2528f17df3b2f62604624 + manifestHash: 80c02a4d61457eb958d78a20b5785501c1a3cfac4cc2a34baf654ef1b4b857e9 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 e0bc803b32b91..becbde7157f03 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.18.6 + app.kubernetes.io/version: v1.19.0 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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: amazon-vpc-cni @@ -351,7 +351,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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -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.18.6 + app.kubernetes.io/version: v1.19.0 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.18.6 + app.kubernetes.io/version: v1.19.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -492,6 +492,8 @@ spec: operator: NotIn values: - fargate + - hybrid + - auto containers: - env: - name: ADDITIONAL_ENI_TAGS @@ -543,7 +545,7 @@ spec: - name: WARM_PREFIX_TARGET value: "1" - name: VPC_CNI_VERSION - value: v1.18.6 + value: v1.19.0 - name: MY_NODE_NAME valueFrom: fieldRef: @@ -556,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.18.6 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.0 livenessProbe: exec: command: @@ -613,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.4 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.5 name: aws-eks-nodeagent resources: requests: @@ -639,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.18.6 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.0 name: aws-vpc-cni-init resources: requests: