Merge pull request #134 from msau42/kustomize

Use Kustomize to manage deployment specs

Author: k8s-ci-robot

deploy/common.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Common variables
+readonly KUSTOMIZE_PATH="${PKGDIR}/bin/kustomize"
+
 # Common functions
 
 function ensure_var(){
@@ -15,4 +18,11 @@ function ensure_var(){
 function get_needed_roles()
 {
 	echo "roles/compute.storageAdmin roles/iam.serviceAccountUser projects/${PROJECT}/roles/gcp_compute_persistent_disk_csi_driver_custom_role"
-}
+}
+
+# Installs kustomize in ${PKGDIR}/bin
+function ensure_kustomize()
+{
+  ensure_var PKGDIR
+  ${PKGDIR}/deploy/kubernetes/install-kustomize.sh
+}

deploy/kubernetes/stable/controller.yaml renamed to deploy/kubernetes/base/controller.yaml

@@ -1,22 +1,21 @@
 kind: StatefulSet
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 metadata:
   name: csi-gce-pd-controller
 spec:
   serviceName: "csi-gce-pd"
   replicas: 1
   selector:
     matchLabels:
-      app: csi-gce-pd-driver
+      app: gcp-compute-persistent-disk-csi-driver
   template:
     metadata:
       labels:
-        app: csi-gce-pd-driver
+        app: gcp-compute-persistent-disk-csi-driver
     spec:
       serviceAccount: csi-controller-sa
       containers:
         - name: csi-provisioner
-          imagePullPolicy: Always
           image: quay.io/k8scsi/csi-provisioner:v0.4.1
           args:
             - "--v=5"
@@ -29,7 +28,6 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-attacher
-          imagePullPolicy: Always
           image: quay.io/k8scsi/csi-attacher:v0.4.1
           args:
             - "--v=5"
@@ -41,7 +39,6 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: gce-pd-driver
-          imagePullPolicy: Always
           image: gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.2.0.beta
           args:
             - "--v=5"
@@ -62,4 +59,4 @@ spec:
           emptyDir: {}
         - name: cloud-sa-volume
           secret:
-            secretName: cloud-sa
+            secretName: cloud-sa

deploy/kubernetes/base/kustomization.yaml

@@ -0,0 +1,8 @@
+commonLabels:
+  app: gcp-compute-persistent-disk-csi-driver
+namespace:
+  default
+resources:
+- node.yaml
+- controller.yaml
+- setup-cluster.yaml

deploy/kubernetes/stable/node.yaml renamed to deploy/kubernetes/base/node.yaml

@@ -6,16 +6,15 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: csi-gce-pd-driver
+      app: gcp-compute-persistent-disk-csi-driver
   template:
     metadata:
       labels:
-        app: csi-gce-pd-driver
+        app: gcp-compute-persistent-disk-csi-driver
     spec:
       serviceAccount: csi-node-sa
       containers:
         - name: csi-driver-registrar
-          imagePullPolicy: Always
           image: quay.io/k8scsi/driver-registrar:v0.4.1
           args:
             - "--v=5"
@@ -36,7 +35,6 @@ spec:
         - name: gce-pd-driver
           securityContext:
             privileged: true
-          imagePullPolicy: Always
           image: gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.2.0.beta
           args:
             - "--v=5"

deploy/kubernetes/stable/setup-cluster.yaml renamed to deploy/kubernetes/base/setup-cluster.yaml

@@ -4,19 +4,17 @@
 # currently available Kubernetes cluster
 #
 # Args:
-# GCE_PD_DRIVER_VERSION: The version of the GCE PD CSI Driver to deploy. Can be one of {v0.1.0, latest}
+# GCE_PD_DRIVER_VERSION: The kustomize overlay to deploy (located under
+#   deploy/kubernetes/overlays). Can be one of {stable, dev}
 
 set -o nounset
 set -o errexit
 
+readonly DEPLOY_VERSION="${GCE_PD_DRIVER_VERSION:-stable}"
 readonly PKGDIR="${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver"
 source "${PKGDIR}/deploy/common.sh"
 
-ensure_var GCE_PD_DRIVER_VERSION
+ensure_kustomize
 
-readonly KUBEDEPLOY="${PKGDIR}/deploy/kubernetes/${GCE_PD_DRIVER_VERSION}"
-
-kubectl delete -f "${KUBEDEPLOY}/node.yaml" --ignore-not-found
-kubectl delete -f "${KUBEDEPLOY}/controller.yaml" --ignore-not-found
-kubectl delete -f "${KUBEDEPLOY}/setup-cluster.yaml" --ignore-not-found
-kubectl delete secret cloud-sa --ignore-not-found
+${KUSTOMIZE_PATH} build ${PKGDIR}/deploy/kubernetes/overlays/${DEPLOY_VERSION} | kubectl delete --ignore-not-found -f -
+kubectl delete secret cloud-sa --ignore-not-found

deploy/kubernetes/delete-driver.sh

@@ -9,18 +9,41 @@
 
 # Args:
 # GCE_PD_SA_DIR: Directory the service account key has been saved in (generated by setup-project.sh)
-# GCE_PD_DRIVER_VERSION: The version of the GCE PD CSI Driver to deploy. Can be one of {stable, dev}
+# GCE_PD_DRIVER_VERSION: The kustomize overlay (located in
+#   deploy/kubernetes/overlays) to deploy. Can be one of {stable, dev}
 
 set -o nounset
 set -o errexit
+set -x
 
+readonly NAMESPACE="${GCE_PD_DRIVER_NAMESPACE:-default}"
+readonly DEPLOY_VERSION="${GCE_PD_DRIVER_VERSION:-stable}"
 readonly PKGDIR="${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver"
 source "${PKGDIR}/deploy/common.sh"
 
-ensure_var GCE_PD_SA_DIR
-ensure_var GCE_PD_DRIVER_VERSION
+print_usage()
+{
+    echo "deploy-driver.sh [--skip-sa-check]\n"
+    echo "\t--skip-sa-check: don't check the service account for required roles"
+    echo
+}
 
-readonly KUBEDEPLOY="${PKGDIR}/deploy/kubernetes/${GCE_PD_DRIVER_VERSION}"
+skip_sa_check=
+while [ ! -z "${1-}" ]; do
+  case $1 in
+    --skip-sa-check ) shift
+                      skip_sa_check=true
+                      ;;
+    -h | --help )     print_usage
+                      exit 1
+                      ;;
+    * )               print_usage
+                      exit 1
+                      ;;
+  esac
+done
+
+ensure_var GCE_PD_SA_DIR
 
 function check_service_account()
 {
@@ -47,11 +70,15 @@ function check_service_account()
 	fi
 }
 
