wip ci refactor

shipwright-io · Aug 21, 2023 · 2357728 · 2357728
1 parent d4123e5
commit 2357728
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -178,8 +178,10 @@ jobs:
           version: v0.13.0
       - name: Install Shipwright Build
         run: |
+          make prepare-conversion
           make install-controller-kind
           kubectl -n shipwright-build rollout status deployment shipwright-build-controller --timeout=1m || true
+          kubectl -n shipwright-build rollout status deployment shipwright-build-webhook --timeout=1m || true
       - name: Test
         run: |
           kubectl create namespace shp-e2e

diff --git a/Makefile b/Makefile
@@ -115,7 +115,7 @@ generate:
 	"$(CONTROLLER_GEN)" crd rbac:roleName=manager-role webhook paths="./..." output:crd:dir=deploy/crds
 
 .PHONY: prepare-conversion
-prepare-conversion: generate
+prepare-conversion:
 	hack/generate-cert.sh
 	hack/patch-crds-with-conversion.sh
 

diff --git a/hack/generate-cert.sh b/hack/generate-cert.sh
@@ -89,4 +89,4 @@ echo "[INFO] Retrieving CABundle"
 CA=$(kubectl get configmap -n kube-system extension-apiserver-authentication -o=jsonpath='{.data.client-ca-file}' | base64 | tr -d '\n')
 
 echo "[INFO] Applying CABundle into customization/conversion_webhook_block.yaml"
-sed -i '' "s/CA_BUNDLE/${CA}/" $DIR/hack/customization/conversion_webhook_block.yaml
+sed -i "s/CA_BUNDLE/${CA}/g" $DIR/hack/customization/conversion_webhook_block.yaml