mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 05:03:09 +00:00
cluster: remove centos dependency on saltbase
This commit is contained in:
parent
fa7dde385b
commit
96b5c33283
@ -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}"
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user