From 403eccca66def6c020dec54a07f37a1a84ae7c6d Mon Sep 17 00:00:00 2001 From: Antonin Stefanutti Date: Thu, 1 Jun 2023 10:05:22 +0200 Subject: [PATCH 1/2] Use uniquely identifying labels selector for the operator deployment --- config/default/manager_auth_proxy_patch.yaml | 2 +- config/default/manager_config_patch.yaml | 2 +- config/manager/manager.yaml | 8 +++++--- config/prometheus/monitor.yaml | 5 +++-- config/rbac/auth_proxy_service.yaml | 5 +++-- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml index cec149a07..24d5b1194 100644 --- a/config/default/manager_auth_proxy_patch.yaml +++ b/config/default/manager_auth_proxy_patch.yaml @@ -3,7 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: controller-manager + name: manager namespace: system spec: template: diff --git a/config/default/manager_config_patch.yaml b/config/default/manager_config_patch.yaml index 6c400155c..98456c9a4 100644 --- a/config/default/manager_config_patch.yaml +++ b/config/default/manager_config_patch.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: controller-manager + name: manager namespace: system spec: template: diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index fb590870c..bdddb38a1 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -8,21 +8,23 @@ metadata: apiVersion: apps/v1 kind: Deployment metadata: - name: controller-manager + name: manager namespace: system labels: control-plane: controller-manager spec: selector: matchLabels: - control-plane: controller-manager + app.kubernetes.io/name: codeflare-operator + app.kubernetes.io/part-of: codeflare replicas: 1 template: metadata: annotations: kubectl.kubernetes.io/default-container: manager labels: - control-plane: controller-manager + app.kubernetes.io/name: codeflare-operator + app.kubernetes.io/part-of: codeflare spec: securityContext: runAsNonRoot: true diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml index 6812d4d5e..af832182d 100644 --- a/config/prometheus/monitor.yaml +++ b/config/prometheus/monitor.yaml @@ -4,7 +4,7 @@ kind: ServiceMonitor metadata: labels: control-plane: controller-manager - name: controller-manager-metrics-monitor + name: manager-metrics namespace: system spec: endpoints: @@ -16,4 +16,5 @@ spec: insecureSkipVerify: true selector: matchLabels: - control-plane: controller-manager + app.kubernetes.io/name: codeflare-operator + app.kubernetes.io/part-of: codeflare diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml index 71f179727..86ffc6415 100644 --- a/config/rbac/auth_proxy_service.yaml +++ b/config/rbac/auth_proxy_service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: labels: control-plane: controller-manager - name: controller-manager-metrics-service + name: manager-metrics namespace: system spec: ports: @@ -12,4 +12,5 @@ spec: protocol: TCP targetPort: https selector: - control-plane: controller-manager + app.kubernetes.io/name: codeflare-operator + app.kubernetes.io/part-of: codeflare From 8add319e5673374b2854b73f1d7f176c765d6211 Mon Sep 17 00:00:00 2001 From: Antonin Stefanutti Date: Thu, 1 Jun 2023 10:21:14 +0200 Subject: [PATCH 2/2] Label resources following recommended k8s labels convention --- config/default/kustomization.yaml | 5 +++-- config/manager/manager.yaml | 4 ---- config/prometheus/monitor.yaml | 2 -- config/rbac/auth_proxy_service.yaml | 2 -- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index b3c7d2079..1bfe8c541 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -9,8 +9,9 @@ namespace: openshift-operators namePrefix: codeflare-operator- # Labels to add to all resources and selectors. -# commonLabels: -# someName: someValue +commonLabels: + app.kubernetes.io/name: codeflare-operator + app.kubernetes.io/part-of: codeflare bases: - ../crd diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index bdddb38a1..59b41783f 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -1,8 +1,6 @@ apiVersion: v1 kind: Namespace metadata: - labels: - control-plane: controller-manager name: system --- apiVersion: apps/v1 @@ -10,8 +8,6 @@ kind: Deployment metadata: name: manager namespace: system - labels: - control-plane: controller-manager spec: selector: matchLabels: diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml index af832182d..3bcf6c747 100644 --- a/config/prometheus/monitor.yaml +++ b/config/prometheus/monitor.yaml @@ -2,8 +2,6 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - labels: - control-plane: controller-manager name: manager-metrics namespace: system spec: diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml index 86ffc6415..250100420 100644 --- a/config/rbac/auth_proxy_service.yaml +++ b/config/rbac/auth_proxy_service.yaml @@ -1,8 +1,6 @@ apiVersion: v1 kind: Service metadata: - labels: - control-plane: controller-manager name: manager-metrics namespace: system spec: