Skip to content

K
k3s
Commit f83f21f3 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28623 from elsonrodriguez/openstack-release-tar-fix

Automatic merge from submit-queue Fixes #28205, Check release tar location for Openstack-Heat provider This does a basic check to see where the release tars are located. Allows people to use openstack-heat outside of compiling k8s.
parents 96f2e940 fbd0ba07
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 4 deletions
cluster/openstack-heat/util.sh
View file @ f83f21f3
...@@ -108,12 +108,20 @@ function create-stack() { ...@@ -108,12 +108,20 @@ function create-stack() {
function upload-resources() { function upload-resources() {
swift post kubernetes --read-acl '.r:*,.rlistings' swift post kubernetes --read-acl '.r:*,.rlistings'
echo "[INFO] Upload ${KUBERNETES_RELEASE_TAR}" locations=(
swift upload kubernetes ${ROOT}/../../_output/release-tars/${KUBERNETES_RELEASE_TAR} \ "${ROOT}/../../_output/release-tars/${KUBERNETES_RELEASE_TAR}"
"${ROOT}/../../server/${KUBERNETES_RELEASE_TAR}"
)
RELEASE_TAR_LOCATION=$( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 )
RELEASE_TAR_PATH=$(dirname ${RELEASE_TAR_LOCATION})
echo "[INFO] Uploading ${KUBERNETES_RELEASE_TAR}"
swift upload kubernetes ${RELEASE_TAR_PATH}/${KUBERNETES_RELEASE_TAR} \
--object-name kubernetes-server.tar.gz --object-name kubernetes-server.tar.gz
echo "[INFO] Upload kubernetes-salt.tar.gz" echo "[INFO] Uploading kubernetes-salt.tar.gz"
swift upload kubernetes ${ROOT}/../../_output/release-tars/kubernetes-salt.tar.gz \ swift upload kubernetes ${RELEASE_TAR_PATH}/kubernetes-salt.tar.gz \
--object-name kubernetes-salt.tar.gz --object-name kubernetes-salt.tar.gz
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment