Tweak hack scripts for carvel package usage
This commit is contained in:
parent
4bbd6312c5
commit
86a25246dd
@ -50,8 +50,19 @@ cd "$pinniped_path" || exit 1
|
|||||||
# - app: unimportant, but always first
|
# - app: unimportant, but always first
|
||||||
# - tag: uuidgen in hack/prepare-for-integration-tests.sh
|
# - tag: uuidgen in hack/prepare-for-integration-tests.sh
|
||||||
# if this script is run standalone, then auto-fill with a unique value
|
# if this script is run standalone, then auto-fill with a unique value
|
||||||
|
# - env_file_name: the text file to write environment variables for integration tests, IDEs, etc.
|
||||||
app=${1:-"undefined"}
|
app=${1:-"undefined"}
|
||||||
tag=${2:-$(uuidgen)}
|
tag=${2:-$(uuidgen)}
|
||||||
|
# best if this is passed in by calling code to share the same file
|
||||||
|
env_file_name=${3:-"undefined"}
|
||||||
|
|
||||||
|
|
||||||
|
if [ "${env_file_name}" == "undefined" ]; then
|
||||||
|
env_file_name="$(mktemp /tmp/pinniped.integration.XXXXXXXX)"
|
||||||
|
log_note "env file name not passed, generating new environment file: ${env_file_name}"
|
||||||
|
else
|
||||||
|
log_note "appending to shared env file: ${env_file_name}"
|
||||||
|
fi
|
||||||
|
|
||||||
# TODO: automate the version by release somehow.
|
# TODO: automate the version by release somehow.
|
||||||
# the tag is the version in our build scripts, but we will want real versions for releases
|
# the tag is the version in our build scripts, but we will want real versions for releases
|
||||||
@ -276,6 +287,8 @@ kubectl create secret generic "$test_username" \
|
|||||||
--dry-run=client \
|
--dry-run=client \
|
||||||
--output yaml |
|
--output yaml |
|
||||||
kubectl apply -f -
|
kubectl apply -f -
|
||||||
|
|
||||||
|
webhook_ca_bundle="$(kubectl get secret local-user-authenticator-tls-serving-certificate --namespace local-user-authenticator -o 'jsonpath={.data.caCertificate}')"
|
||||||
# end local-user-authenticator
|
# end local-user-authenticator
|
||||||
|
|
||||||
|
|
||||||
@ -396,6 +409,13 @@ log_note "deploying ${KAPP_CONTROLLER_APP_NAME}..."
|
|||||||
kapp deploy --app "${KAPP_CONTROLLER_APP_NAME}" --file "${PACKAGE_INSTALL_FILE_NAME}" -y
|
kapp deploy --app "${KAPP_CONTROLLER_APP_NAME}" --file "${PACKAGE_INSTALL_FILE_NAME}" -y
|
||||||
# end supervisor
|
# end supervisor
|
||||||
|
|
||||||
|
log_note "writing to environment file: ${env_file_name}..."
|
||||||
|
echo "# carvel package script additions........."
|
||||||
|
echo "export PINNIPED_TEST_USER_USERNAME=${test_username}" >> "${env_file_name}"
|
||||||
|
echo "export PINNIPED_TEST_USER_GROUPS=${test_groups}" >> "${env_file_name}"
|
||||||
|
echo "export PINNIPED_TEST_USER_TOKEN=${test_username}:${test_password}" >> "${env_file_name}"
|
||||||
|
echo "export PINNIPED_TEST_WEBHOOK_CA_BUNDLE=${webhook_ca_bundle}" >> "${env_file_name}"
|
||||||
|
echo "# carvel package script additions end....."
|
||||||
|
|
||||||
log_note "verifying PackageInstall resources..."
|
log_note "verifying PackageInstall resources..."
|
||||||
kubectl get PackageInstall -A | grep pinniped
|
kubectl get PackageInstall -A | grep pinniped
|
||||||
|
@ -319,6 +319,7 @@ else
|
|||||||
kubectl apply -f -
|
kubectl apply -f -
|
||||||
|
|
||||||
webhook_ca_bundle="$(kubectl get secret local-user-authenticator-tls-serving-certificate --namespace local-user-authenticator -o 'jsonpath={.data.caCertificate}')"
|
webhook_ca_bundle="$(kubectl get secret local-user-authenticator-tls-serving-certificate --namespace local-user-authenticator -o 'jsonpath={.data.caCertificate}')"
|
||||||
|
echo "export PINNIPED_TEST_WEBHOOK_CA_BUNDLE=${webhook_ca_bundle}" >> "${env_file_name}"
|
||||||
popd >/dev/null
|
popd >/dev/null
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -429,7 +430,7 @@ fi
|
|||||||
# running it after the above also allows appending to the environment variable file
|
# running it after the above also allows appending to the environment variable file
|
||||||
if [ "$post_install" != "undefined" ] ; then
|
if [ "$post_install" != "undefined" ] ; then
|
||||||
log_note "The post-install script will be called with $tag..."
|
log_note "The post-install script will be called with $tag..."
|
||||||
$post_install post-install-script $tag
|
$post_install post-install-script $tag $env_file_name
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -456,7 +457,6 @@ export PINNIPED_TEST_CONCIERGE_NAMESPACE=${concierge_namespace}
|
|||||||
export PINNIPED_TEST_CONCIERGE_APP_NAME=${concierge_app_name}
|
export PINNIPED_TEST_CONCIERGE_APP_NAME=${concierge_app_name}
|
||||||
export PINNIPED_TEST_CONCIERGE_CUSTOM_LABELS='${concierge_custom_labels}'
|
export PINNIPED_TEST_CONCIERGE_CUSTOM_LABELS='${concierge_custom_labels}'
|
||||||
export PINNIPED_TEST_WEBHOOK_ENDPOINT=${webhook_url}
|
export PINNIPED_TEST_WEBHOOK_ENDPOINT=${webhook_url}
|
||||||
export PINNIPED_TEST_WEBHOOK_CA_BUNDLE=${webhook_ca_bundle}
|
|
||||||
export PINNIPED_TEST_SUPERVISOR_NAMESPACE=${supervisor_namespace}
|
export PINNIPED_TEST_SUPERVISOR_NAMESPACE=${supervisor_namespace}
|
||||||
export PINNIPED_TEST_SUPERVISOR_APP_NAME=${supervisor_app_name}
|
export PINNIPED_TEST_SUPERVISOR_APP_NAME=${supervisor_app_name}
|
||||||
export PINNIPED_TEST_SUPERVISOR_CUSTOM_LABELS='${supervisor_custom_labels}'
|
export PINNIPED_TEST_SUPERVISOR_CUSTOM_LABELS='${supervisor_custom_labels}'
|
||||||
|
Loading…
Reference in New Issue
Block a user