Skip to content

CM-764: Add NetworkPolicy informer to user-defined network policy controller #342

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
merged 1 commit into from
Oct 30, 2025
+13 −1
Merged

CM-764: Add NetworkPolicy informer to user-defined network policy controller #342

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion pkg/controller/deployment/cert_manager_controller_set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func NewCertManagerControllerSet(
certManagerCAInjectorStaticResourcesController: NewCertManagerCAInjectorStaticResourcesController(operatorClient, kubeClientContainer, kubeInformersForNamespaces, eventRecorder),
certManagerCAInjectorDeploymentController: NewCertManagerCAInjectorDeploymentController(operatorClient, certManagerOperatorInformers, infraInformers, kubeClient, kubeInformersForTargetNamespace, eventRecorder, targetVersion, versionRecorder, trustedCAConfigmapName, cloudCredentialsSecretName),
certManagerNetworkPolicyStaticResourcesController: NewCertManagerNetworkPolicyStaticResourcesController(operatorClient, kubeClientContainer, kubeInformersForNamespaces, certManagerOperatorInformers, eventRecorder),
certManagerNetworkPolicyUserDefinedController: NewCertManagerNetworkPolicyUserDefinedController(operatorClient, certManagerOperatorInformers, kubeClient, eventRecorder),
certManagerNetworkPolicyUserDefinedController: NewCertManagerNetworkPolicyUserDefinedController(operatorClient, certManagerOperatorInformers, kubeClient, kubeInformersForNamespaces, eventRecorder),
}
}

Expand Down
12 changes: 12 additions & 0 deletions pkg/controller/deployment/cert_manager_networkpolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
networkingv1 "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/kubernetes"

"github.com/openshift/library-go/pkg/controller/factory"
Expand Down Expand Up @@ -83,6 +84,7 @@ type CertManagerNetworkPolicyUserDefinedController struct {
operatorClient v1helpers.OperatorClient
certManagerOperatorInformers certmanoperatorinformers.SharedInformerFactory
kubeClient kubernetes.Interface
kubeInformersForNamespaces v1helpers.KubeInformersForNamespaces
eventRecorder events.Recorder
resourceCache resourceapply.ResourceCache
}
Expand All @@ -91,12 +93,14 @@ func NewCertManagerNetworkPolicyUserDefinedController(
operatorClient v1helpers.OperatorClient,
certManagerOperatorInformers certmanoperatorinformers.SharedInformerFactory,
kubeClient kubernetes.Interface,
kubeInformersForNamespaces v1helpers.KubeInformersForNamespaces,
eventRecorder events.Recorder,
) factory.Controller {
c := &CertManagerNetworkPolicyUserDefinedController{
operatorClient: operatorClient,
certManagerOperatorInformers: certManagerOperatorInformers,
kubeClient: kubeClient,
kubeInformersForNamespaces: kubeInformersForNamespaces,
eventRecorder: eventRecorder.WithComponentSuffix("cert-manager-networkpolicy-user-defined"),
resourceCache: resourceapply.NewResourceCache(),
}
Expand All @@ -106,6 +110,14 @@ func NewCertManagerNetworkPolicyUserDefinedController(
operatorClient.Informer(),
certManagerOperatorInformers.Operator().V1alpha1().CertManagers().Informer(),
).
WithInformersQueueKeyFunc(
// Watch NetworkPolicy resources in cert-manager namespace
// Always queue reconciliation for the singleton "cluster" CertManager CR
func(obj runtime.Object) string {
return "cluster"
},
kubeInformersForNamespaces.InformersFor(certManagerNamespace).Networking().V1().NetworkPolicies().Informer(),
).
WithSync(c.sync).
ToController(certManagerNetworkPolicyUserDefinedControllerName, c.eventRecorder)
}
Expand Down