rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-07-21 02:30:27 +00:00
Code Issues Releases Wiki Activity

Fix requestheaqder ca certificate regeneration

Browse Source
This commit is contained in:
galal-hussein 2018-09-08 02:23:47 +02:00 committed by Alena Prokharchyk
parent 67448c38c6
commit 00e317250d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cluster/certificates.go
View File

@ -126,6 +126,8 @@ func getClusterCerts(ctx context.Context, kubeClient *kubernetes.Clientset, etcd
pki.KubeControllerCertName, pki.KubeControllerCertName,
pki.KubeSchedulerCertName, pki.KubeSchedulerCertName,
pki.KubeAdminCertName, pki.KubeAdminCertName,
pki.APIProxyClientCertName,
pki.RequestHeaderCACertName,
} }
for _, etcdHost := range etcdHosts { for _, etcdHost := range etcdHosts {
@ -136,11 +138,16 @@ func getClusterCerts(ctx context.Context, kubeClient *kubernetes.Clientset, etcd
certMap := make(map[string]pki.CertificatePKI) certMap := make(map[string]pki.CertificatePKI)
for _, certName := range certificatesNames { for _, certName := range certificatesNames {
secret, err := k8s.GetSecret(kubeClient, certName) secret, err := k8s.GetSecret(kubeClient, certName)
if err != nil && !strings.HasPrefix(certName, "kube-etcd") { if err != nil && !strings.HasPrefix(certName, "kube-etcd") &&
!strings.Contains(certName, pki.RequestHeaderCACertName) &&
!strings.Contains(certName, pki.APIProxyClientCertName) {
return nil, err return nil, err
} }
// If I can't find an etcd cert, I will not fail and will create it later. // If I can't find an etcd, requestheader, or proxy client cert, I will not fail and will create it later.
if (secret == nil || secret.Data == nil) && strings.HasPrefix(certName, "kube-etcd") { if (secret == nil || secret.Data == nil) &&
(strings.HasPrefix(certName, "kube-etcd") ||
strings.Contains(certName, pki.RequestHeaderCACertName) ||
strings.Contains(certName, pki.APIProxyClientCertName)) {
certMap[certName] = pki.CertificatePKI{} certMap[certName] = pki.CertificatePKI{}
continue continue
} }