aboutsummaryrefslogtreecommitdiffstats
path: root/certServiceK8sExternalProvider/src/cmpv2controller/certificate_request_controller.go
diff options
context:
space:
mode:
authorPawel Baniewski <pawel.baniewski@nokia.com>2020-10-27 11:43:40 +0000
committerGerrit Code Review <gerrit@onap.org>2020-10-27 11:43:40 +0000
commit1b1eddbac8e25d90c4ff2dd08445606abab2670d (patch)
treee362076ac54871be710423607a6d6d336514f384 /certServiceK8sExternalProvider/src/cmpv2controller/certificate_request_controller.go
parenta7bb3d59e71f7f7980f8b7db400df94cabd92c0a (diff)
parent27eb5220a1e33ac8180c64414827c6923b448580 (diff)
Merge "[OOM-K8S-CERT-EXTERNAL-PROVIDER] Add logging of not supported/overridden CSR info"
Diffstat (limited to 'certServiceK8sExternalProvider/src/cmpv2controller/certificate_request_controller.go')
-rw-r--r--certServiceK8sExternalProvider/src/cmpv2controller/certificate_request_controller.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/certServiceK8sExternalProvider/src/cmpv2controller/certificate_request_controller.go b/certServiceK8sExternalProvider/src/cmpv2controller/certificate_request_controller.go
index 136d3eb4..f77642cd 100644
--- a/certServiceK8sExternalProvider/src/cmpv2controller/certificate_request_controller.go
+++ b/certServiceK8sExternalProvider/src/cmpv2controller/certificate_request_controller.go
@@ -41,6 +41,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"onap.org/oom-certservice/k8s-external-provider/src/cmpv2api"
+ "onap.org/oom-certservice/k8s-external-provider/src/cmpv2controller/logger"
provisioners "onap.org/oom-certservice/k8s-external-provider/src/cmpv2provisioner"
)
@@ -123,14 +124,17 @@ func (controller *CertificateRequestController) Reconcile(k8sRequest ctrl.Reques
}
privateKeyBytes := privateKeySecret.Data[privateKeySecretKey]
- // 8. Sign CertificateRequest
+ // 8. Log Certificate Request properties not supported or overridden by CertService API
+ logger.LogCertRequestProperties(ctrl.Log.WithName("CSR details"), certificateRequest)
+
+ // 9. Sign CertificateRequest
signedPEM, trustedCAs, err := provisioner.Sign(ctx, certificateRequest, privateKeyBytes)
if err != nil {
controller.handleErrorFailedToSignCertificate(ctx, log, err, certificateRequest)
return ctrl.Result{}, err
}
- // 9. Store signed certificates in CertificateRequest
+ // 10. Store signed certificates in CertificateRequest
certificateRequest.Status.Certificate = signedPEM
certificateRequest.Status.CA = trustedCAs
if err := controller.updateCertificateRequestWithSignedCerficates(ctx, certificateRequest); err != nil {