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

Resolve comments. Remove kubeconfig changes.

Browse Source
This commit is contained in:
Ben Hu 2021-04-12 22:39:53 +00:00
parent a2d094797d
commit ccb742c43c
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1269,12 +1269,9 @@ EOF
function create-kubeconfig { function create-kubeconfig {
local component=$1 local component=$1
local token=$2 local token=$2
if [[ -e "${KUBE_HOME}/bin/gke-internal-configure-helper.sh" ]]; then echo "Creating kubeconfig file for component ${component}"
gke-internal-create-kubeconfig "${component}" "${token}" mkdir -p "/etc/srv/kubernetes/${component}"
else cat <<EOF >"/etc/srv/kubernetes/${component}/kubeconfig"
echo "Creating kubeconfig file for component ${component}"
mkdir -p "/etc/srv/kubernetes/${component}"
cat <<EOF >"/etc/srv/kubernetes/${component}/kubeconfig"
apiVersion: v1 apiVersion: v1
kind: Config kind: Config
users: users:
@ -1293,7 +1290,6 @@ contexts:
name: ${component} name: ${component}
current-context: ${component} current-context: ${component}
EOF EOF
fi
} }
# Arg 1: the IP address of the API server # Arg 1: the IP address of the API server

2
cluster/gce/gci/configure-kubeapiserver.sh
View File

@ -96,7 +96,7 @@ function start-kube-apiserver {
params+=" --tls-cipher-suites=${TLS_CIPHER_SUITES}" params+=" --tls-cipher-suites=${TLS_CIPHER_SUITES}"
fi fi
if [[ -e "${KUBE_HOME}/bin/gke-internal-configure-helper.sh" ]]; then if [[ -e "${KUBE_HOME}/bin/gke-internal-configure-helper.sh" ]]; then
gke-kube-apiserver-internal-sni-param params params+=" $(gke-kube-apiserver-internal-sni-param)"
fi fi
params+=" --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname" params+=" --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname"
if [[ -s "${REQUESTHEADER_CA_CERT_PATH:-}" ]]; then if [[ -s "${REQUESTHEADER_CA_CERT_PATH:-}" ]]; then