From f34e9482a79e635d7af0b7994aad49a1ab8d0fb9 Mon Sep 17 00:00:00 2001 From: Moshe Shitrit Date: Sat, 18 Mar 2023 15:53:18 +0200 Subject: [PATCH 1/2] bump aws cni to 1.12.5 and align with vendor chart --- .../k8s-1.16.yaml.template | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 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 47ffd3f3ae..8e504eddc8 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 @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.2" + app.kubernetes.io/version: "v1.12.5" --- # Source: aws-vpc-cni/templates/clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -44,7 +44,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.2" + app.kubernetes.io/version: "v1.12.5" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -88,7 +88,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.2" + app.kubernetes.io/version: "v1.12.5" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -108,7 +108,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.2" + app.kubernetes.io/version: "v1.12.5" spec: updateStrategy: rollingUpdate: @@ -129,7 +129,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.12.2" }}" + image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5" }}" env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -147,7 +147,7 @@ spec: {} containers: - name: aws-node - image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2" }}" + image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5" }}" ports: - containerPort: 61678 name: metrics @@ -182,8 +182,6 @@ spec: # value: "true" # - name: AWS_VPC_ENI_MTU # value: "9001" - # - name: AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER - # value: "false" # - name: AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG # value: "false" # - name: AWS_VPC_K8S_CNI_EXTERNALSNAT From 9477463655b2579d4718c95390770f1ec90cbf00 Mon Sep 17 00:00:00 2001 From: Moshe Shitrit Date: Sat, 18 Mar 2023 15:55:55 +0200 Subject: [PATCH 2/2] hack/update-expected --- ...ject_minimal.example.com-addons-bootstrap_content | 2 +- ...networking.amazon-vpc-routed-eni-k8s-1.16_content | 12 ++++++------ ...ject_minimal.example.com-addons-bootstrap_content | 2 +- ...networking.amazon-vpc-routed-eni-k8s-1.16_content | 12 ++++++------ ...ject_minimal.example.com-addons-bootstrap_content | 2 +- ...networking.amazon-vpc-routed-eni-k8s-1.16_content | 12 ++++++------ ...ject_minimal.example.com-addons-bootstrap_content | 2 +- ...networking.amazon-vpc-routed-eni-k8s-1.16_content | 12 ++++++------ ...ject_minimal.example.com-addons-bootstrap_content | 2 +- ...networking.amazon-vpc-routed-eni-k8s-1.16_content | 12 ++++++------ ...ject_minimal.example.com-addons-bootstrap_content | 2 +- ...networking.amazon-vpc-routed-eni-k8s-1.16_content | 12 ++++++------ ...ject_minimal.example.com-addons-bootstrap_content | 2 +- ...networking.amazon-vpc-routed-eni-k8s-1.16_content | 12 ++++++------ .../amazonvpc-containerd/manifest.yaml | 2 +- .../networking.amazon-vpc-routed-eni-k8s-1.16.yaml | 12 ++++++------ .../bootstrapchannelbuilder/amazonvpc/manifest.yaml | 2 +- .../networking.amazon-vpc-routed-eni-k8s-1.16.yaml | 12 ++++++------ 18 files changed, 63 insertions(+), 63 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 545ea18360..79548f5dc6 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: 547e1a901abac73eddc6e58028feb822e3048585357ec73fa64dd9f71f457cce + manifestHash: eeb66056bdf5cf1f69437de07effc0fea26585db62e0e7596bfaff6fc50d4bf2 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 0bcb444d54..a9b2d30286 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 @@ -35,7 +35,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -52,7 +52,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -118,7 +118,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -142,7 +142,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -228,7 +228,7 @@ spec: fieldPath: spec.nodeName - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5 livenessProbe: exec: command: @@ -277,7 +277,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5 name: aws-vpc-cni-init securityContext: privileged: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 8198c02122..c6520c01b0 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/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: 547e1a901abac73eddc6e58028feb822e3048585357ec73fa64dd9f71f457cce + manifestHash: eeb66056bdf5cf1f69437de07effc0fea26585db62e0e7596bfaff6fc50d4bf2 name: networking.amazon-vpc-routed-eni needsRollingUpdate: all selector: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/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-irsa23/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content index 0bcb444d54..a9b2d30286 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/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-irsa23/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content @@ -35,7 +35,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -52,7 +52,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -118,7 +118,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -142,7 +142,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -228,7 +228,7 @@ spec: fieldPath: spec.nodeName - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5 livenessProbe: exec: command: @@ -277,7 +277,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5 name: aws-vpc-cni-init securityContext: privileged: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index d156860d7a..297ed9fb43 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/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: 547e1a901abac73eddc6e58028feb822e3048585357ec73fa64dd9f71f457cce + manifestHash: eeb66056bdf5cf1f69437de07effc0fea26585db62e0e7596bfaff6fc50d4bf2 name: networking.amazon-vpc-routed-eni needsRollingUpdate: all selector: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/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-irsa24/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content index 0bcb444d54..a9b2d30286 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/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-irsa24/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content @@ -35,7 +35,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -52,7 +52,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -118,7 +118,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -142,7 +142,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -228,7 +228,7 @@ spec: fieldPath: spec.nodeName - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5 livenessProbe: exec: command: @@ -277,7 +277,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5 name: aws-vpc-cni-init securityContext: privileged: true 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 9cfe0369d7..f0ffe34f67 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: 547e1a901abac73eddc6e58028feb822e3048585357ec73fa64dd9f71f457cce + manifestHash: eeb66056bdf5cf1f69437de07effc0fea26585db62e0e7596bfaff6fc50d4bf2 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 0bcb444d54..a9b2d30286 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 @@ -35,7 +35,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -52,7 +52,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -118,7 +118,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -142,7 +142,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -228,7 +228,7 @@ spec: fieldPath: spec.nodeName - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5 livenessProbe: exec: command: @@ -277,7 +277,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5 name: aws-vpc-cni-init securityContext: privileged: true 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 19e518cdc2..dae77ab590 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: 547e1a901abac73eddc6e58028feb822e3048585357ec73fa64dd9f71f457cce + manifestHash: eeb66056bdf5cf1f69437de07effc0fea26585db62e0e7596bfaff6fc50d4bf2 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 0bcb444d54..a9b2d30286 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 @@ -35,7 +35,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -52,7 +52,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -118,7 +118,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -142,7 +142,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -228,7 +228,7 @@ spec: fieldPath: spec.nodeName - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5 livenessProbe: exec: command: @@ -277,7 +277,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5 name: aws-vpc-cni-init securityContext: privileged: true 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 ca6b44101f..6331945b04 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: 547e1a901abac73eddc6e58028feb822e3048585357ec73fa64dd9f71f457cce + manifestHash: eeb66056bdf5cf1f69437de07effc0fea26585db62e0e7596bfaff6fc50d4bf2 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 0bcb444d54..a9b2d30286 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 @@ -35,7 +35,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -52,7 +52,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -118,7 +118,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -142,7 +142,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -228,7 +228,7 @@ spec: fieldPath: spec.nodeName - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5 livenessProbe: exec: command: @@ -277,7 +277,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5 name: aws-vpc-cni-init securityContext: privileged: true diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 62ecb19968..c7c58bc5b1 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons/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: 547e1a901abac73eddc6e58028feb822e3048585357ec73fa64dd9f71f457cce + manifestHash: eeb66056bdf5cf1f69437de07effc0fea26585db62e0e7596bfaff6fc50d4bf2 name: networking.amazon-vpc-routed-eni needsRollingUpdate: all selector: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content index 0bcb444d54..a9b2d30286 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content @@ -35,7 +35,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -52,7 +52,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -118,7 +118,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -142,7 +142,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -228,7 +228,7 @@ spec: fieldPath: spec.nodeName - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5 livenessProbe: exec: command: @@ -277,7 +277,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5 name: aws-vpc-cni-init securityContext: privileged: true 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 9288a2a5bd..99fa445299 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: a411ad1a94134f2d87100a7d8ca9f79486a8c3ebea61180619d7d56f50ef0dd3 + manifestHash: 6f4775ca3d3e0d5709c9d8944a27a7895d5f553bc3d4024c8854cc8027d0e1be 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 f49ed5648a..a9739a9a24 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 @@ -35,7 +35,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -52,7 +52,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -118,7 +118,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -142,7 +142,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -230,7 +230,7 @@ spec: fieldPath: spec.nodeName - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5 livenessProbe: exec: command: @@ -279,7 +279,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5 name: aws-vpc-cni-init securityContext: privileged: true diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index 9288a2a5bd..99fa445299 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: a411ad1a94134f2d87100a7d8ca9f79486a8c3ebea61180619d7d56f50ef0dd3 + manifestHash: 6f4775ca3d3e0d5709c9d8944a27a7895d5f553bc3d4024c8854cc8027d0e1be 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 f49ed5648a..a9739a9a24 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 @@ -35,7 +35,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -52,7 +52,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -118,7 +118,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -142,7 +142,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.12.2 + app.kubernetes.io/version: v1.12.5 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -230,7 +230,7 @@ spec: fieldPath: spec.nodeName - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5 livenessProbe: exec: command: @@ -279,7 +279,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5 name: aws-vpc-cni-init securityContext: privileged: true