Skip to content
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

Jump to bottom

Operator: do not patch the Subscription CRDs if the conversion webhooks are disabled #7154

Merged
merged 8 commits into from
Nov 13, 2023
Merged

Operator: do not patch the Subscription CRDs if the conversion webhooks are disabled #7154

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac04b13
Operator: do not patch the Subscription CRDs if the conversion webhoo…
ItalyPaleAle Nov 7, 2023
84a65d3
Merge branch 'master' into operator-crd-nowebhooks
dapr-bot Nov 7, 2023
fca269c
Merge branch 'master' into operator-crd-nowebhooks
dapr-bot Nov 9, 2023
6116d28
Merge branch 'master' into operator-crd-nowebhooks
dapr-bot Nov 9, 2023
ffec22e
Merge branch 'master' into operator-crd-nowebhooks
dapr-bot Nov 9, 2023
7a154eb
Merge branch 'master' into operator-crd-nowebhooks
dapr-bot Nov 13, 2023
c276c67
Merge branch 'master' into operator-crd-nowebhooks
dapr-bot Nov 13, 2023
7f67bb6
Merge branch 'master' into operator-crd-nowebhooks
dapr-bot Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 13 additions & 3 deletions pkg/operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ func (o *operator) Run(ctx context.Context) error {
/*
Make sure to set `ENABLE_WEBHOOKS=false` when we run locally.
*/
if !strings.EqualFold(os.Getenv("ENABLE_WEBHOOKS"), "false") {
enableConversionWebhooks := !strings.EqualFold(os.Getenv("ENABLE_WEBHOOKS"), "false")
if enableConversionWebhooks {
err := ctrl.NewWebhookManagedBy(o.mgr).
For(&subscriptionsapiV1alpha1.Subscription{}).
Complete()
Expand Down Expand Up @@ -258,6 +259,10 @@ func (o *operator) Run(ctx context.Context) error {
return nil
},
func(ctx context.Context) error {
if !enableConversionWebhooks {
return nil
}

sec, rErr := o.secProvider.Handler(ctx)
if rErr != nil {
return rErr
Expand All @@ -266,6 +271,10 @@ func (o *operator) Run(ctx context.Context) error {
return nil
},
func(ctx context.Context) error {
if !enableConversionWebhooks {
return nil
}

sec, rErr := o.secProvider.Handler(ctx)
if rErr != nil {
return rErr
Expand All @@ -277,7 +286,7 @@ func (o *operator) Run(ctx context.Context) error {
}

for {
rErr = o.patchCRDs(ctx, caBundle, o.mgr.GetConfig(), "subscriptions.dapr.io")
rErr = o.patchConversionWebhooksInCRDs(ctx, caBundle, o.mgr.GetConfig(), "subscriptions.dapr.io")
if rErr != nil {
return rErr
}
Expand Down Expand Up @@ -351,7 +360,8 @@ func (o *operator) Run(ctx context.Context) error {
return runner.Run(ctx)
}

func (o *operator) patchCRDs(ctx context.Context, caBundle []byte, conf *rest.Config, crdNames ...string) error {
// Patches the conversion webhooks in the specified CRDs to set the TLS configuration (including namespace and CA bundle)
func (o *operator) patchConversionWebhooksInCRDs(ctx context.Context, caBundle []byte, conf *rest.Config, crdNames ...string) error {
clientSet, err := apiextensionsclient.NewForConfig(conf)
if err != nil {
return fmt.Errorf("could not get API extension client: %v", err)
Expand Down