Skip to content

Commit 10c949b

Browse files
Add rbac for smon and ing
1 parent 3e6fc62 commit 10c949b

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

charts/operator/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ apiVersion: v2
22
name: immudb-operator
33
description: Helm chart to deploy [unagex-immudb-operator](https://github.com/unagex/immudb-operator)
44
type: application
5-
version: 0.0.7
6-
appVersion: 0.0.7
5+
version: 0.0.8
6+
appVersion: 0.0.8
77
home: https://github.com/unagex/immudb-operator

charts/operator/templates/cluster-role.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,9 @@ rules:
1515
- apiGroups: [""]
1616
resources: ["services"]
1717
verbs: ["get", "list", "watch", "create", "update"]
18+
- apiGroups: ["networking.k8s.io"]
19+
resources: ["ingresses"]
20+
verbs: ["get", "list", "watch", "create", "update"]
21+
- apiGroups: ["monitoring.coreos.com"]
22+
resources: ["servicemonitors"]
23+
verbs: ["get", "list", "watch", "create", "update"]

internal/controller/controller.go

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"sigs.k8s.io/controller-runtime/pkg/log"
3333
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3434

35+
promv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
3536
unagexcomv1 "github.com/unagex/immudb-operator/api/v1"
3637
k8serrors "k8s.io/apimachinery/pkg/api/errors"
3738

@@ -104,5 +105,6 @@ func (r *ImmudbReconciler) SetupWithManager(mgr ctrl.Manager) error {
104105
Watches(&appsv1.StatefulSet{}, filter).
105106
Watches(&corev1.Service{}, filter).
106107
Watches(&knetworkingv1.Ingress{}, filter).
108+
Watches(&promv1.ServiceMonitor{}, filter).
107109
Complete(r)
108110
}

internal/controller/service_monitor.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/unagex/immudb-operator/internal/controller/common"
99
k8serrors "k8s.io/apimachinery/pkg/api/errors"
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
11+
"k8s.io/apimachinery/pkg/labels"
1112
"k8s.io/apimachinery/pkg/types"
1213

1314
promv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
@@ -51,7 +52,7 @@ func (r *ImmudbReconciler) GetServiceMonitor(immudb *unagexcomv1.Immudb) *promv1
5152
Name: immudb.Name,
5253
Namespace: immudb.Namespace,
5354
OwnerReferences: common.GetOwnerReferences(immudb),
54-
Labels: immudb.Spec.ServiceMonitor.Labels,
55+
Labels: labels.Merge(ls, immudb.Spec.ServiceMonitor.Labels),
5556
},
5657
Spec: promv1.ServiceMonitorSpec{
5758
Selector: metav1.LabelSelector{

0 commit comments

Comments
 (0)