admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3113 from wansir/fix-3112

Browse Source 
fix: private key not match public key
This commit is contained in:
KubeSphere CI Bot
2020-11-20 12:04:34 +08:00
committed by GitHub
parent f6fea24a75 617e969a55
commit 954a425e20
2 changed files with 48 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/controller/certificatesigningrequest/certificatesigningrequest_controller.go
View File

@@ -220,6 +220,7 @@ func (c *Controller) reconcile(key string) error {
if len(csr.Status.Certificate) > 0 {
err = c.UpdateKubeconfig(csr)
if err != nil {
// kubeconfig not generated
klog.Error(err)
return err
}
@@ -258,7 +259,6 @@ func (c *Controller) Approve(csr *certificatesv1beta1.CertificateSigningRequest)
// approve csr
csr, err := c.k8sclient.CertificatesV1beta1().CertificateSigningRequests().UpdateApproval(csr)
if err != nil {
klog.Errorln(err)
return err
@@ -269,12 +269,9 @@ func (c *Controller) Approve(csr *certificatesv1beta1.CertificateSigningRequest)
func (c *Controller) UpdateKubeconfig(csr *certificatesv1beta1.CertificateSigningRequest) error {
username := csr.Labels[constants.UsernameLabelKey]
err := c.kubeconfigOperator.UpdateKubeconfig(username, csr.Status.Certificate)
err := c.kubeconfigOperator.UpdateKubeconfig(username, csr)
if err != nil {
klog.Error(err)
}
return err
}