-check_service_account
+ensure_kustomize
+
+if [ "$skip_sa_check" != true ]; then
+  check_service_account
+fi
 
-if ! kubectl get secret cloud-sa;
+if ! kubectl get secret cloud-sa -n ${NAMESPACE};
 then
-  kubectl create secret generic cloud-sa --from-file="${GCE_PD_SA_DIR}/cloud-sa.json"
+  kubectl create secret generic cloud-sa --from-file="${GCE_PD_SA_DIR}/cloud-sa.json" -n ${NAMESPACE}
 fi
 
 # GKE Required Setup
@@ -60,6 +87,6 @@ then
   kubectl create clusterrolebinding cluster-admin-binding --clusterrole cluster-admin --user $(gcloud config get-value account)
 fi
 
-kubectl apply -f "${KUBEDEPLOY}/setup-cluster.yaml"
-kubectl apply -f "${KUBEDEPLOY}/node.yaml"
-kubectl apply -f "${KUBEDEPLOY}/controller.yaml"
+readonly tmp_spec=/tmp/gcp-compute-persistent-disk-csi-driver-specs-generated.yaml
+${KUSTOMIZE_PATH} build ${PKGDIR}/deploy/kubernetes/overlays/${DEPLOY_VERSION} | tee $tmp_spec
+kubectl apply -f $tmp_spec