cleanup

redhat-developer · Jan 7, 2025 · 34d51a1 · 34d51a1
1 parent f3d38b5
commit 34d51a1
Show file tree

Hide file tree

Showing 18 changed files with 60 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,6 +39,7 @@ gosec.sarif
 catalog_mirror.log
 manifests-rhdh-index-*
 rhdh-operator-*.yaml
+!bundle/rhdh/manifests/rhdh-operator-metrics-service_*.yaml
 # manifests used for the upgrade path E2E tests
 !tests/e2e/testdata/rhdh-operator-*.yaml
 rhdh-disconnected-install/

diff --git a/bundle/backstage.io/manifests/backstage-controller-manager-metrics-service_v1_service.yaml b/bundle/backstage.io/manifests/backstage-controller-manager-metrics-service_v1_service.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  creationTimestamp: null
+  labels:
+    app.kubernetes.io/component: metrics
+    app.kubernetes.io/created-by: backstage-operator
+    app.kubernetes.io/instance: controller-manager-metrics-service
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: service
+    app.kubernetes.io/part-of: backstage-operator
+    control-plane: controller-manager
+  name: backstage-controller-manager-metrics-service
+spec:
+  ports:
+  - name: metrics
+    port: 8443
+    protocol: TCP
+    targetPort: metrics
+  selector:
+    control-plane: controller-manager
+status:
+  loadBalancer: {}
diff --git a/bundle/backstage.io/manifests/backstage-operator.clusterserviceversion.yaml b/bundle/backstage.io/manifests/backstage-operator.clusterserviceversion.yaml
@@ -35,7 +35,7 @@ metadata:
           }
         }
       ]
-    createdAt: "2025-01-07T13:58:54Z"
+    createdAt: "2025-01-07T16:46:59Z"
     description: Backstage Operator
     operators.operatorframework.io/builder: operator-sdk-v1.37.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
@@ -165,7 +165,7 @@ spec:
           - subjectaccessreviews
           verbs:
           - create
-        serviceAccountName: backstage-operator
+        serviceAccountName: backstage-controller-manager
       deployments:
       - label:
           app: operator
@@ -245,7 +245,7 @@ spec:
                   name: default-config
               securityContext:
                 runAsNonRoot: true
-              serviceAccountName: backstage-operator
+              serviceAccountName: backstage-controller-manager
               terminationGracePeriodSeconds: 10
               volumes:
               - configMap:
@@ -284,7 +284,7 @@ spec:
           verbs:
           - create
           - patch
-        serviceAccountName: backstage-operator
+        serviceAccountName: backstage-controller-manager
     strategy: deployment
   installModes:
   - supported: false

diff --git a/bundle/rhdh/manifests/backstage-operator.clusterserviceversion.yaml b/bundle/rhdh/manifests/backstage-operator.clusterserviceversion.yaml
@@ -39,7 +39,7 @@ metadata:
     categories: Developer Tools
     certified: "true"
     containerImage: registry.redhat.io/rhdh/rhdh-rhel9-operator:1.5
-    createdAt: "2025-01-07T13:58:56Z"
+    createdAt: "2025-01-07T16:47:01Z"
     description: Red Hat Developer Hub is a Red Hat supported version of Backstage.
       It comes with pre-built plug-ins and configuration settings, supports use of
       an external database, and can help streamline the process of setting up a self-managed
@@ -205,7 +205,7 @@ spec:
           - subjectaccessreviews
           verbs:
           - create
-        serviceAccountName: rhdh-operator
+        serviceAccountName: rhdh-controller-manager
       deployments:
       - label:
           app: rhdh-operator
@@ -298,7 +298,7 @@ spec:
                   name: default-config
               securityContext:
                 runAsNonRoot: true
-              serviceAccountName: rhdh-operator
+              serviceAccountName: rhdh-controller-manager
               terminationGracePeriodSeconds: 10
               volumes:
               - configMap:
@@ -337,7 +337,7 @@ spec:
           verbs:
           - create
           - patch
-        serviceAccountName: rhdh-operator
+        serviceAccountName: rhdh-controller-manager
     strategy: deployment
   installModes:
   - supported: false

diff --git a/...-operator-metrics-service_v1_service.yaml → ...r-manager-metrics-service_v1_service.yaml b/...-operator-metrics-service_v1_service.yaml → ...r-manager-metrics-service_v1_service.yaml
@@ -3,22 +3,21 @@ kind: Service
 metadata:
   creationTimestamp: null
   labels:
-    app: operator
     app.kubernetes.io/component: metrics
     app.kubernetes.io/created-by: backstage-operator
     app.kubernetes.io/instance: controller-manager-metrics-service
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: service
     app.kubernetes.io/part-of: backstage-operator
     control-plane: controller-manager
-  name: backstage-operator-metrics-service
+  name: rhdh-controller-manager-metrics-service
 spec:
   ports:
   - name: metrics
     port: 8443
     protocol: TCP
     targetPort: metrics
   selector:
