fix: forcing the namespace for the servicemonitor check

shawkins · web-flow · commit a2c2b7e08fe8 · 2025-10-28T17:54:12.000Z
closes: #43774 (cherry picked from commit d9e3f55) Signed-off-by: Steve Hawkins <shawkins@redhat.com>
diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakServiceMonitorDependentResource.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakServiceMonitorDependentResource.java
@@ -51,7 +51,7 @@ public boolean isMet(DependentResource<ServiceMonitor, Keycloak> dependentResour
                 return false;
             }
 
-            if (!isCRDInstalled(dependentResource, context, (KeycloakServiceMonitorDependentResource)dependentResource)) {
+            if (!isCRDInstalled(dependentResource, context, (KeycloakServiceMonitorDependentResource)dependentResource, primary.getMetadata().getNamespace())) {
                 context.managedWorkflowAndDependentResourceContext().put(SERVICE_MONITOR_WARNING, WARN_CRD_NOT_INSTALLED);
                 return false;
             }
@@ -60,7 +60,8 @@ public boolean isMet(DependentResource<ServiceMonitor, Keycloak> dependentResour
         }
 
         private boolean isCRDInstalled(DependentResource<ServiceMonitor, Keycloak> dependentResource,
-                Context<Keycloak> context, KeycloakServiceMonitorDependentResource serviceMonitorDependentResource) {
+                Context<Keycloak> context, KeycloakServiceMonitorDependentResource serviceMonitorDependentResource,
+                String namespace) {
             if (serviceMonitorDependentResource.crdInstalled != null) {
                 return serviceMonitorDependentResource.crdInstalled;
             }
@@ -74,7 +75,7 @@ public void eventReceived(Action action, ServiceMonitor resource) {
                 public void onClose(WatcherException cause) {
                 }
             };
-            try (var watch = context.getClient().resources(dependentResource.resourceType()).watch(dummyWatcher)) {
+            try (var watch = context.getClient().resources(dependentResource.resourceType()).inNamespace(namespace).watch(dummyWatcher)) {
                 serviceMonitorDependentResource.crdInstalled = true;
                 return true;
             } catch (KubernetesClientException e) {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public boolean isMet(DependentResource<ServiceMonitor, Keycloak> dependentResour`
`51`	`51`	`return false;`
`52`	`52`	`}`
`53`	`53`
`54`		`- if (!isCRDInstalled(dependentResource, context, (KeycloakServiceMonitorDependentResource)dependentResource)) {`
	`54`	`+ if (!isCRDInstalled(dependentResource, context, (KeycloakServiceMonitorDependentResource)dependentResource, primary.getMetadata().getNamespace())) {`
`55`	`55`	`context.managedWorkflowAndDependentResourceContext().put(SERVICE_MONITOR_WARNING, WARN_CRD_NOT_INSTALLED);`
`56`	`56`	`return false;`
`57`	`57`	`}`
`@@ -60,7 +60,8 @@ public boolean isMet(DependentResource<ServiceMonitor, Keycloak> dependentResour`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`private boolean isCRDInstalled(DependentResource<ServiceMonitor, Keycloak> dependentResource,`
`63`		`- Context<Keycloak> context, KeycloakServiceMonitorDependentResource serviceMonitorDependentResource) {`
	`63`	`+ Context<Keycloak> context, KeycloakServiceMonitorDependentResource serviceMonitorDependentResource,`
	`64`	`+ String namespace) {`
`64`	`65`	`if (serviceMonitorDependentResource.crdInstalled != null) {`
`65`	`66`	`return serviceMonitorDependentResource.crdInstalled;`
`66`	`67`	`}`
`@@ -74,7 +75,7 @@ public void eventReceived(Action action, ServiceMonitor resource) {`
`74`	`75`	`public void onClose(WatcherException cause) {`
`75`	`76`	`}`
`76`	`77`	`};`
`77`		`- try (var watch = context.getClient().resources(dependentResource.resourceType()).watch(dummyWatcher)) {`
	`78`	`+ try (var watch = context.getClient().resources(dependentResource.resourceType()).inNamespace(namespace).watch(dummyWatcher)) {`
`78`	`79`	`serviceMonitorDependentResource.crdInstalled = true;`
`79`	`80`	`return true;`
`80`	`81`	`} catch (KubernetesClientException e) {`