Kubernetes 1.16 Support (#1819)

* Update kubernetes to v1.16 Run kubelet in docker rather than rkt container * Update DaemonSets and Deployments with Selectors Reformat lots of dodgy looking indenting in cloud-config-controller * Correct kube-proxy selector indent * Remove possible blank line * Bump Calico to version 3.11.1 * Define kubelet and system cgroups as /systemd/system.slice Mount /var/lib/docker into kubelet - it needs to write resolv.conf into container fs. * Mount more of the host system inside of the kubelet docker container * corrupted worker cfn-signal service * Update builtin/files/plugins/dashboard/manifests/deployment.yaml Co-Authored-By: Fabián Sellés Rosa <1088313+Fsero@users.noreply.github.com>
kubernetes-retired · Jan 7, 2020 · 1ffe330 · 1ffe330
1 parent f3e7be4
commit 1ffe330
Show file tree

Hide file tree

Showing 13 changed files with 1,496 additions and 1,433 deletions.
diff --git a/build b/build
@@ -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}/"

diff --git a/builtin/files/plugins/aws-iam-authenticator/manifests/daemonset.yaml b/builtin/files/plugins/aws-iam-authenticator/manifests/daemonset.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   namespace: kube-system
@@ -9,6 +9,9 @@ metadata:
 spec:
   updateStrategy:
     type: RollingUpdate
+  selector:
+    matchLabels:
+      k8s-app: aws-iam-authenticator
   template:
     metadata:
       annotations:
@@ -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/
diff --git a/builtin/files/plugins/cluster-autoscaler/manifests/deployment.yaml b/builtin/files/plugins/cluster-autoscaler/manifests/deployment.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
@@ -8,6 +8,9 @@ metadata:
   namespace: kube-system
 spec:
   replicas: {{ .Values.replicas }}
+  selector:
+    matchLabels:
+      app: cluster-autoscaler
   template:
     metadata:
       labels:

diff --git a/builtin/files/plugins/dashboard/manifests/deployment.yaml b/builtin/files/plugins/dashboard/manifests/deployment.yaml
@@ -149,4 +149,4 @@ spec:
     - {{ .Values.ingress.hostname }}
     secretName: kubernetes-dashboard-ingress-certs
   {{- end }}
-{{- end }}
+{{- end }}
diff --git a/builtin/files/plugins/kiam/manifests/agent-daemonset.yaml b/builtin/files/plugins/kiam/manifests/agent-daemonset.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   namespace: kube-system
@@ -8,6 +8,10 @@ spec:
     rollingUpdate:
       maxUnavailable: 100%
     type: RollingUpdate
+  selector:
+    matchLabels:
+      app: kiam
+      role: agent
   template:
     metadata:
       annotations:

diff --git a/builtin/files/plugins/kiam/manifests/server-daemonset.yaml b/builtin/files/plugins/kiam/manifests/server-daemonset.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   namespace: kube-system
@@ -8,6 +8,10 @@ spec:
     rollingUpdate:
       maxUnavailable: 100%
     type: RollingUpdate
+  selector:
+    matchLabels:
+      app: kiam
+      role: server
   template:
     metadata:
       annotations:

diff --git a/builtin/files/plugins/kube2iam/manifests/daemonset.yaml b/builtin/files/plugins/kube2iam/manifests/daemonset.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: kube2iam
@@ -12,6 +12,9 @@ spec:
     rollingUpdate:
       maxUnavailable: 100%
     type: RollingUpdate
+  selector:
+    matchLabels:
+      name: kube2iam
   template:
     metadata:
       labels: