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 1c2120c409e95..197d9dbcd2327 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: 01f858a114224a9b057f7bc49d1efe3e4f7e9cce20433eb5a236568c07d32beb + manifestHash: 81a3df42f167e9cb88e47acd16b95c469453424b3eab02c6f58ad6e899e88fac 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 25640695c097a..d5bc5428933ad 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.3 + app.kubernetes.io/version: v1.20.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.3 + app.kubernetes.io/version: v1.20.2 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.19.3 + app.kubernetes.io/version: v1.20.2 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.19.3 + app.kubernetes.io/version: v1.20.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.3 + app.kubernetes.io/version: v1.20.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.3 + value: v1.20.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.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.2 livenessProbe: exec: command: @@ -607,14 +607,19 @@ spec: - --metrics-bind-addr=:8162 - --health-probe-bind-addr=:8163 - --conntrack-cache-cleanup-period=300 + - --log-level=debug env: - name: MY_NODE_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.0 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.6 + imagePullPolicy: IfNotPresent name: aws-eks-nodeagent + ports: + - containerPort: 8162 + name: agentmetrics resources: requests: cpu: 25m @@ -639,7 +644,8 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.2 + imagePullPolicy: IfNotPresent 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 3edae4d3c4801..f6b00ddce4e9a 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: 21c03f6286047d01dc3f580caa32c3f555c3053775327b7b8df83eff4ee8f753 + manifestHash: 6bfa7cbcad4ea5e0d6e27aa8c8e75546726cbe935dddb14950e4a1dbbec3b4fb 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 2e8b48e84f73f..3afa15b62da58 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.3 + app.kubernetes.io/version: v1.20.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.3 + app.kubernetes.io/version: v1.20.2 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.19.3 + app.kubernetes.io/version: v1.20.2 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.19.3 + app.kubernetes.io/version: v1.20.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.3 + app.kubernetes.io/version: v1.20.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.3 + value: v1.20.2 - name: MY_NODE_NAME valueFrom: fieldRef: @@ -607,6 +607,7 @@ spec: - --metrics-bind-addr=:8162 - --health-probe-bind-addr=:8163 - --conntrack-cache-cleanup-period=300 + - --log-level=debug env: - name: MY_NODE_NAME valueFrom: @@ -614,7 +615,11 @@ spec: apiVersion: v1 fieldPath: spec.nodeName image: networkpolicyagentimage:123 + imagePullPolicy: IfNotPresent name: aws-eks-nodeagent + ports: + - containerPort: 8162 + name: agentmetrics resources: requests: cpu: 25m @@ -640,6 +645,7 @@ spec: - name: ENABLE_IPv6 value: "false" image: initimage:123 + imagePullPolicy: IfNotPresent name: aws-vpc-cni-init resources: requests: 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 1eea84d3171b3..e6d6a24384b11 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: 9af85cb340fe0bc0006486875f7f4b0c309550f38104b131ad64a4996369d9bb + manifestHash: c9f1c2a044d44f9eb7c9f3b186f174f8ff9201a24c3a0c4f3d175327260ac51f 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 563002e21aa62..47e9c801d29e1 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.3 + app.kubernetes.io/version: v1.20.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.3 + app.kubernetes.io/version: v1.20.2 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.19.3 + app.kubernetes.io/version: v1.20.2 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.19.3 + app.kubernetes.io/version: v1.20.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.3 + app.kubernetes.io/version: v1.20.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.3 + value: v1.20.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.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.2 livenessProbe: exec: command: @@ -607,14 +607,19 @@ spec: - --metrics-bind-addr=:8162 - --health-probe-bind-addr=:8163 - --conntrack-cache-cleanup-period=300 + - --log-level=debug env: - name: MY_NODE_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.0 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.6 + imagePullPolicy: IfNotPresent name: aws-eks-nodeagent + ports: + - containerPort: 8162 + name: agentmetrics resources: requests: cpu: 25m @@ -639,7 +644,8 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.2 + imagePullPolicy: IfNotPresent name: aws-vpc-cni-init resources: requests: 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 f4c12f4e73dc7..94482fcea58b2 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.19.3/config/master/aws-k8s-cni.yaml +# Vendored from https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/v1.20.2/config/master/aws-k8s-cni.yaml --- # Source: aws-vpc-cni/crds/customresourcedefinition.yaml apiVersion: apiextensions.k8s.io/v1 @@ -61,7 +61,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.3 - creationTimestamp: null labels: app.kubernetes.io/name: amazon-network-policy-controller-k8s name: policyendpoints.networking.k8s.aws @@ -301,7 +300,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.19.3" + app.kubernetes.io/version: "v1.20.2" --- # Source: aws-vpc-cni/templates/configmap.yaml apiVersion: v1 @@ -313,7 +312,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.19.3" + app.kubernetes.io/version: "v1.20.2" data: enable-windows-ipam: "false" enable-network-policy-controller: "false" @@ -332,7 +331,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.19.3" + app.kubernetes.io/version: "v1.20.2" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -385,7 +384,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.19.3" + app.kubernetes.io/version: "v1.20.2" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -405,7 +404,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.19.3" + app.kubernetes.io/version: "v1.20.2" spec: updateStrategy: rollingUpdate: @@ -426,7 +425,8 @@ 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.19.3" }}" + image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.2" }}" + imagePullPolicy: IfNotPresent 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.19.3" }}" + image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.2" }}" ports: - containerPort: 61678 name: metrics @@ -521,7 +521,7 @@ spec: # - name: NETWORK_POLICY_ENFORCING_MODE # value: "standard" - name: VPC_CNI_VERSION - value: "v1.19.3" + value: "v1.20.2" # - name: WARM_ENI_TARGET # value: "1" # - name: WARM_PREFIX_TARGET @@ -558,7 +558,11 @@ 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.2.0" }}" + image: "{{- or .Networking.AmazonVPC.NetworkPolicyAgentImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.6" }}" + imagePullPolicy: IfNotPresent + ports: + - containerPort: 8162 + name: agentmetrics env: - name: MY_NODE_NAME valueFrom: @@ -574,6 +578,7 @@ spec: - --metrics-bind-addr=:8162 - --health-probe-bind-addr=:8163 - --conntrack-cache-cleanup-period=300 + - --log-level=debug resources: requests: cpu: 25m 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 94c3f70274afd..6833a89e3772d 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: f368578084c2e0bcab27b616c0e9e14bf1eb45d11156ea16066b380681e345f3 + manifestHash: 60dc2dfbd6e22046a5dd6c0d391b6e540720fdbff0f7174c13f63eaaa17249f4 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 e6bc373f87043..d33ad12757c10 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.3 + app.kubernetes.io/version: v1.20.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.3 + app.kubernetes.io/version: v1.20.2 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.19.3 + app.kubernetes.io/version: v1.20.2 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.19.3 + app.kubernetes.io/version: v1.20.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.3 + app.kubernetes.io/version: v1.20.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.3 + value: v1.20.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.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.2 livenessProbe: exec: command: @@ -609,14 +609,19 @@ spec: - --metrics-bind-addr=:8162 - --health-probe-bind-addr=:8163 - --conntrack-cache-cleanup-period=300 + - --log-level=debug env: - name: MY_NODE_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.0 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.6 + imagePullPolicy: IfNotPresent name: aws-eks-nodeagent + ports: + - containerPort: 8162 + name: agentmetrics resources: requests: cpu: 25m @@ -641,7 +646,8 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.2 + imagePullPolicy: IfNotPresent 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 94c3f70274afd..6833a89e3772d 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: f368578084c2e0bcab27b616c0e9e14bf1eb45d11156ea16066b380681e345f3 + manifestHash: 60dc2dfbd6e22046a5dd6c0d391b6e540720fdbff0f7174c13f63eaaa17249f4 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 e6bc373f87043..d33ad12757c10 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.3 + app.kubernetes.io/version: v1.20.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.3 + app.kubernetes.io/version: v1.20.2 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.19.3 + app.kubernetes.io/version: v1.20.2 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.19.3 + app.kubernetes.io/version: v1.20.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.3 + app.kubernetes.io/version: v1.20.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.3 + value: v1.20.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.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.2 livenessProbe: exec: command: @@ -609,14 +609,19 @@ spec: - --metrics-bind-addr=:8162 - --health-probe-bind-addr=:8163 - --conntrack-cache-cleanup-period=300 + - --log-level=debug env: - name: MY_NODE_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.0 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.6 + imagePullPolicy: IfNotPresent name: aws-eks-nodeagent + ports: + - containerPort: 8162 + name: agentmetrics resources: requests: cpu: 25m @@ -641,7 +646,8 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.2 + imagePullPolicy: IfNotPresent name: aws-vpc-cni-init resources: requests: