Skip to content

fix: short-circuit cert-rotation reconciler under USE_OLM_TLS #30

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

Merged
chengjingtao merged 3 commits into from
May 13, 2026
Merged

fix: short-circuit cert-rotation reconciler under USE_OLM_TLS #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c62378b
fix: short-circuit cert-rotation reconciler under USE_OLM_TLS
May 13, 2026
ed285a3
hack/patches: add 008 for cert-rotation reconciler
May 13, 2026
f7806f8
fix: re-include vendor edit dropped by 008 patch commit
May 13, 2026
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
23 changes: 23 additions & 0 deletions hack/patches/008-certificates-reconciler.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
diff --git a/vendor/knative.dev/pkg/webhook/certificates/certificates.go b/vendor/knative.dev/pkg/webhook/certificates/certificates.go
index 5239279..d5981e7 100644
--- a/vendor/knative.dev/pkg/webhook/certificates/certificates.go
+++ b/vendor/knative.dev/pkg/webhook/certificates/certificates.go
@@ -20,6 +20,7 @@ import (
"context"
"crypto/tls"
"crypto/x509"
+ "os"
"time"

"go.uber.org/zap"
@@ -63,6 +64,10 @@ func (r *reconciler) Reconcile(ctx context.Context, key string) error {
func (r *reconciler) reconcileCertificate(ctx context.Context) error {
logger := logging.FromContext(ctx)

+ if os.Getenv("USE_OLM_TLS") != "" { // olm manages cert rotation
+ return nil
+ }
+
secret, err := r.secretlister.Secrets(r.key.Namespace).Get(r.key.Name)
if apierrors.IsNotFound(err) {
// The secret should be created explicitly by a higher-level system
5 changes: 5 additions & 0 deletions vendor/knative.dev/pkg/webhook/certificates/certificates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"context"
"crypto/tls"
"crypto/x509"
"os"
"time"

"go.uber.org/zap"
Expand Down Expand Up @@ -63,6 +64,10 @@ func (r *reconciler) Reconcile(ctx context.Context, key string) error {
func (r *reconciler) reconcileCertificate(ctx context.Context) error {
logger := logging.FromContext(ctx)

if os.Getenv("USE_OLM_TLS") != "" { // olm manages cert rotation
return nil
}

secret, err := r.secretlister.Secrets(r.key.Namespace).Get(r.key.Name)
if apierrors.IsNotFound(err) {
// The secret should be created explicitly by a higher-level system
Expand Down