mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #79626 from wenjiaswe/remove-etcd-ca-key
Remove unnecessary ETCD_CA_KEY check
This commit is contained in:
commit
4cabe6217f
@ -1389,7 +1389,7 @@ function prepare-etcd-manifest {
|
|||||||
if [[ -n "${INITIAL_ETCD_CLUSTER_STATE:-}" ]]; then
|
if [[ -n "${INITIAL_ETCD_CLUSTER_STATE:-}" ]]; then
|
||||||
cluster_state="${INITIAL_ETCD_CLUSTER_STATE}"
|
cluster_state="${INITIAL_ETCD_CLUSTER_STATE}"
|
||||||
fi
|
fi
|
||||||
if [[ -n "${ETCD_CA_KEY:-}" && -n "${ETCD_CA_CERT:-}" && -n "${ETCD_PEER_KEY:-}" && -n "${ETCD_PEER_CERT:-}" ]]; then
|
if [[ -n "${ETCD_CA_CERT:-}" && -n "${ETCD_PEER_KEY:-}" && -n "${ETCD_PEER_CERT:-}" ]]; then
|
||||||
etcd_creds=" --peer-trusted-ca-file /etc/srv/kubernetes/etcd-ca.crt --peer-cert-file /etc/srv/kubernetes/etcd-peer.crt --peer-key-file /etc/srv/kubernetes/etcd-peer.key -peer-client-cert-auth "
|
etcd_creds=" --peer-trusted-ca-file /etc/srv/kubernetes/etcd-ca.crt --peer-cert-file /etc/srv/kubernetes/etcd-peer.crt --peer-key-file /etc/srv/kubernetes/etcd-peer.key -peer-client-cert-auth "
|
||||||
etcd_protocol="https"
|
etcd_protocol="https"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user