github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 10:43:56 +00:00
Code Issues Projects Releases Wiki Activity

remove hardcoded cloudfiles path and fix PORTAL_NET

Browse Source
This commit is contained in:
Ryan Richard 2014-10-17 18:05:11 -05:00
parent f2838483a1
commit 0bfb5ae772
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build/common.sh
View File

@ -667,14 +667,18 @@ function kube::release::gcs::copy_release_tarballs() {
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# Rackspace Release # Rackspace Release
function kube::release::rackspace::set_vars() {
CLOUDFILES_CONTAINER="kubernetes-releases-${OS_USERNAME}"
KUBE_RACKSPACE_RELEASE_BUCKET=${CLOUDFILES_CONTAINER}
KUBE_RACKSPACE_RELEASE_PREFIX=${KUBE_RACKSPACE_RELEASE_PREFIX-devel/}
}
function kube::release::rackspace::release() { function kube::release::rackspace::release() {
[[ ${KUBE_RACKSPACE_UPLOAD_RELEASE-y} =~ ^[yY]$ ]] || return 0 [[ ${KUBE_RACKSPACE_UPLOAD_RELEASE-y} =~ ^[yY]$ ]] || return 0
CLOUDFILES_CONTAINER="kubernetes-releases-${OS_USERNAME}" kube::release::rackspace::set_vars
KUBE_RACKSPACE_RELEASE_BUCKET=${KUBE_RACKSPACE_RELEASE_BUCKET-kubernetes-releases-${OS_USERNAME}}
KUBE_RACKSPACE_RELEASE_PREFIX=${KUBE_RACKSPACE_RELEASE_PREFIX-devel/}
kube::release::rackspace::verify_prereqs kube::release::rackspace::verify_prereqs
kube::release::rackspace::ensure_release_container kube::release::rackspace::ensure_release_container
kube::release::rackspace::copy_release_tarballs kube::release::rackspace::copy_release_tarballs
@ -713,9 +717,9 @@ function kube::release::rackspace::ensure_release_container() {
SWIFTLY_CMD="swiftly -A ${OS_AUTH_URL} -U ${OS_USERNAME} -K ${OS_PASSWORD}" SWIFTLY_CMD="swiftly -A ${OS_AUTH_URL} -U ${OS_USERNAME} -K ${OS_PASSWORD}"
if ! ${SWIFTLY_CMD} get ${CLOUDFILES_CONTAINER} > /dev/null 2>&1 ; then if ! ${SWIFTLY_CMD} get ${KUBE_RACKSPACE_RELEASE_BUCKET} > /dev/null 2>&1 ; then
echo "build/common.sh: Container doesn't exist. Creating container ${CLOUDFILES_CONTAINER}" echo "build/common.sh: Container doesn't exist. Creating container ${KUBE_RACKSPACE_RELEASE_BUCKET}"
${SWIFTLY_CMD} put ${CLOUDFILES_CONTAINER} > /dev/null 2>&1 ${SWIFTLY_CMD} put ${KUBE_RACKSPACE_RELEASE_BUCKET} > /dev/null 2>&1
fi fi
} }
@ -723,7 +727,8 @@ function kube::release::rackspace::ensure_release_container() {
function kube::release::rackspace::copy_release_tarballs() { function kube::release::rackspace::copy_release_tarballs() {
echo "build/common.sh: Uploading to Cloud Files" echo "build/common.sh: Uploading to Cloud Files"
${SWIFTLY_CMD} put -i ${RELEASE_DIR}/kubernetes-server-linux-amd64.tar.gz ${CLOUDFILES_CONTAINER}/devel/kubernetes-server-linux-amd64.tar.gz > /dev/null 2>&1 ${SWIFTLY_CMD} put -i ${RELEASE_DIR}/kubernetes-server-linux-amd64.tar.gz \
${KUBE_RACKSPACE_RELEASE_BUCKET}/${KUBE_RACKSPACE_RELEASE_PREFIX}/kubernetes-server-linux-amd64.tar.gz > /dev/null 2>&1
echo "Release pushed." echo "Release pushed."
} }

2
cluster/rackspace/cloud-config/master-cloud-config.yaml
View File

@ -77,7 +77,7 @@ coreos:
[Service] [Service]
EnvironmentFile=-/run/apiserver/minions.env EnvironmentFile=-/run/apiserver/minions.env
ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/apiserver /opt/bin/apiserver ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/apiserver /opt/bin/apiserver
ExecStart=/opt/bin/apiserver --address=127.0.0.1 --port=8080 --machines=${MINIONS} --etcd_servers=http://127.0.0.1:4001 --portal_net="PORTAL_NET" --logtostderr=true ExecStart=/opt/bin/apiserver --address=127.0.0.1 --port=8080 --machines=${MINIONS} --etcd_servers=http://127.0.0.1:4001 --portal_net=PORTAL_NET --logtostderr=true
Restart=always Restart=always
RestartSec=2 RestartSec=2
- name: master-apiserver-sighup.path - name: master-apiserver-sighup.path

5
cluster/rackspace/util.sh
View File

@ -20,6 +20,7 @@
# config-default.sh. # config-default.sh.
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
source $(dirname ${BASH_SOURCE})/${KUBE_CONFIG_FILE-"config-default.sh"} source $(dirname ${BASH_SOURCE})/${KUBE_CONFIG_FILE-"config-default.sh"}
source $KUBE_ROOT/build/common.sh
verify-prereqs() { verify-prereqs() {
# Make sure that prerequisites are installed. # Make sure that prerequisites are installed.
@ -86,7 +87,9 @@ find-release-tars() {
# Retrieves a tempurl from cloudfiles to make the release object publicly accessible for 6 hours. # Retrieves a tempurl from cloudfiles to make the release object publicly accessible for 6 hours.
find-object-url() { find-object-url() {
RELEASE=kubernetes-releases-${OS_USERNAME}/devel/kubernetes-server-linux-amd64.tar.gz kube::release::rackspace::set_vars
RELEASE=${KUBE_RACKSPACE_RELEASE_BUCKET}/${KUBE_RACKSPACE_RELEASE_PREFIX}/kubernetes-server-linux-amd64.tar.gz
RELEASE_TMP_URL=$(swiftly -A ${OS_AUTH_URL} -U ${OS_USERNAME} -K ${OS_PASSWORD} tempurl GET ${RELEASE}) RELEASE_TMP_URL=$(swiftly -A ${OS_AUTH_URL} -U ${OS_USERNAME} -K ${OS_PASSWORD} tempurl GET ${RELEASE})
echo "cluster/rackspace/util.sh: Object temp URL:" echo "cluster/rackspace/util.sh: Object temp URL:"