github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 17:38:50 +00:00
Code Issues Projects Releases Wiki Activity

Add signerName field to CSR resource spec

Browse Source 
Signed-off-by: James Munnelly <james.munnelly@jetstack.io>
This commit is contained in:
James Munnelly
2019-12-18 02:19:06 +00:00
parent aaca31c35e
commit a983356caa
36 changed files with 1437 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/certificates/approver/sarapprove.go
View File

@@ -81,7 +81,7 @@ func (a *sarApprover) handle(csr *capi.CertificateSigningRequest) error {
if approved, denied := certificates.GetCertApprovalCondition(&csr.Status); approved || denied {
return nil
}
x509cr, err := capihelper.ParseCSR(csr)
x509cr, err := capihelper.ParseCSR(csr.Spec.Request)
if err != nil {
return fmt.Errorf("unable to parse csr %q: %v", csr.Name, err)
}

2
pkg/controller/certificates/approver/sarapprove_test.go
View File

@@ -242,7 +242,7 @@ func testRecognizer(t *testing.T, cases []func(b *csrBuilder), recognizeFunc fun
c(&b)
t.Run(fmt.Sprintf("csr:%#v", b), func(t *testing.T) {
csr := makeFancyTestCsr(b)
x509cr, err := k8s_certificates_v1beta1.ParseCSR(csr)
x509cr, err := k8s_certificates_v1beta1.ParseCSR(csr.Spec.Request)
if err != nil {
t.Errorf("unexpected err: %v", err)
}

2
pkg/controller/certificates/signer/signer.go
View File

@@ -104,7 +104,7 @@ func (s *signer) handle(csr *capi.CertificateSigningRequest) error {
}
func (s *signer) sign(csr *capi.CertificateSigningRequest) (*capi.CertificateSigningRequest, error) {
x509cr, err := capihelper.ParseCSR(csr)
x509cr, err := capihelper.ParseCSR(csr.Spec.Request)
if err != nil {
return nil, fmt.Errorf("unable to parse csr %q: %v", csr.Name, err)
}