mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-14 21:53:52 +00:00
remove hardcoded cloudfiles path and fix PORTAL_NET
This commit is contained in:
@@ -77,7 +77,7 @@ coreos:
|
||||
[Service]
|
||||
EnvironmentFile=-/run/apiserver/minions.env
|
||||
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
|
||||
RestartSec=2
|
||||
- name: master-apiserver-sighup.path
|
||||
|
@@ -20,6 +20,7 @@
|
||||
# config-default.sh.
|
||||
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
|
||||
source $(dirname ${BASH_SOURCE})/${KUBE_CONFIG_FILE-"config-default.sh"}
|
||||
source $KUBE_ROOT/build/common.sh
|
||||
|
||||
verify-prereqs() {
|
||||
# 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.
|
||||
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})
|
||||
echo "cluster/rackspace/util.sh: Object temp URL:"
|
||||
|
Reference in New Issue
Block a user