Skip to content

Commit

Permalink
Fixing the labels for better metrics collection
Browse files Browse the repository at this point in the history
As the label selector used for both catalogd and operator-controller
metrics services is "control-plane: controller-manager". Hence changing
the labels in both operator-controller and catalogd to make sure we
do not overlap.

Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
  • Loading branch information
LalatenduMohanty committed Jun 24, 2024
1 parent 2eca31d commit 849312b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions config/base/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Namespace
metadata:
labels:
control-plane: controller-manager
control-plane: operator-controller-controller-manager
pod-security.kubernetes.io/enforce: restricted
pod-security.kubernetes.io/enforce-version: latest
name: system
Expand All @@ -15,18 +15,18 @@ metadata:
annotations:
kubectl.kubernetes.io/default-logs-container: manager
labels:
control-plane: controller-manager
control-plane: operator-controller-controller-manager
spec:
selector:
matchLabels:
control-plane: controller-manager
control-plane: operator-controller-controller-manager
replicas: 1
template:
metadata:
annotations:
kubectl.kubernetes.io/default-container: manager
labels:
control-plane: controller-manager
control-plane: operator-controller-controller-manager
spec:
affinity:
nodeAffinity:
Expand Down
4 changes: 2 additions & 2 deletions config/base/prometheus/monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
control-plane: controller-manager
control-plane: operator-controller-controller-manager
name: controller-manager-metrics-monitor
namespace: system
spec:
Expand All @@ -17,4 +17,4 @@ spec:
insecureSkipVerify: true
selector:
matchLabels:
control-plane: controller-manager
control-plane: operator-controller-controller-manager
4 changes: 2 additions & 2 deletions config/base/rbac/auth_proxy_service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
labels:
control-plane: controller-manager
control-plane: operator-controller-controller-manager
name: controller-manager-metrics-service
namespace: system
spec:
Expand All @@ -12,4 +12,4 @@ spec:
protocol: TCP
targetPort: https
selector:
control-plane: controller-manager
control-plane: operator-controller-controller-manager

0 comments on commit 849312b

Please sign in to comment.