From d4e2622ea898dbf5479dd989b53d1eb6031d88e7 Mon Sep 17 00:00:00 2001
From: Ryan Richard <richardry@vmware.com>
Date: Wed, 8 Nov 2023 13:38:22 -0800
Subject: [PATCH] Revert "Rearrange carvel build & deploy scripts"

This reverts commit 9a632134ae1d4bc1ce5a524bff770be881d088f2.
---
 .../{build_and_deploy.sh => build.sh}         | 32 -------------------
 .../carvel_packages/{install.sh => deploy.sh} | 29 +++++++++++++++++
 2 files changed, 29 insertions(+), 32 deletions(-)
 rename hack/lib/carvel_packages/{build_and_deploy.sh => build.sh} (84%)
 rename hack/lib/carvel_packages/{install.sh => deploy.sh} (83%)

diff --git a/hack/lib/carvel_packages/build_and_deploy.sh b/hack/lib/carvel_packages/build.sh
similarity index 84%
rename from hack/lib/carvel_packages/build_and_deploy.sh
rename to hack/lib/carvel_packages/build.sh
index 2ef07dd20..f2a88fde3 100755
--- a/hack/lib/carvel_packages/build_and_deploy.sh
+++ b/hack/lib/carvel_packages/build.sh
@@ -132,36 +132,4 @@ imgpkg push --bundle "${package_repository_repo_tag}" --file "${dest_dir}/packag
 # manually validate the package bundle by pulling it from the registry and examining its contents:
 # imgpkg pull --bundle "${package_repository_repo_tag}" --output "/tmp/${package_repository_repo_tag}"
 
-
-log_note "Deploying PackageRepository & Packages to kind cluster..."
-
-# Deploy kapp-controller onto kind cluster.
-log_note "Installing kapp-controller on cluster..."
-KAPP_CONTROLLER_GLOBAL_NAMESPACE="kapp-controller-packaging-global"
-kapp deploy --app kapp-controller --file "https://github.com/vmware-tanzu/carvel-kapp-controller/releases/latest/download/release.yml" -y
-
-# Ensure this directory exists though this script will run several times.
-mkdir -p "${dest_dir}/install"
-
-log_note "Deploying Pinniped PackageRepository..."
-pinniped_package_repository_name="pinniped-package-repository"
-pinniped_package_repository_file="${dest_dir}/install/packagerepository.${pinniped_package_version}.yml"
-cat <<EOT > "${pinniped_package_repository_file}"
----
-apiVersion: packaging.carvel.dev/v1alpha1
-kind: PackageRepository
-metadata:
-  name: "${pinniped_package_repository_name}"
-  namespace: "${KAPP_CONTROLLER_GLOBAL_NAMESPACE}"
-spec:
-  fetch:
-    imgpkgBundle:
-      image: "${package_repository_repo_tag}"
-EOT
-
-kapp deploy --app "${pinniped_package_repository_name}" --file "${pinniped_package_repository_file}" -y
-kapp inspect --app "${pinniped_package_repository_name}" --tree
-
-resource_name="${app}"
-
 log_note "Building Carvel Packages for Supervisor, Concierge & local-user-authenticator complete."
diff --git a/hack/lib/carvel_packages/install.sh b/hack/lib/carvel_packages/deploy.sh
similarity index 83%
rename from hack/lib/carvel_packages/install.sh
rename to hack/lib/carvel_packages/deploy.sh
index 00e000dbf..ea76255f7 100755
--- a/hack/lib/carvel_packages/install.sh
+++ b/hack/lib/carvel_packages/deploy.sh
@@ -47,8 +47,37 @@ registry_repo="$registry/$repo"
 # Pinniped Package repository
 package_repository_repo="pinniped-package-repository"
 package_repository_repo_tag="${registry_repo}/${package_repository_repo}:${tag}"
+
 # Use the same directory as build.sh.
 dest_dir="deploy_carvel_tmp"
+
+# Deploy kapp-controller onto kind cluster.
+log_note "Installing kapp-controller on cluster..."
+KAPP_CONTROLLER_GLOBAL_NAMESPACE="kapp-controller-packaging-global"
+kapp deploy --app kapp-controller --file "https://github.com/vmware-tanzu/carvel-kapp-controller/releases/latest/download/release.yml" -y
+
+# Ensure this directory exists though this script will run several times.
+mkdir -p "${dest_dir}/install"
+
+log_note "Deploying Pinniped PackageRepository..."
+pinniped_package_repository_name="pinniped-package-repository"
+pinniped_package_repository_file="${dest_dir}/install/packagerepository.${pinniped_package_version}.yml"
+cat <<EOT > "${pinniped_package_repository_file}"
+---
+apiVersion: packaging.carvel.dev/v1alpha1
+kind: PackageRepository
+metadata:
+  name: "${pinniped_package_repository_name}"
+  namespace: "${KAPP_CONTROLLER_GLOBAL_NAMESPACE}"
+spec:
+  fetch:
+    imgpkgBundle:
+      image: "${package_repository_repo_tag}"
+EOT
+
+kapp deploy --app "${pinniped_package_repository_name}" --file "${pinniped_package_repository_file}" -y
+kapp inspect --app "${pinniped_package_repository_name}" --tree
+
 resource_name="${app}"
 
 log_note "Creating RBAC for ${resource_name} PackageInstall..."