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

cluster: remove centos dependency on saltbase

Browse Source
This commit is contained in:
Mike Danese 2018-01-13 08:18:37 -08:00
parent fa7dde385b
commit 96b5c33283
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/saltbase/salt/generate-cert/make-ca-cert.sh → cluster/centos/make-ca-cert.sh
View File

@ -33,11 +33,6 @@ mkdir -p "$cert_dir"
use_cn=false 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}" sans="IP:${cert_ip}"
if [[ -n "${extra_sans}" ]]; then if [[ -n "${extra_sans}" ]]; then
sans="${sans},${extra_sans}" sans="${sans},${extra_sans}"

2
cluster/centos/util.sh
View File

@ -234,7 +234,7 @@ echo "[INFO] tear-down-node on $1"
# Generate the CA certificates for k8s components # Generate the CA certificates for k8s components
function make-ca-cert() { function make-ca-cert() {
echo "[INFO] 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 # Provision master