Fix the controller service labels

redhat-developer · Jan 3, 2025 · 5a541e2 · 5a541e2
1 parent 21b4d62
commit 5a541e2
Show file tree

Hide file tree

Showing 19 changed files with 117 additions and 8 deletions.
diff --git a/bundle/backstage.io/manifests/backstage.io-operator.clusterserviceversion.yaml b/bundle/backstage.io/manifests/backstage.io-operator.clusterserviceversion.yaml
@@ -35,7 +35,7 @@ metadata:
           }
         }
       ]
-    createdAt: "2025-01-03T14:59:00Z"
+    createdAt: "2025-01-03T22:26:24Z"
     description: Backstage Operator
     operators.operatorframework.io/builder: operator-sdk-v1.37.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4

diff --git a/config/profile/backstage.io/kustomization.yaml b/config/profile/backstage.io/kustomization.yaml
@@ -13,7 +13,7 @@ namePrefix: backstage-
 
 resources:
 - ../../crd
-- ../../rbac
+- ../../rbac/backstage.io
 - manager.yaml
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
 # crd/kustomization.yaml

diff --git a/config/profile/external/kustomization.yaml b/config/profile/external/kustomization.yaml
@@ -8,7 +8,7 @@ namePrefix: backstage-
 
 resources:
 - ../../crd
-- ../../rbac
+- ../../rbac/external
 #- ../../manager
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
 # crd/kustomization.yaml

diff --git a/config/profile/rhdh/kustomization.yaml b/config/profile/rhdh/kustomization.yaml
@@ -13,7 +13,7 @@ namePrefix: rhdh-
 
 resources:
 - ../../crd
-- ../../rbac
+- ../../rbac/rhdh
 - manager.yaml
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
 # crd/kustomization.yaml
@@ -135,7 +135,7 @@ resources:
 
 images:
 - name: controller
-  newName: registry.redhat.io/rhdh/rhdh-rhel9-operator
+  newName: quay.io/rhdh/rhdh-rhel9-operator
   newTag: "1.5"
 
 generatorOptions:

diff --git a/config/rbac/backstage_editor_role.yaml → ...g/rbac/_common/backstage_editor_role.yaml b/config/rbac/backstage_editor_role.yaml → ...g/rbac/_common/backstage_editor_role.yaml
diff --git a/config/rbac/backstage_viewer_role.yaml → ...g/rbac/_common/backstage_viewer_role.yaml b/config/rbac/backstage_viewer_role.yaml → ...g/rbac/_common/backstage_viewer_role.yaml
diff --git a/config/rbac/kustomization.yaml → config/rbac/_common/kustomization.yaml b/config/rbac/kustomization.yaml → config/rbac/_common/kustomization.yaml
@@ -10,7 +10,6 @@ resources:
 - leader_election_role.yaml
 - leader_election_role_binding.yaml
 # Metrics
-- metrics_service.yaml
 # The following RBAC configurations are used to protect
 # the metrics endpoint with authn/authz. These configurations
 # ensure that only authorized users and service accounts

diff --git a/config/rbac/leader_election_role.yaml → ...ig/rbac/_common/leader_election_role.yaml b/config/rbac/leader_election_role.yaml → ...ig/rbac/_common/leader_election_role.yaml
diff --git a/...ig/rbac/leader_election_role_binding.yaml → ..._common/leader_election_role_binding.yaml b/...ig/rbac/leader_election_role_binding.yaml → ..._common/leader_election_role_binding.yaml
diff --git a/config/rbac/metrics_auth_role.yaml → config/rbac/_common/metrics_auth_role.yaml b/config/rbac/metrics_auth_role.yaml → config/rbac/_common/metrics_auth_role.yaml
diff --git a/config/rbac/metrics_auth_role_binding.yaml → ...ac/_common/metrics_auth_role_binding.yaml b/config/rbac/metrics_auth_role_binding.yaml → ...ac/_common/metrics_auth_role_binding.yaml
diff --git a/config/rbac/metrics_reader.yaml → config/rbac/_common/metrics_reader.yaml b/config/rbac/metrics_reader.yaml → config/rbac/_common/metrics_reader.yaml
diff --git a/config/rbac/_common/role.yaml b/config/rbac/_common/role.yaml
@@ -0,0 +1,81 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: manager-role
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  - persistentvolumeclaims
+  - secrets
+  - services
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - persistentvolumes
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  - statefulsets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - rhdh.redhat.com
+  resources:
+  - backstages
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - rhdh.redhat.com
+  resources:
+  - backstages/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - rhdh.redhat.com
+  resources:
+  - backstages/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - route.openshift.io
+  resources:
+  - routes
+  - routes/custom-host
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
diff --git a/config/rbac/role_binding.yaml → config/rbac/_common/role_binding.yaml b/config/rbac/role_binding.yaml → config/rbac/_common/role_binding.yaml
diff --git a/config/rbac/service_account.yaml → config/rbac/_common/service_account.yaml b/config/rbac/service_account.yaml → config/rbac/_common/service_account.yaml
diff --git a/config/rbac/backstage.io/kustomization.yaml b/config/rbac/backstage.io/kustomization.yaml
@@ -0,0 +1,4 @@
+resources:
+- ../_common
+# Metrics
+- metrics_service.yaml
diff --git a/config/rbac/metrics_service.yaml → ...ig/rbac/backstage.io/metrics_service.yaml b/config/rbac/metrics_service.yaml → ...ig/rbac/backstage.io/metrics_service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: controller-manager
+    app: backstage-operator
     app.kubernetes.io/name: service
     app.kubernetes.io/instance: controller-manager-metrics-service
     app.kubernetes.io/component: metrics
@@ -18,4 +18,4 @@ spec:
       protocol: TCP
       targetPort: metrics
   selector:
-    app: controller-manager
+    app: backstage-operator
diff --git a/config/rbac/rhdh/kustomization.yaml b/config/rbac/rhdh/kustomization.yaml
@@ -0,0 +1,4 @@
+resources:
+- ../_common
+# Metrics
+- metrics_service.yaml
diff --git a/config/rbac/rhdh/metrics_service.yaml b/config/rbac/rhdh/metrics_service.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: rhdh-operator
+    app.kubernetes.io/name: service
+    app.kubernetes.io/instance: controller-manager-metrics-service
+    app.kubernetes.io/component: metrics
+    app.kubernetes.io/created-by: backstage-operator
+    app.kubernetes.io/part-of: backstage-operator
+    app.kubernetes.io/managed-by: kustomize
+  name: controller-manager-metrics-service
+  namespace: system
+spec:
+  ports:
+    - name: metrics
+      port: 8443
+      protocol: TCP
+      targetPort: metrics
+  selector:
+    app: rhdh-operator