From ccb742c43c4d4497723393612748e03c9134650a Mon Sep 17 00:00:00 2001 From: Ben Hu Date: Mon, 12 Apr 2021 22:39:53 +0000 Subject: [PATCH] Resolve comments. Remove kubeconfig changes. --- cluster/gce/gci/configure-helper.sh | 10 +++------- cluster/gce/gci/configure-kubeapiserver.sh | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index c01d2a73147..cdd03321b19 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -1269,12 +1269,9 @@ EOF function create-kubeconfig { local component=$1 local token=$2 - if [[ -e "${KUBE_HOME}/bin/gke-internal-configure-helper.sh" ]]; then - gke-internal-create-kubeconfig "${component}" "${token}" - else - echo "Creating kubeconfig file for component ${component}" - mkdir -p "/etc/srv/kubernetes/${component}" - cat <"/etc/srv/kubernetes/${component}/kubeconfig" + echo "Creating kubeconfig file for component ${component}" + mkdir -p "/etc/srv/kubernetes/${component}" + cat <"/etc/srv/kubernetes/${component}/kubeconfig" apiVersion: v1 kind: Config users: @@ -1293,7 +1290,6 @@ contexts: name: ${component} current-context: ${component} EOF - fi } # Arg 1: the IP address of the API server diff --git a/cluster/gce/gci/configure-kubeapiserver.sh b/cluster/gce/gci/configure-kubeapiserver.sh index 6f0fdae328c..a94a4d9b18e 100644 --- a/cluster/gce/gci/configure-kubeapiserver.sh +++ b/cluster/gce/gci/configure-kubeapiserver.sh @@ -96,7 +96,7 @@ function start-kube-apiserver { params+=" --tls-cipher-suites=${TLS_CIPHER_SUITES}" fi 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 params+=" --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname" if [[ -s "${REQUESTHEADER_CA_CERT_PATH:-}" ]]; then