github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
k8s-merge-robot 2016-07-08 13:32:14 -07:00 committed by GitHub
commit f83f21f399
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cluster/openstack-heat/util.sh
View File

@ -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
} }