Modify deployment scripts to use kustomize

Author: msau42

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/base/kustomization.yaml

@@ -1,5 +1,7 @@
 commonLabels:
   app: gcp-compute-persistent-disk-csi-driver
+namespace:
+  default
 resources:
 - node.yaml
 - controller.yaml

deploy/kubernetes/delete-driver.sh

@@ -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/deploy-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

deploy/kubernetes/install-kustomize.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# This script will install kustomize, which is a tool that simplifies patching
+# Kubernetes manifests for different environments.
+# https://github.com/kubernetes-sigs/kustomize
+
+set -o nounset
+set -o errexit
+
+readonly INSTALL_DIR="${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin"
+readonly KUSTOMIZE_PATH="${INSTALL_DIR}/kustomize"
+
+if [ ! -f "${KUSTOMIZE_PATH}" ]; then
+  if [ ! -f "${INSTALL_DIR}" ]; then
+    mkdir -p ${INSTALL_DIR}
+  fi
+
+  echo "Installing kustomize in ${KUSTOMIZE_PATH}"
+  opsys=linux  # or darwin, or windows
+  curl -s https://api.github.com/repos/kubernetes-sigs/kustomize/releases/tags/v1.0.8 |\
+    grep browser_download |\
+    grep $opsys |\
+    cut -d '"' -f 4 |\
+    xargs curl -O -L
+  mv kustomize_*_${opsys}_amd64 ${KUSTOMIZE_PATH}
+  chmod u+x ${KUSTOMIZE_PATH}
+fi