Skip to content

Commit

Permalink
Merge pull request #508 from david-mcmahon/configure-vm
Browse files Browse the repository at this point in the history
configure-vm.sh removed in k/k.  Remove from staging/deployment steps.
  • Loading branch information
david-mcmahon committed Jan 19, 2018
2 parents 5f8d34e + 4a1ac67 commit 3630a4d
Showing 1 changed file with 6 additions and 1 deletion.
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

0 comments on commit 3630a4d

Please sign in to comment.