[OOM-K8S-CERT-EXTERNAL-PROVIDER] Change logger implementation provider

[oom/platform/cert-service.git] / certServiceK8sExternalProvider / main.go

diff --git a/certServiceK8sExternalProvider/main.go b/certServiceK8sExternalProvider/main.go
index 2fcbfaa..c649e3f 100644 (file)
--- a/certServiceK8sExternalProvider/main.go
+++ b/certServiceK8sExternalProvider/main.go
@@ -28,46 +28,82 @@ package main
 import (
        "flag"
        "fmt"
+       "os"
+
        certmanager "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
        "k8s.io/apimachinery/pkg/runtime"
        clientgoscheme "k8s.io/client-go/kubernetes/scheme"
        _ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
        "k8s.io/utils/clock"
+       ctrl "sigs.k8s.io/controller-runtime"
+       "sigs.k8s.io/controller-runtime/pkg/manager"
+
        app "onap.org/oom-certservice/k8s-external-provider/src"
        certserviceapi "onap.org/oom-certservice/k8s-external-provider/src/cmpv2api"
        controllers "onap.org/oom-certservice/k8s-external-provider/src/cmpv2controller"
-       "os"
-       ctrl "sigs.k8s.io/controller-runtime"
-       "sigs.k8s.io/controller-runtime/pkg/log/zap"
+       "onap.org/oom-certservice/k8s-external-provider/src/cmpv2provisioner"
+       "onap.org/oom-certservice/k8s-external-provider/src/leveledlogger"
 )
 
 var (
        scheme   = runtime.NewScheme()
-       setupLog = ctrl.Log.WithName("setup")
+       setupLog leveledlogger.Logger
 )
 
 func init() {
        _ = clientgoscheme.AddToScheme(scheme)
        _ = certmanager.AddToScheme(scheme)
        _ = certserviceapi.AddToScheme(scheme)
+       setupLog = leveledlogger.GetLogger()
+
+       ctrl.SetLogger(setupLog.Log)
 }
 
 func main() {
+       printVersionInfo()
+
+       metricsAddr, logLevel, enableLeaderElection := parseInputArguments()
+
+       leveledlogger.SetLogLevel(logLevel)
+
+       manager := createControllerManager(metricsAddr, enableLeaderElection)
+
+       registerCMPv2IssuerController(manager)
+       registerCertificateRequestController(manager)
+
+       startControllerManager(manager)
+
+       setupLog.Info("Application is up and running.")
+}
+
+func printVersionInfo() {
        fmt.Println()
-       fmt.Println("                                        ***  Cert Service Provider v1.0.2  ***")
+       fmt.Println("                                     ***   CMPv2 Provider v1.0.0   ***")
        fmt.Println()
+}
 
-       setupLog.Info("Parsing arguments...")
+func parseInputArguments() (string, string, bool) {
+       setupLog.Info("Parsing input arguments...")
        var metricsAddr string
+       var logLevel string
        var enableLeaderElection bool
        flag.StringVar(&metricsAddr, "metrics-addr", ":8080", "The address the metric endpoint binds to.")
+       flag.StringVar(&logLevel, "log-level", "debug", "Min. level for logs visibility. One of: debug, info, warn, error")
        flag.BoolVar(&enableLeaderElection, "enable-leader-election", false,
                "Enable leader election for controller manager. Enabling this will ensure there is only one active controller manager.")
        flag.Parse()
+       return metricsAddr, logLevel, enableLeaderElection
+}
 
-       ctrl.SetLogger(zap.New(zap.UseDevMode(true)))
+func startControllerManager(manager manager.Manager) {
+       setupLog.Info("Starting CMPv2 controller manager...")
+       if err := manager.Start(ctrl.SetupSignalHandler()); err != nil {
+               exit(app.EXCEPTION_WHILE_RUNNING_CONTROLLER_MANAGER, err)
+       }
+}
 
-       setupLog.Info("Creating k8s Manager...")
+func createControllerManager(metricsAddr string, enableLeaderElection bool) manager.Manager {
+       setupLog.Info("Creating CMPv2 controller manager...")
        manager, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
                Scheme:             scheme,
                MetricsBindAddress: metricsAddr,
@@ -76,32 +112,37 @@ func main() {
        if err != nil {
                exit(app.FAILED_TO_CREATE_CONTROLLER_MANAGER, err)
        }
+       return manager
+}
 
+func registerCMPv2IssuerController(manager manager.Manager) {
        setupLog.Info("Registering CMPv2IssuerController...")
-       if err = (&controllers.CMPv2IssuerController{
+
+       err := (&controllers.CMPv2IssuerController{
                Client:   manager.GetClient(),
-               Log:      ctrl.Log.WithName("controllers").WithName("CMPv2Issuer"),
+               Log:      leveledlogger.GetLoggerWithValues("controllers", "CMPv2Issuer"),
                Clock:    clock.RealClock{},
                Recorder: manager.GetEventRecorderFor("cmpv2-issuer-controller"),
-       }).SetupWithManager(manager); err != nil {
+               ProvisionerFactory: &cmpv2provisioner.ProvisionerFactoryImpl{},
+       }).SetupWithManager(manager)
+
+       if err != nil {
                exit(app.FAILED_TO_REGISTER_CMPv2_ISSUER_CONTROLLER, err)
        }
+}
 
+func registerCertificateRequestController(manager manager.Manager) {
        setupLog.Info("Registering CertificateRequestController...")
-       if err = (&controllers.CertificateRequestController{
+
+       err := (&controllers.CertificateRequestController{
                Client:   manager.GetClient(),
-               Log:      ctrl.Log.WithName("controllers").WithName("CertificateRequest"),
+               Log:      leveledlogger.GetLoggerWithValues("controllers", "CertificateRequest"),
                Recorder: manager.GetEventRecorderFor("certificate-requests-controller"),
-       }).SetupWithManager(manager); err != nil {
-               exit(app.FAILED_TO_REGISTER_CERT_REQUEST_CONTROLLER, err)
-       }
+       }).SetupWithManager(manager)
 
-       setupLog.Info("Starting k8s manager...")
-       if err := manager.Start(ctrl.SetupSignalHandler()); err != nil {
-               exit(app.EXCEPTION_WHILE_RUNNING_CONTROLLER_MANAGER, err)
+       if err != nil {
+               exit(app.FAILED_TO_REGISTER_CERT_REQUEST_CONTROLLER, err)
        }
-       setupLog.Info("Application is up and running.")
-
 }
 
 func exit(exitCode app.ExitCode, err error) {