github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed proxy settings for minion, added comments.

pull/6/head
Elson O Rodriguez 2016-04-13 12:22:31 -07:00 committed by Lukasz Zajaczkowski
parent b4333adeac
commit 126b6c0950
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/openstack/config-default.sh
View File

@ -53,4 +53,5 @@ CLIENT_PUBLIC_KEY_PATH=${CLIENT_PUBLIC_KEY_PATH:-~/.ssh/id_rsa.pub}
# Max time period for stack provisioning. Time in minutes. # Max time period for stack provisioning. Time in minutes.
STACK_CREATE_TIMEOUT=${STACK_CREATE_TIMEOUT:-60} STACK_CREATE_TIMEOUT=${STACK_CREATE_TIMEOUT:-60}
# Enable Proxy, if true kube-up will apply your current proxy settings(defined by *_PROXY environment variables) to the deployment.
ENABLE_PROXY=${ENABLE_PROXY:-false} ENABLE_PROXY=${ENABLE_PROXY:-false}

4
cluster/openstack/kubernetes-heat/fragments/configure-proxy.sh
View File

@ -18,7 +18,7 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
#These values are meant to be swapped in by heat # The contents of these variables swapped in by heat via environments presented to kube-up.sh
export ETC_ENVIRONMENT='FTP_PROXY=$FTP_PROXY export ETC_ENVIRONMENT='FTP_PROXY=$FTP_PROXY
HTTP_PROXY=$HTTP_PROXY HTTP_PROXY=$HTTP_PROXY
@ -56,8 +56,10 @@ export DOCKER_PROXY='[Service]
Environment="no_proxy=$NO_PROXY" Environment="no_proxy=$NO_PROXY"
' '
# This again is set by heat
ENABLE_PROXY='$ENABLE_PROXY' ENABLE_PROXY='$ENABLE_PROXY'
# Heat itself doesn't have conditionals, so this is how we set up our proxy without breaking non-proxy setups.
if [[ "${ENABLE_PROXY}" == "true" ]]; then if [[ "${ENABLE_PROXY}" == "true" ]]; then
mkdir -p /etc/systemd/system/docker.service.d/ mkdir -p /etc/systemd/system/docker.service.d/

6
cluster/openstack/kubernetes-heat/kubecluster.yaml
View File

@ -354,6 +354,12 @@ resources:
cluster_name: {get_param: "OS::stack_name"} cluster_name: {get_param: "OS::stack_name"}
secgroup_base: {get_resource: secgroup_base} secgroup_base: {get_resource: secgroup_base}
secgroup_node: {get_resource: secgroup_node} secgroup_node: {get_resource: secgroup_node}
enable_proxy: {get_param: enable_proxy }
ftp_proxy: {get_param: ftp_proxy }
http_proxy: {get_param: http_proxy }
https_proxy: {get_param: https_proxy }
socks_proxy: {get_param: socks_proxy }
no_proxy: {get_param: no_proxy }
min_size: {get_param: number_of_minions} min_size: {get_param: number_of_minions}
desired_capacity: {get_param: number_of_minions} desired_capacity: {get_param: number_of_minions}
max_size: {get_param: max_number_of_minions} max_size: {get_param: max_number_of_minions}