Allow skipping conversion crd update

knative · Apr 3, 2024 · 4e3636d · 4e3636d
1 parent fef5da9
commit 4e3636d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/webhook/resourcesemantics/conversion/controller.go b/webhook/resourcesemantics/conversion/controller.go
@@ -131,6 +131,8 @@ func newController(ctx context.Context, optsFunc ...OptionFunc) *controller.Impl
 		client:       client,
 		secretLister: secretInformer.Lister(),
 		crdLister:    crdInformer.Lister(),
+
+		skipReconcile: shouldSkipReconcile(ctx),
 	}
 
 	logger := logging.FromContext(ctx)
@@ -161,3 +163,18 @@ func newController(ctx context.Context, optsFunc ...OptionFunc) *controller.Impl
 
 	return c
 }
+
+type skipReconcileKey struct{}
+
+func shouldSkipReconcile(ctx context.Context) bool {
+	v, ok := ctx.Value(skipReconcileKey{}).(*bool)
+	if ok && v != nil {
+		return *v
+	}
+	return false
+}
+
+// WithSkipReconcile returns a context with the skipReconcile value set
+func WithSkipReconcile(ctx context.Context, skipReconcile *bool) context.Context {
+	return context.WithValue(ctx, skipReconcileKey{}, skipReconcile)
+}
diff --git a/webhook/resourcesemantics/conversion/reconciler.go b/webhook/resourcesemantics/conversion/reconciler.go
@@ -49,6 +49,8 @@ type reconciler struct {
 	secretLister corelisters.SecretLister
 	crdLister    apixlisters.CustomResourceDefinitionLister
 	client       apixclient.Interface
+
+	skipReconcile bool
 }
 
 var _ webhook.ConversionController = (*reconciler)(nil)
@@ -75,6 +77,10 @@ func (r *reconciler) Reconcile(ctx context.Context, key string) error {
 		return err
 	}
 
+	if r.skipReconcile { // delegate crd update externally, only validate the secret, contents might be filled in later
+		return nil
+	}
+
 	cacert, ok := secret.Data[certresources.CACert]
 	if !ok {
 		return fmt.Errorf("secret %q is missing %q key", r.secretName, certresources.CACert)