From c9c8f96cd460f0872efa02ee9a52bce0e6963c41 Mon Sep 17 00:00:00 2001 From: John Sanda Date: Thu, 25 Mar 2021 14:21:18 -0400 Subject: [PATCH] only check webhook volume and cert if it is enabled --- operator/cmd/manager/main.go | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/operator/cmd/manager/main.go b/operator/cmd/manager/main.go index 27df2ce88..4fa0889db 100644 --- a/operator/cmd/manager/main.go +++ b/operator/cmd/manager/main.go @@ -132,12 +132,25 @@ func main() { os.Exit(1) } - if err = webhook.EnsureWebhookConfigVolume(cfg); err != nil { - log.Error(err, "Failed to ensure webhook volume") + skipWebhookEnvVal := os.Getenv("SKIP_VALIDATING_WEBHOOK") + if skipWebhookEnvVal == "" { + skipWebhookEnvVal = "FALSE" + } + skipWebhook, err := strconv.ParseBool(skipWebhookEnvVal) + if err != nil { + log.Error(err, "bad value for SKIP_VALIDATING_WEBHOOK env") + os.Exit(1) } + var certDir string - if certDir, err = webhook.EnsureWebhookCertificate(cfg); err != nil { - log.Error(err, "Failed to ensure webhook CA configuration") + + if !skipWebhook { + if err = webhook.EnsureWebhookConfigVolume(cfg); err != nil { + log.Error(err, "Failed to ensure webhook volume") + } + if certDir, err = webhook.EnsureWebhookCertificate(cfg); err != nil { + log.Error(err, "Failed to ensure webhook CA configuration") + } } if err = readBaseOsIntoEnv(); err != nil { @@ -182,16 +195,6 @@ func main() { os.Exit(1) } - skipWebhookEnvVal := os.Getenv("SKIP_VALIDATING_WEBHOOK") - if skipWebhookEnvVal == "" { - skipWebhookEnvVal = "FALSE" - } - skipWebhook, err := strconv.ParseBool(skipWebhookEnvVal) - if err != nil { - log.Error(err, "bad value for SKIP_VALIDATING_WEBHOOK env") - os.Exit(1) - } - if !skipWebhook { err = controllerRuntime.NewWebhookManagedBy(mgr).For(&api.CassandraDatacenter{}).Complete() if err != nil {