djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove dead code

Browse Source
This commit is contained in:
Benjamin A. Petersen 2023-10-11 17:09:46 -04:00
parent dc4948f570
commit 8e430c8e77
No known key found for this signature in database
GPG Key ID: EF6EF83523A4BE46
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hack/build-carvel-packages.sh
View File

@ -285,7 +285,7 @@ resource_name="concierge"
NAMESPACE="${resource_name}-install-ns" NAMESPACE="${resource_name}-install-ns"
PINNIPED_PACKAGE_RBAC_PREFIX="pinniped-package-rbac-${resource_name}" PINNIPED_PACKAGE_RBAC_PREFIX="pinniped-package-rbac-${resource_name}"
RESOURCE_PACKAGE_VERSION="${resource_name}.pinniped.dev" RESOURCE_PACKAGE_VERSION="${resource_name}.pinniped.dev"
PACKAGE_INSTALL_FILE_NAME="deploy_carvel/${resource_name}-pkginstall.yml" PACKAGE_INSTALL_FILE_NAME="deploy_carvel/deploy/${resource_name}-pkginstall.yml"
SECRET_NAME="${resource_name}-package-install-secret" SECRET_NAME="${resource_name}-package-install-secret"
# from prepare-for-integration-tests.sh # from prepare-for-integration-tests.sh
@ -342,7 +342,7 @@ resource_name="supervisor"
NAMESPACE="${resource_name}-install-ns" NAMESPACE="${resource_name}-install-ns"
PINNIPED_PACKAGE_RBAC_PREFIX="pinniped-package-rbac-${resource_name}" PINNIPED_PACKAGE_RBAC_PREFIX="pinniped-package-rbac-${resource_name}"
RESOURCE_PACKAGE_VERSION="${resource_name}.pinniped.dev" RESOURCE_PACKAGE_VERSION="${resource_name}.pinniped.dev"
PACKAGE_INSTALL_FILE_NAME="deploy_carvel/${resource_name}-pkginstall.yml" PACKAGE_INSTALL_FILE_NAME="deploy_carvel/deploy/${resource_name}-pkginstall.yml"
SECRET_NAME="${resource_name}-package-install-secret" SECRET_NAME="${resource_name}-package-install-secret"
# from prepare-for-integration-test.sh # from prepare-for-integration-test.sh
@ -397,22 +397,6 @@ kapp deploy --app "${KAPP_CONTROLLER_APP_NAME}" --file "${PACKAGE_INSTALL_FILE_N
# end supervisor # end supervisor
log_note "appending environment variables to /tmp/integration-test-env"
echo "PINNIPED_TEST_USER_USERNAME=${test_username}"
echo "PINNIPED_TEST_USER_GROUPS=${test_groups}"
echo "PINNIPED_TEST_USER_TOKEN=${test_username}:${test_password}"
# To be "finished" the scripts need to work for both the ytt deploy and the carvel package,
# regardless of which branch the user takes.
integration_env_file="/tmp/integration-test-env"
integration_env_file_text=$(cat "${integration_env_file}")
cat <<EOT >"${integration_env_file}"
export PINNIPED_TEST_USER_USERNAME=${test_username}
export PINNIPED_TEST_USER_GROUPS=${test_groups}
export PINNIPED_TEST_USER_TOKEN=${test_username}:${test_password}
EOT
echo "${integration_env_file_text}" >> "${integration_env_file}"
log_note "verifying PackageInstall resources..." log_note "verifying PackageInstall resources..."
kubectl get PackageInstall -A | grep pinniped kubectl get PackageInstall -A | grep pinniped
kubectl get secret -A | grep pinniped kubectl get secret -A | grep pinniped