mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-09 21:21:14 +00:00
Remove nginx from vagrant
This commit is contained in:
@@ -226,12 +226,12 @@ EOF
|
||||
done
|
||||
fi
|
||||
|
||||
# Configure nginx authorization
|
||||
mkdir -p /srv/salt-overlay/salt/nginx
|
||||
if [[ ! -f /srv/salt-overlay/salt/nginx/htpasswd ]]; then
|
||||
python "${KUBE_ROOT}/third_party/htpasswd/htpasswd.py" \
|
||||
-b -c "/srv/salt-overlay/salt/nginx/htpasswd" \
|
||||
"$MASTER_USER" "$MASTER_PASSWD"
|
||||
|
||||
readonly BASIC_AUTH_FILE="/srv/salt-overlay/salt/kube-apiserver/basic_auth.csv"
|
||||
if [ ! -e "${BASIC_AUTH_FILE}" ]; then
|
||||
mkdir -p /srv/salt-overlay/salt/kube-apiserver
|
||||
(umask 077;
|
||||
echo "${MASTER_USER},${MASTER_PASSWD},admin" > "${BASIC_AUTH_FILE}")
|
||||
fi
|
||||
|
||||
echo "Running release install script"
|
||||
|
@@ -131,6 +131,8 @@ function create-provision-scripts {
|
||||
echo "SERVICE_CLUSTER_IP_RANGE='${SERVICE_CLUSTER_IP_RANGE}'"
|
||||
echo "MASTER_USER='${MASTER_USER}'"
|
||||
echo "MASTER_PASSWD='${MASTER_PASSWD}'"
|
||||
echo "KUBE_USER='${KUBE_USER}'"
|
||||
echo "KUBE_PASSWORD='${KUBE_PASSWORD}'"
|
||||
echo "ENABLE_NODE_MONITORING='${ENABLE_NODE_MONITORING:-false}'"
|
||||
echo "ENABLE_NODE_LOGGING='${ENABLE_NODE_LOGGING:-false}'"
|
||||
echo "LOGGING_DESTINATION='${LOGGING_DESTINATION:-}'"
|
||||
@@ -186,7 +188,7 @@ function verify-cluster {
|
||||
# verify master has all required daemons
|
||||
echo "Validating master"
|
||||
local machine="master"
|
||||
local -a required_daemon=("salt-master" "salt-minion" "nginx" "kubelet")
|
||||
local -a required_daemon=("salt-master" "salt-minion" "kubelet")
|
||||
local validated="1"
|
||||
until [[ "$validated" == "0" ]]; do
|
||||
validated="0"
|
||||
|
Reference in New Issue
Block a user