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 2e44289a75..6ab94eeafb 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 @@ -118,7 +118,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: c195c6705709ea2a9758dfc22742f653faf6a1f220786fbf60cddb2a65a8b4a8 + manifestHash: d059ed8a6be6f02f65c2664aa736ec900583a7c1527f0a7d7c1b32cfebc8ca04 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 17c3788401..fadc73821c 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 @@ -7,7 +7,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -24,7 +24,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: eniconfigs.crd.k8s.amazonaws.com @@ -56,7 +56,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -113,7 +113,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -137,7 +137,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -177,19 +177,49 @@ spec: - env: - name: ADDITIONAL_ENI_TAGS value: '{"KubernetesCluster":"minimal.example.com","kubernetes.io/cluster/minimal.example.com":"owned"}' + - name: AWS_VPC_CNI_NODE_PORT_SUPPORT + 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 + value: "false" + - name: AWS_VPC_K8S_CNI_LOGLEVEL + value: DEBUG + - name: AWS_VPC_K8S_CNI_LOG_FILE + value: /host/var/log/aws-routed-eni/ipamd.log + - name: AWS_VPC_K8S_CNI_RANDOMIZESNAT + value: prng + - name: AWS_VPC_K8S_CNI_VETHPREFIX + value: eni + - name: AWS_VPC_K8S_PLUGIN_LOG_FILE + value: /var/log/aws-routed-eni/plugin.log + - name: AWS_VPC_K8S_PLUGIN_LOG_LEVEL + value: DEBUG + - name: DISABLE_INTROSPECTION + value: "false" + - name: DISABLE_METRICS + value: "false" + - name: DISABLE_NETWORK_RESOURCE_PROVISIONING + value: "false" - name: ENABLE_IPv4 value: "true" - name: ENABLE_IPv6 value: "false" + - name: ENABLE_POD_ENI + value: "false" + - name: WARM_ENI_TARGET + value: "1" - name: MY_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.10.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.11.0 livenessProbe: exec: command: @@ -239,7 +269,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.10.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.0 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 40dab1aba9..94f04fc83b 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 @@ -125,7 +125,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: c195c6705709ea2a9758dfc22742f653faf6a1f220786fbf60cddb2a65a8b4a8 + manifestHash: d059ed8a6be6f02f65c2664aa736ec900583a7c1527f0a7d7c1b32cfebc8ca04 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 17c3788401..fadc73821c 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 @@ -7,7 +7,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -24,7 +24,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: eniconfigs.crd.k8s.amazonaws.com @@ -56,7 +56,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -113,7 +113,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -137,7 +137,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -177,19 +177,49 @@ spec: - env: - name: ADDITIONAL_ENI_TAGS value: '{"KubernetesCluster":"minimal.example.com","kubernetes.io/cluster/minimal.example.com":"owned"}' + - name: AWS_VPC_CNI_NODE_PORT_SUPPORT + 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 + value: "false" + - name: AWS_VPC_K8S_CNI_LOGLEVEL + value: DEBUG + - name: AWS_VPC_K8S_CNI_LOG_FILE + value: /host/var/log/aws-routed-eni/ipamd.log + - name: AWS_VPC_K8S_CNI_RANDOMIZESNAT + value: prng + - name: AWS_VPC_K8S_CNI_VETHPREFIX + value: eni + - name: AWS_VPC_K8S_PLUGIN_LOG_FILE + value: /var/log/aws-routed-eni/plugin.log + - name: AWS_VPC_K8S_PLUGIN_LOG_LEVEL + value: DEBUG + - name: DISABLE_INTROSPECTION + value: "false" + - name: DISABLE_METRICS + value: "false" + - name: DISABLE_NETWORK_RESOURCE_PROVISIONING + value: "false" - name: ENABLE_IPv4 value: "true" - name: ENABLE_IPv6 value: "false" + - name: ENABLE_POD_ENI + value: "false" + - name: WARM_ENI_TARGET + value: "1" - name: MY_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.10.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.11.0 livenessProbe: exec: command: @@ -239,7 +269,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.10.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.0 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 700760fd31..fbf00a1406 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 @@ -118,7 +118,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: c195c6705709ea2a9758dfc22742f653faf6a1f220786fbf60cddb2a65a8b4a8 + manifestHash: d059ed8a6be6f02f65c2664aa736ec900583a7c1527f0a7d7c1b32cfebc8ca04 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 17c3788401..fadc73821c 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 @@ -7,7 +7,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -24,7 +24,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: eniconfigs.crd.k8s.amazonaws.com @@ -56,7 +56,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -113,7 +113,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -137,7 +137,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -177,19 +177,49 @@ spec: - env: - name: ADDITIONAL_ENI_TAGS value: '{"KubernetesCluster":"minimal.example.com","kubernetes.io/cluster/minimal.example.com":"owned"}' + - name: AWS_VPC_CNI_NODE_PORT_SUPPORT + 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 + value: "false" + - name: AWS_VPC_K8S_CNI_LOGLEVEL + value: DEBUG + - name: AWS_VPC_K8S_CNI_LOG_FILE + value: /host/var/log/aws-routed-eni/ipamd.log + - name: AWS_VPC_K8S_CNI_RANDOMIZESNAT + value: prng + - name: AWS_VPC_K8S_CNI_VETHPREFIX + value: eni + - name: AWS_VPC_K8S_PLUGIN_LOG_FILE + value: /var/log/aws-routed-eni/plugin.log + - name: AWS_VPC_K8S_PLUGIN_LOG_LEVEL + value: DEBUG + - name: DISABLE_INTROSPECTION + value: "false" + - name: DISABLE_METRICS + value: "false" + - name: DISABLE_NETWORK_RESOURCE_PROVISIONING + value: "false" - name: ENABLE_IPv4 value: "true" - name: ENABLE_IPv6 value: "false" + - name: ENABLE_POD_ENI + value: "false" + - name: WARM_ENI_TARGET + value: "1" - name: MY_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.10.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.11.0 livenessProbe: exec: command: @@ -239,7 +269,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.10.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.0 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 ff91004015..fbb454a9fc 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 @@ -118,7 +118,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: c195c6705709ea2a9758dfc22742f653faf6a1f220786fbf60cddb2a65a8b4a8 + manifestHash: d059ed8a6be6f02f65c2664aa736ec900583a7c1527f0a7d7c1b32cfebc8ca04 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 17c3788401..fadc73821c 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 @@ -7,7 +7,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -24,7 +24,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: eniconfigs.crd.k8s.amazonaws.com @@ -56,7 +56,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -113,7 +113,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -137,7 +137,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -177,19 +177,49 @@ spec: - env: - name: ADDITIONAL_ENI_TAGS value: '{"KubernetesCluster":"minimal.example.com","kubernetes.io/cluster/minimal.example.com":"owned"}' + - name: AWS_VPC_CNI_NODE_PORT_SUPPORT + 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 + value: "false" + - name: AWS_VPC_K8S_CNI_LOGLEVEL + value: DEBUG + - name: AWS_VPC_K8S_CNI_LOG_FILE + value: /host/var/log/aws-routed-eni/ipamd.log + - name: AWS_VPC_K8S_CNI_RANDOMIZESNAT + value: prng + - name: AWS_VPC_K8S_CNI_VETHPREFIX + value: eni + - name: AWS_VPC_K8S_PLUGIN_LOG_FILE + value: /var/log/aws-routed-eni/plugin.log + - name: AWS_VPC_K8S_PLUGIN_LOG_LEVEL + value: DEBUG + - name: DISABLE_INTROSPECTION + value: "false" + - name: DISABLE_METRICS + value: "false" + - name: DISABLE_NETWORK_RESOURCE_PROVISIONING + value: "false" - name: ENABLE_IPv4 value: "true" - name: ENABLE_IPv6 value: "false" + - name: ENABLE_POD_ENI + value: "false" + - name: WARM_ENI_TARGET + value: "1" - name: MY_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName - name: CLUSTER_NAME value: minimal.example.com - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.10.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.11.0 livenessProbe: exec: command: @@ -239,7 +269,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.10.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.0 name: aws-vpc-cni-init securityContext: privileged: true 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 7aaa560ad5..322c82ab9a 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://github.com/aws/amazon-vpc-cni-k8s/blob/release-1.10/config/master/aws-k8s-cni.yaml +# Vendored from https://github.com/aws/amazon-vpc-cni-k8s/blob/release-1.11/config/master/aws-k8s-cni.yaml --- # Source: aws-vpc-cni/templates/serviceaccount.yaml apiVersion: v1 @@ -10,7 +10,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.10.3" + app.kubernetes.io/version: "v1.11.0" --- # Source: aws-vpc-cni/templates/customresourcedefinition.yaml apiVersion: apiextensions.k8s.io/v1 @@ -21,7 +21,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.10.3" + app.kubernetes.io/version: "v1.11.0" spec: scope: Cluster group: crd.k8s.amazonaws.com @@ -48,7 +48,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.10.3" + app.kubernetes.io/version: "v1.11.0" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -81,7 +81,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.10.3" + app.kubernetes.io/version: "v1.11.0" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -101,7 +101,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.10.3" + app.kubernetes.io/version: "v1.11.0" spec: updateStrategy: rollingUpdate: @@ -122,7 +122,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.10.3" }}" + image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.0" }}" env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -140,7 +140,7 @@ spec: {} containers: - name: aws-node - image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.10.3" }}" + image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.11.0" }}" ports: - containerPort: 61678 name: metrics diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go index 9affc0d2e6..730a1ca06f 100644 --- a/upup/pkg/fi/cloudup/template_functions.go +++ b/upup/pkg/fi/cloudup/template_functions.go @@ -182,7 +182,24 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS c := cluster.Spec.Networking.AmazonVPC dest["AmazonVpcEnvVars"] = func() map[string]string { envVars := map[string]string{ - "AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER": "false", + // Use defaults from the official AWS VPC CNI Helm chart: + // https://github.com/aws/amazon-vpc-cni-k8s/blob/master/charts/aws-vpc-cni/values.yaml + "AWS_VPC_CNI_NODE_PORT_SUPPORT": "true", + "AWS_VPC_ENI_MTU": "9001", + "AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER": "false", + "AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG": "false", + "AWS_VPC_K8S_CNI_EXTERNALSNAT": "false", + "AWS_VPC_K8S_CNI_LOG_FILE": "/host/var/log/aws-routed-eni/ipamd.log", + "AWS_VPC_K8S_CNI_LOGLEVEL": "DEBUG", + "AWS_VPC_K8S_CNI_RANDOMIZESNAT": "prng", + "AWS_VPC_K8S_CNI_VETHPREFIX": "eni", + "AWS_VPC_K8S_PLUGIN_LOG_FILE": "/var/log/aws-routed-eni/plugin.log", + "AWS_VPC_K8S_PLUGIN_LOG_LEVEL": "DEBUG", + "DISABLE_INTROSPECTION": "false", + "DISABLE_METRICS": "false", + "ENABLE_POD_ENI": "false", + "WARM_ENI_TARGET": "1", + "DISABLE_NETWORK_RESOURCE_PROVISIONING": "false", } for _, e := range c.Env { envVars[e.Name] = e.Value 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 2c0bd8dea4..594a11f6c7 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml @@ -54,7 +54,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: c313673293a23aaa0466524e00dea87ac8d7f4d4341b8042200e0c33614184c9 + manifestHash: 04f1191be3d72b4ffbb516414cfa2d0a62c6368771c2447cbc30defbe47ec64b 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 94f453f284..1c5f29f994 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 @@ -7,7 +7,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -24,7 +24,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: eniconfigs.crd.k8s.amazonaws.com @@ -56,7 +56,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -113,7 +113,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -137,7 +137,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -177,14 +177,42 @@ spec: - env: - name: ADDITIONAL_ENI_TAGS value: '{"KubernetesCluster":"minimal.example.com","kubernetes.io/cluster/minimal.example.com":"owned"}' + - name: AWS_VPC_CNI_NODE_PORT_SUPPORT + 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 + value: "false" - name: AWS_VPC_K8S_CNI_LOGLEVEL value: debug + - name: AWS_VPC_K8S_CNI_LOG_FILE + value: /host/var/log/aws-routed-eni/ipamd.log + - name: AWS_VPC_K8S_CNI_RANDOMIZESNAT + value: prng + - name: AWS_VPC_K8S_CNI_VETHPREFIX + value: eni + - name: AWS_VPC_K8S_PLUGIN_LOG_FILE + value: /var/log/aws-routed-eni/plugin.log + - name: AWS_VPC_K8S_PLUGIN_LOG_LEVEL + value: DEBUG + - name: DISABLE_INTROSPECTION + value: "false" + - name: DISABLE_METRICS + value: "false" + - name: DISABLE_NETWORK_RESOURCE_PROVISIONING + value: "false" - name: ENABLE_IPv4 value: "true" - name: ENABLE_IPv6 value: "false" + - name: ENABLE_POD_ENI + value: "false" + - name: WARM_ENI_TARGET + value: "1" - name: WARM_IP_TARGET value: "10" - name: MY_NODE_NAME @@ -193,7 +221,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.10.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.11.0 livenessProbe: exec: command: @@ -243,7 +271,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.10.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.0 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 2c0bd8dea4..594a11f6c7 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -54,7 +54,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: c313673293a23aaa0466524e00dea87ac8d7f4d4341b8042200e0c33614184c9 + manifestHash: 04f1191be3d72b4ffbb516414cfa2d0a62c6368771c2447cbc30defbe47ec64b 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 94f453f284..1c5f29f994 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 @@ -7,7 +7,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -24,7 +24,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: eniconfigs.crd.k8s.amazonaws.com @@ -56,7 +56,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -113,7 +113,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -137,7 +137,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.10.3 + app.kubernetes.io/version: v1.11.0 k8s-app: aws-node role.kubernetes.io/networking: "1" name: aws-node @@ -177,14 +177,42 @@ spec: - env: - name: ADDITIONAL_ENI_TAGS value: '{"KubernetesCluster":"minimal.example.com","kubernetes.io/cluster/minimal.example.com":"owned"}' + - name: AWS_VPC_CNI_NODE_PORT_SUPPORT + 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 + value: "false" - name: AWS_VPC_K8S_CNI_LOGLEVEL value: debug + - name: AWS_VPC_K8S_CNI_LOG_FILE + value: /host/var/log/aws-routed-eni/ipamd.log + - name: AWS_VPC_K8S_CNI_RANDOMIZESNAT + value: prng + - name: AWS_VPC_K8S_CNI_VETHPREFIX + value: eni + - name: AWS_VPC_K8S_PLUGIN_LOG_FILE + value: /var/log/aws-routed-eni/plugin.log + - name: AWS_VPC_K8S_PLUGIN_LOG_LEVEL + value: DEBUG + - name: DISABLE_INTROSPECTION + value: "false" + - name: DISABLE_METRICS + value: "false" + - name: DISABLE_NETWORK_RESOURCE_PROVISIONING + value: "false" - name: ENABLE_IPv4 value: "true" - name: ENABLE_IPv6 value: "false" + - name: ENABLE_POD_ENI + value: "false" + - name: WARM_ENI_TARGET + value: "1" - name: WARM_IP_TARGET value: "10" - name: MY_NODE_NAME @@ -193,7 +221,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.10.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.11.0 livenessProbe: exec: command: @@ -243,7 +271,7 @@ spec: value: "false" - name: ENABLE_IPv6 value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.10.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.0 name: aws-vpc-cni-init securityContext: privileged: true