🐛 disable keycloak servicemonitor

bundle/manifests/konveyor-operator.clusterserviceversion.yaml

@@ -103,7 +103,7 @@ metadata:
     categories: Modernization & Migration
     certified: "false"
     containerImage: quay.io/konveyor/tackle2-operator:latest
-    createdAt: "2024-11-07T18:19:51Z"
+    createdAt: "2025-03-19T16:55:04Z"
     description: Konveyor is an open-source application modernization platform that
       helps organizations safely and predictably modernize applications to Kubernetes
       at scale.
@@ -236,6 +236,15 @@ spec:
           - update
           - patch
           - delete
+        - apiGroups:
+          - monitoring.coreos.com
+          resources:
+          - servicemonitors
+          verbs:
+          - get
+          - list
+          - watch
+          - delete
         serviceAccountName: tackle-operator
       deployments:
       - name: tackle-operator

helm/templates/rbac/cluster_role.yaml

@@ -33,4 +33,13 @@ rules:
   - update
   - patch
   - delete
+- apiGroups:
+  - monitoring.coreos.com
+  resources:
+  - servicemonitors
+  verbs:
+  - get
+  - list
+  - watch
+  - delete
 #+kubebuilder:scaffold:rules

roles/tackle/tasks/main.yml

@@ -429,6 +429,14 @@
         state: present
         definition: "{{ lookup('template', 'customresource-rhsso-keycloak.yml.j2') }}"
 
+    - name: "Remove Keycloak ServiceMonitor"
+      k8s:
+        api_version: monitoring.coreos.com/v1
+        kind: ServiceMonitor
+        state: absent
+        name: keycloak-service-monitor
+        namespace: "{{ app_namespace }}"
+
     - name: "Check RHSSO for readiness"
       k8s_info:
         api_version: "{{ rhsso_api_version }}"

roles/tackle/templates/customresource-rhsso-keycloak.yml.j2

@@ -7,6 +7,7 @@ metadata:
   labels:
     app: {{ rhsso_service_name }}
 spec:
+  DisableDefaultServiceMonitor: true
   instances: {{ rhsso_instances | default('1') }}
   externalDatabase:
     enabled: true