Skip to content

only check volume and cert when validating webhook is enabled #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jsanda wants to merge 1 commit into
base: master
Choose a base branch
from
Open

only check volume and cert when validating webhook is enabled #408

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions operator/cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down