From 96b5c332833d95667239d62ea9ca274007f3645d Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@google.com>
Date: Sat, 13 Jan 2018 08:18:37 -0800
Subject: [PATCH] cluster: remove centos dependency on saltbase

---
 .../{saltbase/salt/generate-cert => centos}/make-ca-cert.sh  | 5 -----
 cluster/centos/util.sh                                       | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)
 rename cluster/{saltbase/salt/generate-cert => centos}/make-ca-cert.sh (92%)

diff --git a/cluster/saltbase/salt/generate-cert/make-ca-cert.sh b/cluster/centos/make-ca-cert.sh
similarity index 92%
rename from cluster/saltbase/salt/generate-cert/make-ca-cert.sh
rename to cluster/centos/make-ca-cert.sh
index 41531209ed5..c86f27bba2b 100755
--- a/cluster/saltbase/salt/generate-cert/make-ca-cert.sh
+++ b/cluster/centos/make-ca-cert.sh
@@ -33,11 +33,6 @@ mkdir -p "$cert_dir"
 
 use_cn=false
 
-# TODO: Add support for discovery on other providers?
-if [ "$cert_ip" == "_use_gce_external_ip_" ]; then
-  cert_ip=$(curl -s -H Metadata-Flavor:Google http://metadata.google.internal./computeMetadata/v1/instance/network-interfaces/0/access-configs/0/external-ip)
-fi
-
 sans="IP:${cert_ip}"
 if [[ -n "${extra_sans}" ]]; then
   sans="${sans},${extra_sans}"
diff --git a/cluster/centos/util.sh b/cluster/centos/util.sh
index 88302a31a93..10378428bca 100755
--- a/cluster/centos/util.sh
+++ b/cluster/centos/util.sh
@@ -234,7 +234,7 @@ echo "[INFO] tear-down-node on $1"
 # Generate the CA certificates for k8s components
 function make-ca-cert() {
   echo "[INFO] make-ca-cert"
-  bash "${ROOT}/../saltbase/salt/generate-cert/make-ca-cert.sh" "${MASTER_ADVERTISE_IP}" "IP:${MASTER_ADVERTISE_IP},IP:${SERVICE_CLUSTER_IP_RANGE%.*}.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local"
+  bash "${ROOT}/make-ca-cert.sh" "${MASTER_ADVERTISE_IP}" "IP:${MASTER_ADVERTISE_IP},IP:${SERVICE_CLUSTER_IP_RANGE%.*}.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local"
 }
 
 # Provision master