Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow user to specify AZURE_CLOUD_PROVIDER_ROOT when running ci-entrypoint locally #3307

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions scripts/ci-build-azure-ccm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,18 @@ export CNM_IMAGE_NAME=azure-cloud-node-manager
export WINDOWS_IMAGE_VERSION=1809
declare -a IMAGES=("${CCM_IMAGE_NAME}" "${CNM_IMAGE_NAME}")


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: extra whiteline

setup() {
AZURE_CLOUD_PROVIDER_ROOT="$(go env GOPATH)/src/sigs.k8s.io/cloud-provider-azure"
export AZURE_CLOUD_PROVIDER_ROOT
AZURE_CLOUD_PROVIDER_ROOT="${AZURE_CLOUD_PROVIDER_ROOT:-""}"
if [[ -z "${AZURE_CLOUD_PROVIDER_ROOT}" ]]; then
AZURE_CLOUD_PROVIDER_ROOT="$(go env GOPATH)/src/sigs.k8s.io/cloud-provider-azure"
export AZURE_CLOUD_PROVIDER_ROOT
fi

# the azure-cloud-provider repo expects IMAGE_REGISTRY.
export IMAGE_REGISTRY=${REGISTRY}
pushd "${AZURE_CLOUD_PROVIDER_ROOT}" && IMAGE_TAG=$(git rev-parse --short=7 HEAD) && export IMAGE_TAG && popd
echo "Image registry is ${REGISTRY}"
echo "Image Tag is ${IMAGE_TAG}"

if [[ -n "${WINDOWS_SERVER_VERSION:-}" ]]; then
Expand Down