Prepare supporting k8s 1.11

nec-openstack · Jun 28, 2018 · 401deb9 · 401deb9
1 parent ad4e0d2
commit 401deb9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 48 deletions.
diff --git a/remora/fab/default.yaml b/remora/fab/default.yaml
@@ -18,7 +18,7 @@ haproxy:
   keepalived_use_unicast: "true"
 
 kubernetes:
-  version: v1.9.6
+  version: v1.11.0
   hyperkube_image_repo: gcr.io/google_containers/hyperkube
   cluster_cidr: 10.244.0.0/16
   node_cidr_mask_size: 24
@@ -32,7 +32,7 @@ kubernetes:
   volume_plugin_dir: "/var/lib/kubelet/volumeplugins"
   port: 6443
   internal_port: 6444
-  admission_control: "NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,ResourceQuota"
+  admission_control: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,ResourceQuota"
   storage_backend: etcd3
   certs_dir: "/etc/kubernetes/pki"
   log_level: 2
@@ -43,7 +43,7 @@ kubernetes:
 
 etcd:
   selfhosted: "false"
-  version: "v3.1.8"
+  version: "v3.2.18"
   image_repo: "quay.io/coreos/etcd"
   certs_dir: "/etc/etcd/pki"
   cluster_ip: 10.254.0.20

diff --git a/remora/scripts/apiserver/render-apiserver.sh b/remora/scripts/apiserver/render-apiserver.sh
@@ -84,7 +84,7 @@ spec:
         - /var/lock/api-server.lock
         - /hyperkube
         - apiserver
-        - --admission-control=${KUBE_ADMISSION_CONTROL}
+        - --enable-admission-plugins=${KUBE_ADMISSION_CONTROL}
         - --advertise-address=\$(POD_IP)
         - --allow-privileged=true
         - --authorization-mode=Node,RBAC

diff --git a/remora/scripts/bootstrap/render-apiserver.sh b/remora/scripts/bootstrap/render-apiserver.sh
@@ -25,7 +25,7 @@ spec:
     - /var/lock/api-server.lock
     - /hyperkube
     - apiserver
-    - --admission-control=${KUBE_ADMISSION_CONTROL}
+    - --enable-admission-plugins=${KUBE_ADMISSION_CONTROL}
     - --advertise-address=\$(POD_IP)
     - --allow-privileged
     - --authorization-mode=Node,RBAC

diff --git a/remora/scripts/network/render-flannel.sh b/remora/scripts/network/render-flannel.sh
@@ -96,25 +96,6 @@ data:
       }
     }
 ---
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: kube-flannel-cni-sh
-  namespace: kube-system
-  labels:
-    tier: node
-    k8s-app: flannel
-data:
-  install-cni-bin.sh: |
-    #!/bin/sh
-
-    set -e -x;
-
-    if [ -w "/host/opt/cni/bin/" ]; then
-        cp /opt/cni/bin/* /host/opt/cni/bin/;
-        echo "Wrote CNI binaries to /host/opt/cni/bin/";
-    fi;
----
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
@@ -143,16 +124,7 @@ spec:
         effect: NoSchedule
       serviceAccountName: flannel
       initContainers:
-      - name: install-cni-bin
-        image: ${FLANNEL_CNI_IMAGE_REPO}:${FLANNEL_CNI_VERSION}
-        command: ['sh', '/bin/install-cni-bin.sh']
-        volumeMounts:
-        - name: host-cni-bin
-          mountPath: /host/opt/cni/bin/
-        - name: kube-flannel-cni-sh
-          mountPath: /bin/install-cni-bin.sh
-          subPath: install-cni-bin.sh
-      - name: install-cni-conf
+      - name: install-cni
         image: ${FLANNEL_IMAGE_REPO}:${FLANNEL_VERSION}
         command:
         - cp
@@ -193,10 +165,6 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        - name: POD_IP
-          valueFrom:
-            fieldRef:
-              fieldPath: status.podIP
         volumeMounts:
         - name: run
           mountPath: /run
@@ -212,14 +180,4 @@ spec:
         - name: flannel-cfg
           configMap:
             name: kube-flannel-cfg
-        - name: kube-flannel-cni-sh
-          configMap:
-            name: kube-flannel-cni-sh
-        - name: host-cni-bin
-          hostPath:
-            path: /opt/cni/bin
-  updateStrategy:
-    rollingUpdate:
-      maxUnavailable: 1
-    type: RollingUpdate
 EOF