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

Kubernetes 1.16 Support #1819

Merged
4 changes: 2 additions & 2 deletions build
Expand Up @@ -6,8 +6,8 @@ TAG=$(git describe --exact-match --abbrev=0 --tags "${COMMIT}" 2> /dev/null || t
BRANCH=$(git branch | grep \* | cut -d ' ' -f2 | sed -e 's/[^a-zA-Z0-9+=._:/-]*//g' || true)
OUTPUT_PATH=${OUTPUT_PATH:-"bin/kube-aws"}
VERSION=""
ETCD_VERSION="v3.3.17"
KUBERNETES_VERSION="v1.15.6"
ETCD_VERSION="v3.4.3"
KUBERNETES_VERSION="v1.16.4"

if [ -z "$TAG" ]; then
[[ -n "$BRANCH" ]] && VERSION="${BRANCH}/"
Expand Down
@@ -1,5 +1,5 @@
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
namespace: kube-system
Expand All @@ -9,6 +9,9 @@ metadata:
spec:
updateStrategy:
type: RollingUpdate
selector:
matchLabels:
k8s-app: aws-iam-authenticator
template:
metadata:
annotations:
Expand All @@ -18,55 +21,50 @@ spec:
spec:
# run on the host network (don't depend on CNI)
hostNetwork: true

# run on each master node
nodeSelector:
node-role.kubernetes.io/master: ""
tolerations:
- effect: NoSchedule
key: node.alpha.kubernetes.io/role
value: master
- effect: NoSchedule
key: node-role.kubernetes.io/master
- key: CriticalAddonsOnly
operator: Exists

- effect: NoSchedule
key: node.alpha.kubernetes.io/role
value: master
- effect: NoSchedule
key: node-role.kubernetes.io/master
- key: CriticalAddonsOnly
operator: Exists
# run `aws-iam-authenticator server` with three volumes
# - config (mounted from the ConfigMap at /etc/aws-iam-authenticator/config.yaml)
# - state (persisted TLS certificate and keys, mounted from the host)
# - output (output kubeconfig to plug into your apiserver configuration, mounted from the host)
containers:
- name: aws-iam-authenticator
image: gcr.io/heptio-images/authenticator:v0.3.0
args:
- server
- --config=/etc/aws-iam-authenticator/config.yaml
- --state-dir=/var/aws-iam-authenticator
- --kubeconfig-pregenerated=true

resources:
requests:
memory: 20Mi
cpu: 10m
limits:
memory: 20Mi
cpu: 100m

volumeMounts:
- name: aws-iam-authenticator
image: gcr.io/heptio-images/authenticator:v0.3.0
args:
- server
- --config=/etc/aws-iam-authenticator/config.yaml
- --state-dir=/var/aws-iam-authenticator
- --kubeconfig-pregenerated=true
resources:
requests:
memory: 20Mi
cpu: 10m
limits:
memory: 20Mi
cpu: 100m
volumeMounts:
- name: config
mountPath: /etc/aws-iam-authenticator/
- name: state
mountPath: /var/aws-iam-authenticator/
- name: output
mountPath: /etc/kubernetes/aws-iam-authenticator/
volumes:
- name: config
mountPath: /etc/aws-iam-authenticator/
- name: state
mountPath: /var/aws-iam-authenticator/
configMap:
name: aws-iam-authenticator
- name: output
mountPath: /etc/kubernetes/aws-iam-authenticator/

volumes:
- name: config
configMap:
name: aws-iam-authenticator
- name: output
hostPath:
path: /srv/kubernetes/aws-iam-authenticator/
- name: state
hostPath:
path: /srv/kubernetes/aws-iam-authenticator/
hostPath:
path: /srv/kubernetes/aws-iam-authenticator/
- name: state
hostPath:
path: /srv/kubernetes/aws-iam-authenticator/
@@ -1,5 +1,5 @@
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
Expand All @@ -8,6 +8,9 @@ metadata:
namespace: kube-system
spec:
replicas: {{ .Values.replicas }}
selector:
matchLabels:
app: cluster-autoscaler
template:
metadata:
labels:
Expand Down
2 changes: 1 addition & 1 deletion builtin/files/plugins/dashboard/manifests/deployment.yaml
Expand Up @@ -149,4 +149,4 @@ spec:
- {{ .Values.ingress.hostname }}
secretName: kubernetes-dashboard-ingress-certs
{{- end }}
{{- end }}
{{- end }}
6 changes: 5 additions & 1 deletion builtin/files/plugins/kiam/manifests/agent-daemonset.yaml
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
namespace: kube-system
Expand All @@ -8,6 +8,10 @@ spec:
rollingUpdate:
maxUnavailable: 100%
type: RollingUpdate
selector:
matchLabels:
app: kiam
role: agent
template:
metadata:
annotations:
Expand Down
6 changes: 5 additions & 1 deletion builtin/files/plugins/kiam/manifests/server-daemonset.yaml
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
namespace: kube-system
Expand All @@ -8,6 +8,10 @@ spec:
rollingUpdate:
maxUnavailable: 100%
type: RollingUpdate
selector:
matchLabels:
app: kiam
role: server
template:
metadata:
annotations:
Expand Down
5 changes: 4 additions & 1 deletion builtin/files/plugins/kube2iam/manifests/daemonset.yaml
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: kube2iam
Expand All @@ -12,6 +12,9 @@ spec:
rollingUpdate:
maxUnavailable: 100%
type: RollingUpdate
selector:
matchLabels:
name: kube2iam
template:
metadata:
labels:
Expand Down