rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-06-05 05:22:31 +00:00
Code Issues Releases Wiki Activity

Fix for regenerating etcd certs

Browse Source
This commit is contained in:
galal-hussein 2019-05-29 23:55:48 +02:00 committed by Alena Prokharchyk
parent 581e3389c4
commit 8816a75b93
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pki/services.go
View File

@ -9,7 +9,7 @@ import (
"github.com/rancher/rke/hosts" "github.com/rancher/rke/hosts"
"github.com/rancher/rke/log" "github.com/rancher/rke/log"
"github.com/rancher/types/apis/management.cattle.io/v3" v3 "github.com/rancher/types/apis/management.cattle.io/v3"
"k8s.io/client-go/util/cert" "k8s.io/client-go/util/cert"
) )
@ -362,7 +362,7 @@ func GenerateEtcdCertificates(ctx context.Context, certs map[string]CertificateP
etcdAltNames := GetAltNames(etcdHosts, clusterDomain, kubernetesServiceIP, []string{}) etcdAltNames := GetAltNames(etcdHosts, clusterDomain, kubernetesServiceIP, []string{})
var ( var (
dnsNames = make([]string, len(etcdAltNames.DNSNames)) dnsNames = make([]string, len(etcdAltNames.DNSNames))
ips = make([]string, len(etcdAltNames.IPs)) ips = []string{}
) )
copy(dnsNames, etcdAltNames.DNSNames) copy(dnsNames, etcdAltNames.DNSNames)
sort.Strings(dnsNames) sort.Strings(dnsNames)
@ -378,7 +378,7 @@ func GenerateEtcdCertificates(ctx context.Context, certs map[string]CertificateP
if cert != nil && len(dnsNames) == len(cert.DNSNames) && len(ips) == len(cert.IPAddresses) { if cert != nil && len(dnsNames) == len(cert.DNSNames) && len(ips) == len(cert.IPAddresses) {
var ( var (
certDNSNames = make([]string, len(cert.DNSNames)) certDNSNames = make([]string, len(cert.DNSNames))
certIPs = make([]string, len(cert.IPAddresses)) certIPs = []string{}
) )
copy(certDNSNames, cert.DNSNames) copy(certDNSNames, cert.DNSNames)
sort.Strings(certDNSNames) sort.Strings(certDNSNames)