Skip to content

Commit 4cabe62

Browse files
authored
Merge pull request kubernetes#79626 from wenjiaswe/remove-etcd-ca-key
Remove unnecessary ETCD_CA_KEY check
2 parents 858fce1 + 22591ad commit 4cabe62

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

cluster/gce/gci/configure-helper.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1389,7 +1389,7 @@ function prepare-etcd-manifest {
13891389
if [[ -n "${INITIAL_ETCD_CLUSTER_STATE:-}" ]]; then
13901390
cluster_state="${INITIAL_ETCD_CLUSTER_STATE}"
13911391
fi
1392-
if [[ -n "${ETCD_CA_KEY:-}" && -n "${ETCD_CA_CERT:-}" && -n "${ETCD_PEER_KEY:-}" && -n "${ETCD_PEER_CERT:-}" ]]; then
1392+
if [[ -n "${ETCD_CA_CERT:-}" && -n "${ETCD_PEER_KEY:-}" && -n "${ETCD_PEER_CERT:-}" ]]; then
13931393
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 "
13941394
etcd_protocol="https"
13951395
fi

0 commit comments

Comments
 (0)