Skip to content
This repository has been archived by the owner on Apr 30, 2021. It is now read-only.

Commit

Permalink
Merge pull request #1172 from alphagov/do-components-1.16-upgrade
Browse files Browse the repository at this point in the history
Update AWS VPC CNI and KubeProxy for EKS 1.16
  • Loading branch information
Krenair authored Aug 12, 2020
2 parents 7ce3353 + 566cd0e commit 9ef8f4f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion charts/gsp-cluster/templates/00-aws-auth/aws-vpc-cni.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ spec:
tolerations:
- operator: Exists
containers:
- image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.1
- image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.3
imagePullPolicy: Always
ports:
- containerPort: 61678
Expand Down
2 changes: 1 addition & 1 deletion charts/gsp-cluster/templates/00-aws-auth/kube-proxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
- /bin/sh
- -c
- kube-proxy --v=2 --config=/var/lib/kube-proxy-config/config
image: 602401143452.dkr.ecr.eu-west-2.amazonaws.com/eks/kube-proxy:v1.15.11
image: 602401143452.dkr.ecr.eu-west-2.amazonaws.com/eks/kube-proxy:v1.16.12
imagePullPolicy: IfNotPresent
name: kube-proxy
resources:
Expand Down
7 changes: 4 additions & 3 deletions charts/gsp-cluster/templates/02-gsp-system/calico.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
# container programs network policy and routes on each
# host.
- name: calico-node
image: quay.io/calico/node:v3.13.0
image: quay.io/calico/node:v3.13.4
env:
# Use Kubernetes API as the backing datastore.
- name: DATASTORE_TYPE
Expand Down Expand Up @@ -377,12 +377,13 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: calico-node
rules:
# The CNI plugin needs to get pods, nodes, and namespaces.
# The CNI plugin needs to get pods, nodes, configmaps, and namespaces.
- apiGroups: [""]
resources:
- pods
- nodes
- namespaces
- configmaps
verbs:
- get
- apiGroups: [""]
Expand Down Expand Up @@ -553,7 +554,7 @@ spec:
securityContext:
fsGroup: 65534
containers:
- image: quay.io/calico/typha:v3.13.0
- image: quay.io/calico/typha:v3.13.4
name: calico-typha
ports:
- containerPort: 5473
Expand Down

0 comments on commit 9ef8f4f

Please sign in to comment.