Added support for reusing the webhook TLS certificate across differen…

…t deployments to prevent cases where operator takes too long to start up (#180)
otterize · Feb 17, 2025 · f126b1c · f126b1c
1 parent d182a14
commit f126b1c
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 5 deletions.
diff --git a/src/operator/config/rbac/role.yaml b/src/operator/config/rbac/role.yaml
@@ -25,6 +25,17 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+    - ""
+  resourceNames:
+    - credentials-operator-webhook-cert
+  resources:
+    - secrets
+  verbs:
+    - get
+    - list
+    - update
+    - watch
 - apiGroups:
   - ""
   resources:

diff --git a/src/operator/go.mod b/src/operator/go.mod
diff --git a/src/operator/go.sum b/src/operator/go.sum
diff --git a/src/operator/main.go b/src/operator/main.go
@@ -231,9 +231,25 @@ func main() {
 	// setup webhook
 	if viper.GetBool(operatorconfig.SelfSignedCertKey) {
 		logrus.Infoln("Creating self signing certs")
-		certBundle, err := operatorwebhooks.GenerateSelfSignedCertificate("credentials-operator-webhook-service", podNamespace)
+		secretName := viper.GetString(operatorconfig.WebhookCertSecretNameKey)
+		certBundle, ok, err := operatorwebhooks.ReadCertBundleFromSecret(signalHandlerCtx, directClient, secretName, podNamespace)
 		if err != nil {
-			logrus.WithError(err).Panic("unable to create self signed certs for webhook")
+			logrus.WithError(err).Warn("unable to read existing certs from secret, generating new ones")
+		}
+		if !ok {
+			logrus.Info("webhook certs uninitialized, generating new certs")
+		}
+		if !ok || err != nil {
+			certBundleNew, err :=
+				operatorwebhooks.GenerateSelfSignedCertificate("intents-operator-webhook-service", podNamespace)
+			if err != nil {
+				logrus.WithError(err).Panic("unable to create self signed certs for webhook")
+			}
+			err = operatorwebhooks.PersistCertBundleToSecret(signalHandlerCtx, directClient, secretName, podNamespace, certBundleNew)
+			if err != nil {
+				logrus.WithError(err).Panic("unable to persist certs to secret")
+			}
+			certBundle = certBundleNew
 		}
 		err = operatorwebhooks.WriteCertToFiles(certBundle)
 		if err != nil {

diff --git a/src/operator/operatorconfig/config.go b/src/operator/operatorconfig/config.go
@@ -57,6 +57,8 @@ const (
 	EnableSecretRotationDefault                = false
 	DatabasePasswordRotationIntervalKey        = "database-password-rotation-interval"
 	DatabasePasswordRotationIntervalDefault    = time.Hour * 8
+	WebhookCertSecretNameKey                   = "webhook-cert-secret-name"
+	WebhookCertSecretNameDefault               = "credentials-operator-webhook-cert"
 )
 
 const (
@@ -86,6 +88,7 @@ func init() {
 	viper.SetDefault(AWSUseSoftDeleteStrategyKey, AWSUseSoftDeleteStrategyDefault)
 	viper.SetDefault(EnableSecretRotationKey, EnableSecretRotationDefault)
 	viper.SetDefault(DebugKey, DebugDefault)
+	viper.SetDefault(WebhookCertSecretNameKey, WebhookCertSecretNameDefault)
 	viper.SetEnvPrefix(EnvPrefix)
 	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
 	viper.AutomaticEnv()