-    app: operator
+    control-plane: controller-manager
 status:
   loadBalancer: {}
diff --git a/config/manager/deployment.yaml b/config/manager/deployment.yaml
@@ -94,7 +94,7 @@ spec:
         volumeMounts:
           - mountPath: /default-config
             name: default-config
-      serviceAccountName: operator
+      serviceAccountName: controller-manager
       terminationGracePeriodSeconds: 10
       volumes:
       - name: default-config

diff --git a/config/profile/backstage.io/namespace.yaml b/config/profile/backstage.io/namespace.yaml
@@ -2,5 +2,11 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    app: operator
+    control-plane: controller-manager
+    app.kubernetes.io/name: namespace
+    app.kubernetes.io/instance: system
+    app.kubernetes.io/component: manager
+    app.kubernetes.io/created-by: backstage-operator
+    app.kubernetes.io/part-of: backstage-operator
+    app.kubernetes.io/managed-by: kustomize
   name: system
diff --git a/config/profile/rhdh/kustomization.yaml b/config/profile/rhdh/kustomization.yaml
@@ -27,10 +27,6 @@ patches:
   target:
     kind: Deployment
     name: operator
-- path: patches/metrics-service-patch.yaml
-  target:
-    kind: Service
-    name: operator-metrics-service
 
 generatorOptions:
   disableNameSuffixHash: true

diff --git a/config/profile/rhdh/namespace.yaml b/config/profile/rhdh/namespace.yaml
@@ -2,5 +2,11 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    app: operator
+    control-plane: controller-manager
+    app.kubernetes.io/name: namespace
+    app.kubernetes.io/instance: system
+    app.kubernetes.io/component: manager
+    app.kubernetes.io/created-by: backstage-operator
+    app.kubernetes.io/part-of: backstage-operator
+    app.kubernetes.io/managed-by: kustomize
   name: operator
diff --git a/config/profile/rhdh/patches/metrics-service-patch.yaml b/config/profile/rhdh/patches/metrics-service-patch.yaml
diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml
@@ -6,7 +6,7 @@ metadata:
     control-plane: controller-manager
     app.kubernetes.io/name: backstage-operator
     app.kubernetes.io/managed-by: kustomize
-  name: operator-metrics-monitor
+  name: controller-manager-metrics-monitor
   namespace: system
 spec:
   endpoints:

diff --git a/config/rbac/leader_election_role_binding.yaml b/config/rbac/leader_election_role_binding.yaml
@@ -15,5 +15,5 @@ roleRef:
   name: leader-election-role
 subjects:
 - kind: ServiceAccount
-  name: operator
+  name: controller-manager
   namespace: system
diff --git a/config/rbac/metrics_auth_role_binding.yaml b/config/rbac/metrics_auth_role_binding.yaml
@@ -14,5 +14,5 @@ roleRef:
   name: metrics-auth-role
 subjects:
   - kind: ServiceAccount
-    name: operator
+    name: controller-manager
     namespace: system
diff --git a/config/rbac/metrics_service.yaml b/config/rbac/metrics_service.yaml
@@ -2,15 +2,14 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: operator
     control-plane: controller-manager
     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: operator-metrics-service
+  name: controller-manager-metrics-service
   namespace: system
 spec:
   ports:
@@ -19,4 +18,4 @@ spec:
       protocol: TCP
       targetPort: metrics
   selector:
-    app: operator
+    control-plane: controller-manager
diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml
@@ -15,5 +15,5 @@ roleRef:
   name: manager-role
 subjects:
 - kind: ServiceAccount
-  name: operator
+  name: controller-manager
   namespace: system
diff --git a/config/rbac/service_account.yaml b/config/rbac/service_account.yaml
@@ -8,5 +8,5 @@ metadata:
     app.kubernetes.io/created-by: backstage-operator
     app.kubernetes.io/part-of: backstage-operator
     app.kubernetes.io/managed-by: kustomize
-  name: operator
+  name: controller-manager
   namespace: system
diff --git a/config/samples/_v1alpha1_backstage.yaml b/config/samples/_v1alpha1_backstage.yaml
@@ -8,5 +8,5 @@ metadata:
 #    app.kubernetes.io/managed-by: kustomize
 #    app.kubernetes.io/created-by: backstage-operator
   name: backstage-sample
-# spec:
+#spec:
   # TODO(user): Add fields here
diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml
@@ -1,6 +1,6 @@
 ## Append samples you want in your CSV to this file as resources ##
 resources:
-  - _v1alpha3_backstage.yaml
-  - _v1alpha2_backstage.yaml
-  - _v1alpha1_backstage.yaml
+- _v1alpha3_backstage.yaml
+- _v1alpha2_backstage.yaml
+- _v1alpha1_backstage.yaml
 #+kubebuilder:scaffold:manifestskustomizesamples