Skip to content

Automated cherry pick of #17783: chore(upup): bump aws-cni to 1.20.5 #17784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
moshevayner wants to merge 1 commit into from
+13 −8
Closed

Automated cherry pick of #17783: chore(upup): bump aws-cni to 1.20.5 #17784

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ spec:
storage: true
subresources:
status: {}

---
# Source: aws-vpc-cni/templates/serviceaccount.yaml
apiVersion: v1
Expand All @@ -300,7 +301,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.20.2"
app.kubernetes.io/version: "v1.20.5"
---
# Source: aws-vpc-cni/templates/configmap.yaml
apiVersion: v1
Expand All @@ -312,7 +313,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.20.2"
app.kubernetes.io/version: "v1.20.5"
data:
enable-windows-ipam: "false"
enable-network-policy-controller: "false"
Expand All @@ -331,7 +332,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.20.2"
app.kubernetes.io/version: "v1.20.5"
rules:
- apiGroups:
- crd.k8s.amazonaws.com
Expand Down Expand Up @@ -384,7 +385,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.20.2"
app.kubernetes.io/version: "v1.20.5"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -404,7 +405,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.20.2"
app.kubernetes.io/version: "v1.20.5"
spec:
updateStrategy:
rollingUpdate:
Expand All @@ -425,7 +426,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.20.2" }}"
image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.5" }}"
imagePullPolicy: IfNotPresent
env:
- name: DISABLE_TCP_EARLY_DEMUX
Expand All @@ -451,7 +452,7 @@ spec:
{{ end }}
containers:
- name: aws-node
image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.2" }}"
image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.5" }}"
ports:
- containerPort: 61678
name: metrics
Expand Down Expand Up @@ -508,10 +509,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 Down Expand Up @@ -558,7 +563,7 @@ 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.6" }}"
image: "{{- or .Networking.AmazonVPC.NetworkPolicyAgentImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.7 }}"
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8162
Expand Down
Loading