Skip to content

Commit 3f3c265

Browse files
committed
🐛 disable keycloak servicemonitor
Signed-off-by: Jason Montleon <[email protected]>
1 parent b82babe commit 3f3c265

File tree

4 files changed

+28
-1
lines changed

4 files changed

+28
-1
lines changed

bundle/manifests/konveyor-operator.clusterserviceversion.yaml

+10-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ metadata:
103103
categories: Modernization & Migration
104104
certified: "false"
105105
containerImage: quay.io/konveyor/tackle2-operator:latest
106-
createdAt: "2024-11-07T18:19:51Z"
106+
createdAt: "2025-03-19T16:55:04Z"
107107
description: Konveyor is an open-source application modernization platform that
108108
helps organizations safely and predictably modernize applications to Kubernetes
109109
at scale.
@@ -236,6 +236,15 @@ spec:
236236
- update
237237
- patch
238238
- delete
239+
- apiGroups:
240+
- monitoring.coreos.com
241+
resources:
242+
- servicemonitors
243+
verbs:
244+
- get
245+
- list
246+
- watch
247+
- delete
239248
serviceAccountName: tackle-operator
240249
deployments:
241250
- name: tackle-operator

helm/templates/rbac/cluster_role.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,13 @@ rules:
3333
- update
3434
- patch
3535
- delete
36+
- apiGroups:
37+
- monitoring.coreos.com
38+
resources:
39+
- servicemonitors
40+
verbs:
41+
- get
42+
- list
43+
- watch
44+
- delete
3645
#+kubebuilder:scaffold:rules

roles/tackle/tasks/main.yml

+8
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,14 @@
429429
state: present
430430
definition: "{{ lookup('template', 'customresource-rhsso-keycloak.yml.j2') }}"
431431

432+
- name: "Remove Keycloak ServiceMonitor"
433+
k8s:
434+
api_version: monitoring.coreos.com/v1
435+
kind: ServiceMonitor
436+
state: absent
437+
name: keycloak-service-monitor
438+
namespace: "{{ app_namespace }}"
439+
432440
- name: "Check RHSSO for readiness"
433441
k8s_info:
434442
api_version: "{{ rhsso_api_version }}"

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

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ metadata:
77
labels:
88
app: {{ rhsso_service_name }}
99
spec:
10+
DisableDefaultServiceMonitor: true
1011
instances: {{ rhsso_instances | default('1') }}
1112
externalDatabase:
1213
enabled: true

0 commit comments

Comments
 (0)