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

configure-vm.sh removed in k/k. Remove from staging/deployment steps. #508

Merged
merged 1 commit into from
Jan 19, 2018
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
7 changes: 6 additions & 1 deletion lib/releaselib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,7 @@ release::gcs::locally_stage_release_artifacts() {
local release_stage=$build_output/release-stage
local release_tars=$build_output/release-tars
local gcs_stage=$build_output/gcs-stage/$version
local configure_vm
local src
local dst

Expand All @@ -620,7 +621,11 @@ release::gcs::locally_stage_release_artifacts() {

# Having the configure-vm.sh script and and trusty code from the GCE cluster
# deploy hosted with the release is useful for GKE.
release::gcs::stage_and_hash $gcs_stage $gce_path/configure-vm.sh extra/gce \
# Take it if available (Removed in 1.10+)
[[ -f $gce_path/configure-vm.sh ]] \
&& configure_vm="$gce_path/configure-vm.sh"

release::gcs::stage_and_hash $gcs_stage $configure_vm extra/gce \
|| return 1
release::gcs::stage_and_hash $gcs_stage $gci_path/node.yaml extra/gce \
|| return 1
Expand Down