Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions pkg/addons/default/assets/aws-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/addons/default/aws_node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down