github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Use host IP instead of localhost for control plane component kubeconfig files."

Browse Source 
This reverts commit 49afcfa5f2.
This commit is contained in:
Ben Hu 2020-12-11 22:36:39 +00:00
parent 0e2bf1e49f
commit 9581c40887
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/gce/config-default.sh
View File

@ -554,9 +554,6 @@ export KUBE_APISERVER_HEALTHCHECK_ON_HOST_IP="${KUBE_APISERVER_HEALTHCHECK_ON_HO
# ETCD_PROGRESS_NOTIFY_INTERVAL defines the interval for etcd watch progress notify events. # ETCD_PROGRESS_NOTIFY_INTERVAL defines the interval for etcd watch progress notify events.
export ETCD_PROGRESS_NOTIFY_INTERVAL="${ETCD_PROGRESS_NOTIFY_INTERVAL:-10m}" export ETCD_PROGRESS_NOTIFY_INTERVAL="${ETCD_PROGRESS_NOTIFY_INTERVAL:-10m}"
# Use host IP instead of localhost in control plane kubeconfig files.
export KUBECONFIG_USE_HOST_IP="${KUBECONFIG_USE_HOST_IP:-false}"
# Optional: Install Pigz on Windows. # Optional: Install Pigz on Windows.
# Pigz is a multi-core optimized version of unzip.exe. # Pigz is a multi-core optimized version of unzip.exe.
# It improves container image pull performance since most time is spent # It improves container image pull performance since most time is spent

3
cluster/gce/config-test.sh
View File

@ -590,9 +590,6 @@ export KUBE_APISERVER_HEALTHCHECK_ON_HOST_IP="${KUBE_APISERVER_HEALTHCHECK_ON_HO
# ETCD_PROGRESS_NOTIFY_INTERVAL defines the interval for etcd watch progress notify events. # ETCD_PROGRESS_NOTIFY_INTERVAL defines the interval for etcd watch progress notify events.
export ETCD_PROGRESS_NOTIFY_INTERVAL="${ETCD_PROGRESS_NOTIFY_INTERVAL:-10m}" export ETCD_PROGRESS_NOTIFY_INTERVAL="${ETCD_PROGRESS_NOTIFY_INTERVAL:-10m}"
# Use host IP instead of localhost in control plane kubeconfig files.
export KUBECONFIG_USE_HOST_IP="${KUBECONFIG_USE_HOST_IP:-false}"
# Optional: Install Pigz on Windows. # Optional: Install Pigz on Windows.
# Pigz is a multi-core optimized version of unzip.exe. # Pigz is a multi-core optimized version of unzip.exe.
# It improves container image pull performance since most time is spent # It improves container image pull performance since most time is spent

9
cluster/gce/gci/configure-helper.sh
View File

@ -1266,18 +1266,11 @@ EOF
fi fi
} }
# Create kubeconfig files for control plane components.
function create-kubeconfig { function create-kubeconfig {
local component=$1 local component=$1
local token=$2 local token=$2
echo "Creating kubeconfig file for component ${component}" echo "Creating kubeconfig file for component ${component}"
mkdir -p "/etc/srv/kubernetes/${component}" mkdir -p "/etc/srv/kubernetes/${component}"
local kube_apiserver="localhost"
if [[ ${KUBECONFIG_USE_HOST_IP:-} == "true" ]] ; then
kube_apiserver=$(hostname -i)
fi
cat <<EOF >"/etc/srv/kubernetes/${component}/kubeconfig" cat <<EOF >"/etc/srv/kubernetes/${component}/kubeconfig"
apiVersion: v1 apiVersion: v1
kind: Config kind: Config
@ -1289,7 +1282,7 @@ clusters:
- name: local - name: local
cluster: cluster:
insecure-skip-tls-verify: true insecure-skip-tls-verify: true
server: https://${kube_apiserver}:443 server: https://localhost:443
contexts: contexts:
- context: - context:
cluster: local cluster: local