Move caching kustomize binary to generate-deployment.sh

Signed-off-by: Angel Misevski <[email protected]>

Author: amisevsk

.github/workflows/release.yml

@@ -25,13 +25,11 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: 3.6
-      - name: Setup Kustomize & yq
+      - name: Setup yq
         run: |
           python -m pip install --upgrade pip
           pip install yq
 
-          cd /usr/bin
-          curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/kustomize/v4.0.5/hack/install_kustomize.sh" | bash
           cd ${GITHUB_WORKSPACE}
       - name: Build image, generate deployments and push git tag
         run: |

Makefile

@@ -30,9 +30,6 @@ DEVWORKSPACE_CTRL_SA=devworkspace-controller-serviceaccount
 INTERNAL_TMP_DIR=/tmp/devworkspace-controller
 BUMPED_KUBECONFIG=$(INTERNAL_TMP_DIR)/kubeconfig
 RELATED_IMAGES_FILE=$(INTERNAL_TMP_DIR)/environment
-KUSTOMIZE_VER=4.0.5
-export KUSTOMIZE_DIR=./bin/kustomize
-export KUSTOMIZE=./bin/kustomize/kustomize
 
 ifeq (,$(shell which kubectl))
 ifeq (,$(shell which oc))
@@ -185,11 +182,11 @@ else
 endif
 
 ### generate_deployment: Generate files used for deployment from kustomize templates, using environment variables
-generate_deployment: _kustomize
+generate_deployment:
 	deploy/generate-deployment.sh
 
 ### generate_default_deployment: Generate files used for deployment from kustomize templates with default values
-generate_default_deployment: _kustomize
+generate_default_deployment:
 	deploy/generate-deployment.sh --use-defaults
 
 ### install_plugin_templates: Deploy sample plugin templates to namespace devworkspace-plugins:
@@ -312,18 +309,6 @@ endif
 install_cert_manager:
 	kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v1.0.4/cert-manager.yaml
 
-_kustomize:
-	mkdir -p $(KUSTOMIZE_DIR)
-	if [ ! -f $(KUSTOMIZE) ]; then \
-		curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" \
-			| bash -s $(KUSTOMIZE_VER) $(KUSTOMIZE_DIR) ;\
-	elif [ $$($(KUSTOMIZE) version | grep -o 'Version:[^ ]*') != "Version:kustomize/v$(KUSTOMIZE_VER)" ]; then \
-		echo "Wrong version of kustomize at $(KUSTOMIZE). Redownloading." ;\
-		rm $(KUSTOMIZE) ;\
-		curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" \
-			| bash -s $(KUSTOMIZE_VER) $(KUSTOMIZE_DIR) ;\
-	fi
-
 _operator_sdk:
 	@{ \
 		if ! command -v operator-sdk &> /dev/null; then \

deploy/generate-deployment.sh

@@ -94,6 +94,10 @@ OPENSHIFT_DIR="${OUTPUT_DIR}/openshift"
 COMBINED_FILENAME="combined.yaml"
 OBJECTS_DIR="objects"
 
+KUSTOMIZE_VER=4.0.5
+KUSTOMIZE_DIR="${SCRIPT_DIR}/../bin/kustomize"
+KUSTOMIZE=${KUSTOMIZE_DIR}/kustomize
+
 rm -rf $KUBERNETES_DIR $OPENSHIFT_DIR
 mkdir -p "$KUBERNETES_DIR" "$OPENSHIFT_DIR"
 
@@ -106,15 +110,6 @@ for var in "${required_vars[@]}"; do
   fi
 done
 
-if [ -z ${KUSTOMIZE} ]; then
-  echo "Required env var KUSTOMIZE not set. Set KUSTOMIZE to point to a kustomize v4.0.5 binary"
-fi
-if [ ! -f ${KUSTOMIZE} ]; then
-  echo "Kustomize not found in .kustomize. Run this script using the makefile (make generate_default_deployment)"
-  echo "or manually run the 'make _kustomize' rule to initialize kustomize binaries"
-  exit 1
-fi
-
 required_bin=(envsubst csplit yq)
 for bin in "${required_bin[@]}"; do
   if ! which "$bin" &>/dev/null; then
@@ -132,6 +127,17 @@ else
   ./update_devworkspace_crds.sh --init --api-version "$DEVWORKSPACE_API_VERSION"
 fi
 
+mkdir -p "$KUSTOMIZE_DIR"
+if [ ! -f "$KUSTOMIZE" ]; then
+  curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" \
+    | bash -s "$KUSTOMIZE_VER" "$KUSTOMIZE_DIR"
+elif [ $("$KUSTOMIZE" version | grep -o 'Version:[^ ]*') != "Version:kustomize/v${KUSTOMIZE_VER}" ]; then
+  echo "Wrong version of kustomize at ${KUSTOMIZE}. Redownloading."
+  rm "$KUSTOMIZE"
+  curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" \
+    | bash -s "$KUSTOMIZE_VER" "$KUSTOMIZE_DIR"
+fi
+
 # Create backups of templates with env vars
 mv "${SCRIPT_DIR}/templates/cert-manager/kustomization.yaml" "${SCRIPT_DIR}/templates/cert-manager/kustomization.yaml.bak"
 mv "${SCRIPT_DIR}/templates/service-ca/kustomization.yaml" "${SCRIPT_DIR}/templates/service-ca/kustomization.yaml.bak"