mirrors/pinniped
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/pinniped.git synced 2026-01-03 19:54:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Rearrange carvel build & deploy scripts"

Browse Source 
This reverts commit 9a632134ae.
This commit is contained in:
Ryan Richard
2023-11-08 13:38:22 -08:00
parent 88a97033fb
commit d4e2622ea8
2 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
hack/lib/carvel_packages/build_and_deploy.sh → hack/lib/carvel_packages/build.sh
View File

@@ -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: # 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}" # 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." log_note "Building Carvel Packages for Supervisor, Concierge & local-user-authenticator complete."

29
hack/lib/carvel_packages/install.sh → hack/lib/carvel_packages/deploy.sh
View File

@@ -47,8 +47,37 @@ registry_repo="$registry/$repo"
# Pinniped Package repository # Pinniped Package repository
package_repository_repo="pinniped-package-repository" package_repository_repo="pinniped-package-repository"
package_repository_repo_tag="${registry_repo}/${package_repository_repo}:${tag}" package_repository_repo_tag="${registry_repo}/${package_repository_repo}:${tag}"
# Use the same directory as build.sh. # Use the same directory as build.sh.
dest_dir="deploy_carvel_tmp" 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}" resource_name="${app}"
log_note "Creating RBAC for ${resource_name} PackageInstall..." log_note "Creating RBAC for ${resource_name} PackageInstall..."