diff --git a/pkg/addons/default/assets/aws-node.yaml b/pkg/addons/default/assets/aws-node.yaml index d05713246f..6fbfc4329c 100644 --- a/pkg/addons/default/assets/aws-node.yaml +++ b/pkg/addons/default/assets/aws-node.yaml @@ -300,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.5" + app.kubernetes.io/version: "v1.20.0" --- # Source: aws-vpc-cni/templates/configmap.yaml apiVersion: v1 @@ -312,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.5" + app.kubernetes.io/version: "v1.20.0" data: enable-windows-ipam: "false" enable-network-policy-controller: "false" @@ -331,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.5" + app.kubernetes.io/version: "v1.20.0" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -377,7 +377,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.5" + app.kubernetes.io/version: "v1.20.0" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -397,7 +397,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.5" + app.kubernetes.io/version: "v1.20.0" spec: updateStrategy: rollingUpdate: @@ -418,7 +418,7 @@ spec: hostNetwork: true initContainers: - name: aws-vpc-cni-init - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.5 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.0 imagePullPolicy: Always env: - name: DISABLE_TCP_EARLY_DEMUX @@ -440,7 +440,7 @@ spec: {} containers: - name: aws-node - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.5 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.0 ports: - containerPort: 61678 name: metrics @@ -491,10 +491,14 @@ spec: value: "false" - name: DISABLE_NETWORK_RESOURCE_PROVISIONING value: "false" + - name: ENABLE_IMDS_ONLY_MODE + value: "false" - name: ENABLE_IPv4 value: "true" - name: ENABLE_IPv6 value: "false" + - name: ENABLE_MULTI_NIC + value: "false" - name: ENABLE_POD_ENI value: "false" - name: ENABLE_PREFIX_DELEGATION @@ -504,7 +508,7 @@ spec: - name: NETWORK_POLICY_ENFORCING_MODE value: "standard" - name: VPC_CNI_VERSION - value: "v1.19.5" + value: "v1.20.0" - name: WARM_ENI_TARGET value: "1" - name: WARM_PREFIX_TARGET @@ -539,7 +543,7 @@ spec: - mountPath: /run/xtables.lock name: xtables-lock - name: aws-eks-nodeagent - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.1 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.3 imagePullPolicy: Always ports: - containerPort: 8162 @@ -559,6 +563,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/pkg/addons/default/aws_node_test.go b/pkg/addons/default/aws_node_test.go index 8e96dac1ac..5f7349bec0 100644 --- a/pkg/addons/default/aws_node_test.go +++ b/pkg/addons/default/aws_node_test.go @@ -61,7 +61,7 @@ var _ = Describe("AWS Node", func() { Describe("UpdateAWSNode", func() { var preUpdateAwsNode *v1.DaemonSet - const expectedVersion = "v1.19.5" + const expectedVersion = "v1.20.0" BeforeEach(func() { loadSamples(rawClient, "testdata/sample-1.15.json")