openstack
/
magnum
Code Issues Proposed changes

Merge "Ensure http proxy environment is available during 'atomic install' for k8s" into stable/rocky

This commit is contained in:
Zuul 2019-03-25 08:38:03 +00:00 committed by Gerrit Code Review
parent dfa0d515fc 5d3e0eacda
commit 47e8cb79dc
4 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh
View File

@ -4,6 +4,18 @@
set -x
if [ ! -z "$HTTP_PROXY" ]; then
export HTTP_PROXY
fi
if [ ! -z "$HTTPS_PROXY" ]; then
export HTTPS_PROXY
fi
if [ ! -z "$NO_PROXY" ]; then
export NO_PROXY
fi
if [ -n "$ETCD_VOLUME_SIZE" ] && [ "$ETCD_VOLUME_SIZE" -gt 0 ]; then
attempts=60

12
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
View File

@ -4,6 +4,18 @@
echo "configuring kubernetes (master)"
if [ ! -z "$HTTP_PROXY" ]; then
export HTTP_PROXY
fi
if [ ! -z "$HTTPS_PROXY" ]; then
export HTTPS_PROXY
fi
if [ ! -z "$NO_PROXY" ]; then
export NO_PROXY
fi
_prefix=${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}
mkdir -p /opt/cni

17
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
View File

@ -4,6 +4,18 @@
echo "configuring kubernetes (minion)"
if [ ! -z "$HTTP_PROXY" ]; then
export HTTP_PROXY
fi
if [ ! -z "$HTTPS_PROXY" ]; then
export HTTPS_PROXY
fi
if [ ! -z "$NO_PROXY" ]; then
export NO_PROXY
fi
_prefix=${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}
_addtl_mounts=''
@ -204,6 +216,11 @@ if [ "$NETWORK_DRIVER" = "flannel" ]; then
FLANNEL_OPTIONS="$FLANNEL_OPTIONS"
EOF
# Ensure external proxy is not used for the following curl
unset HTTP_PROXY
unset HTTPS_PROXY
unset NO_PROXY
# Make sure etcd has a flannel configuration
. $FLANNELD_CONFIG
until curl -sf $ETCD_CURL_OPTIONS \

12
magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh
View File

@ -4,6 +4,18 @@
set -ux
if [ ! -z "$HTTP_PROXY" ]; then
export HTTP_PROXY
fi
if [ ! -z "$HTTPS_PROXY" ]; then
export HTTPS_PROXY
fi
if [ ! -z "$NO_PROXY" ]; then
export NO_PROXY
fi
_prefix=${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}
atomic install \
--storage ostree \