use kustomize edit set image

Signed-off-by: Harshvir Potpose <[email protected]>

Author: akagami-harsh

testing/shared/deploy_component.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -euo pipefail
+set -euxo pipefail
 
 # Script to build and deploy a Kubeflow dashboard component
 # Usage: ./deploy_component.sh COMPONENT_NAME COMPONENT_PATH IMAGE_NAME TAG [MANIFESTS_PATH] [OVERLAY]
@@ -33,32 +33,18 @@ else
     exit 1
 fi
 
-export CURRENT_IMAGE="${IMAGE_NAME}"
-export PR_IMAGE="${IMAGE_NAME}:${TAG}"
-export CURRENT_IMAGE_ESCAPED=$(echo "$CURRENT_IMAGE" | sed 's|\.|\\.|g')
-export PR_IMAGE_ESCAPED=$(echo "$PR_IMAGE" | sed 's|\.|\\.|g')
-
 for overlay_path in "${OVERLAY}" "overlays/kserve" "overlays/cert-manager"; do
     if [ -d "$overlay_path" ]; then
         if [ "$overlay_path" = "overlays/cert-manager" ]; then
-            kustomize build "$overlay_path" \
-              | sed "s|${CURRENT_IMAGE_ESCAPED}:[a-zA-Z0-9_.-]*|${PR_IMAGE_ESCAPED}|g" \
-              | sed 's/$(podDefaultsServiceName)/poddefaults-webhook-service/g' \
-              | sed 's/$(podDefaultsNamespace)/kubeflow/g' \
-              | sed "s|\$(CD_NAMESPACE)|${CD_NAMESPACE:-kubeflow}|g" \
-              | sed "s|\$(CD_CLUSTER_DOMAIN)|${CD_CLUSTER_DOMAIN:-cluster.local}|g" \
-              | sed "s|CD_NAMESPACE_PLACEHOLDER|${CD_NAMESPACE_PLACEHOLDER:-kubeflow}|g" \
-              | sed "s|CD_CLUSTER_DOMAIN_PLACEHOLDER|${CD_CLUSTER_DOMAIN_PLACEHOLDER:-cluster.local}|g" \
-              | kubectl apply -f -
+            cd $overlay_path
+            kustomize edit set image "${IMAGE_NAME}":"${TAG}"
+            kustomize build . | kubectl apply -f -
         else
-            kustomize build "$overlay_path" \
-              | sed "s|${CURRENT_IMAGE_ESCAPED}:[a-zA-Z0-9_.-]*|${PR_IMAGE_ESCAPED}|g" \
-              | sed "s|\$(CD_NAMESPACE)|${CD_NAMESPACE:-kubeflow}|g" \
-              | sed "s|\$(CD_CLUSTER_DOMAIN)|${CD_CLUSTER_DOMAIN:-cluster.local}|g" \
-              | sed "s|CD_NAMESPACE_PLACEHOLDER|${CD_NAMESPACE_PLACEHOLDER:-kubeflow}|g" \
-              | sed "s|CD_CLUSTER_DOMAIN_PLACEHOLDER|${CD_CLUSTER_DOMAIN_PLACEHOLDER:-cluster.local}|g" \
-              | kubectl apply -f -
+            cd $overlay_path
+            kustomize edit set image "${IMAGE_NAME}":"${TAG}"
+            kustomize build . | kubectl apply -f -
         fi
+        git restore kustomization.yaml # restore changes made by kustomize edit
         exit 0
     fi
 done

testing/shared/install_profile_controller.sh

@@ -11,20 +11,13 @@ make -C components/access-management docker-build-multi-arch IMG="${KFAM_IMG}" T
 kind load docker-image "${PROFILE_IMG}:${TAG}"
 kind load docker-image "${KFAM_IMG}:${TAG}"
 
-NEW_PROFILE_IMAGE="${PROFILE_IMG}:${TAG}"
-NEW_KFAM_IMAGE="${KFAM_IMG}:${TAG}"
-
-# Escape "." in the image names, as it is a special character in sed
-CURRENT_PROFILE_IMAGE_ESCAPED=$(echo "$PROFILE_IMG" | sed 's|\.|\\.|g')
-NEW_PROFILE_IMAGE_ESCAPED=$(echo "$NEW_PROFILE_IMAGE" | sed 's|\.|\\.|g')
-CURRENT_KFAM_IMAGE_ESCAPED=$(echo "$KFAM_IMG" | sed 's|\.|\\.|g')
-NEW_KFAM_IMAGE_ESCAPED=$(echo "$NEW_KFAM_IMAGE" | sed 's|\.|\\.|g')
-
 echo "Deploying Profile Controller and KFAM to kubeflow namespace"
-kustomize build components/profile-controller/config/overlays/kubeflow \
-    | sed "s|${CURRENT_PROFILE_IMAGE_ESCAPED}:[a-zA-Z0-9_.-]*|${NEW_PROFILE_IMAGE_ESCAPED}|g" \
-    | sed "s|${CURRENT_KFAM_IMAGE_ESCAPED}:[a-zA-Z0-9_.-]*|${NEW_KFAM_IMAGE_ESCAPED}|g" \
-    | kubectl apply -f -
+cd components/profile-controller/config/overlays/kubeflow
+kustomize edit set image \
+    "${PROFILE_IMG}":"${TAG}" \
+    "${KFAM_IMG}":"${TAG}"
+kustomize build . | kubectl apply -f -
+git restore kustomization.yaml # restore changes made by kustomize edit
 
 kubectl wait --for=condition=Available deployment -n kubeflow profiles-deployment --timeout=300s
 kubectl wait pods -n kubeflow -l kustomize.component=profiles --for=condition=Ready --timeout=300s