fix long names

maschmid · maschmid · commit b40ee3d65e87 · 2026-07-09T10:27:51.000+02:00
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -60,7 +60,7 @@ patches:
 # - source: # Uncomment the following block to enable certificates for metrics
 #     kind: Service
 #     version: v1
-#     name: controller-manager-metrics-service
+#     name: metrics-service
 #     fieldPath: metadata.name
 #   targets:
 #     - select:
@@ -79,7 +79,7 @@ patches:
 #         kind: ServiceMonitor
 #         group: monitoring.coreos.com
 #         version: v1
-#         name: controller-manager-metrics-monitor
+#         name: metrics-monitor
 #       fieldPaths:
 #         - spec.endpoints.0.tlsConfig.serverName
 #       options:
@@ -90,7 +90,7 @@ patches:
 # - source:
 #     kind: Service
 #     version: v1
-#     name: controller-manager-metrics-service
+#     name: metrics-service
 #     fieldPath: metadata.namespace
 #   targets:
 #     - select:
@@ -109,7 +109,7 @@ patches:
 #         kind: ServiceMonitor
 #         group: monitoring.coreos.com
 #         version: v1
-#         name: controller-manager-metrics-monitor
+#         name: metrics-monitor
 #       fieldPaths:
 #         - spec.endpoints.0.tlsConfig.serverName
 #       options:
diff --git a/config/default/metrics_service.yaml b/config/default/metrics_service.yaml
@@ -2,10 +2,10 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: manager
     app.kubernetes.io/name: objectbucket-notifications-adapter
     app.kubernetes.io/managed-by: kustomize
-  name: controller-manager-metrics-service
+  name: metrics-service
   namespace: system
 spec:
   ports:
@@ -14,5 +14,5 @@ spec:
     protocol: TCP
     targetPort: 8443
   selector:
-    control-plane: controller-manager
+    control-plane: manager
     app.kubernetes.io/name: objectbucket-notifications-adapter
diff --git a/config/kafka/kafka_env_patch.yaml b/config/kafka/kafka_env_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: manager
 spec:
   template:
     spec:
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -5,5 +5,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: example.com/objectbucket-notifications-adapter
-  newTag: v0.0.1
+  newName: quay.io/maschmid/objectbucket-notifications-adapter
+  newTag: latest
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -2,32 +2,32 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: manager
     app.kubernetes.io/name: objectbucket-notifications-adapter
     app.kubernetes.io/managed-by: kustomize
   name: system
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: manager
   namespace: system
   labels:
-    control-plane: controller-manager
+    control-plane: manager
     app.kubernetes.io/name: objectbucket-notifications-adapter
     app.kubernetes.io/managed-by: kustomize
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: manager
       app.kubernetes.io/name: objectbucket-notifications-adapter
   replicas: 1
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        control-plane: controller-manager
+        control-plane: manager
         app.kubernetes.io/name: objectbucket-notifications-adapter
     spec:
       # TODO(user): Uncomment the following code to configure the nodeAffinity expression
@@ -106,5 +106,5 @@ spec:
             memory: 64Mi
         volumeMounts: []
       volumes: []
-      serviceAccountName: controller-manager
+      serviceAccountName: manager
       terminationGracePeriodSeconds: 10
diff --git a/config/manager/service.yaml b/config/manager/service.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: controller-manager-notifications
+  name: notifications
   labels:
     app.kubernetes.io/name: objectbucket-notifications-adapter
     app.kubernetes.io/managed-by: kustomize
 spec:
   selector:
-    control-plane: controller-manager
+    control-plane: manager
     app.kubernetes.io/name: objectbucket-notifications-adapter
   ports:
   - port: 8888
diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml
@@ -14,7 +14,7 @@ resources:
 #    group: apps
 #    version: v1
 #    kind: Deployment
-#    name: controller-manager
+#    name: manager
 #    namespace: system
 #  patch: |-
 #    # Remove the manager container's "cert" volumeMount, since OLM will create and mount a set of certs.
diff --git a/config/network-policy/allow-metrics-traffic.yaml b/config/network-policy/allow-metrics-traffic.yaml
@@ -12,7 +12,7 @@ metadata:
 spec:
   podSelector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: manager
       app.kubernetes.io/name: objectbucket-notifications-adapter
   policyTypes:
     - Ingress
diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml
@@ -3,10 +3,10 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: manager
     app.kubernetes.io/name: objectbucket-notifications-adapter
     app.kubernetes.io/managed-by: kustomize
-  name: controller-manager-metrics-monitor
+  name: metrics-monitor
   namespace: system
 spec:
   endpoints:
@@ -23,5 +23,5 @@ spec:
         insecureSkipVerify: true
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: manager
       app.kubernetes.io/name: objectbucket-notifications-adapter
diff --git a/config/rbac/leader_election_role_binding.yaml b/config/rbac/leader_election_role_binding.yaml
@@ -11,5 +11,5 @@ roleRef:
   name: leader-election-role
 subjects:
 - kind: ServiceAccount
-  name: controller-manager
+  name: manager
   namespace: system
diff --git a/config/rbac/metrics_auth_role_binding.yaml b/config/rbac/metrics_auth_role_binding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: metrics-auth-role
 subjects:
 - kind: ServiceAccount
-  name: controller-manager
+  name: manager
   namespace: system
diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml
@@ -11,5 +11,5 @@ roleRef:
   name: manager-role
 subjects:
 - kind: ServiceAccount
-  name: controller-manager
+  name: manager
   namespace: system
diff --git a/config/rbac/service_account.yaml b/config/rbac/service_account.yaml
@@ -4,5 +4,5 @@ metadata:
   labels:
     app.kubernetes.io/name: objectbucket-notifications-adapter
     app.kubernetes.io/managed-by: kustomize
-  name: controller-manager
+  name: manager
   namespace: system
diff --git a/noobaa-connection-setup.sh b/noobaa-connection-setup.sh
@@ -4,17 +4,17 @@
 #
 # Prerequisites: OpenShift Data Foundation installed in `openshift-storage`
 #
-# before running this secript, install the CRD and the mcg-adapter from this repo:
+# before running this secript, install the CRD and the objectbucket-notifications-adapter from this repo:
 #   make install
-#   make deploy IMG=<some-registry>/mcg-adapter:tag
+#   make deploy IMG=<some-registry>/objectbucket-notifications-adapter:tag
 
-oc create secret generic mcg-adapter-connection \
+oc create secret generic objectbucket-notifications-adapter-connection \
   --from-file=connect.json=/dev/stdin -n openshift-storage <<EOF
 {
-  "name": "mcg-adapter-connection",
+  "name": "objectbucket-notifications-adapter-connection",
   "notification_protocol": "http",
   "agent_request_object": {
-    "host": "mcg-adapter-controller-manager-notifications.mcg-adapter-system.svc.cluster.local",
+    "host": "objectbucket-notifications-adapter-notifications.objectbucket-notifications-adapter-system.svc.cluster.local",
     "port": 8888
   } 
 }
@@ -23,7 +23,7 @@ EOF
 existing_connections=$(oc get noobaa noobaa -n openshift-storage -o json | jq -c '.spec.bucketNotifications.connections // []')
 
 updated_connections=$(echo "$existing_connections" | jq -c \
-  --arg name "mcg-adapter-connection" \
+  --arg name "objectbucket-notifications-adapter-connection" \
   '[.[] | select(.name != $name)] + [{"name": $name, "namespace": "openshift-storage"}]')
 
 oc patch noobaa noobaa --type='merge' -n openshift-storage -p '{
diff --git a/noobaa-kafka-connection-setup.sh b/noobaa-kafka-connection-setup.sh
@@ -6,17 +6,17 @@
 #   - OpenShift Data Foundation installed in `openshift-storage`
 #   - Strimzi Kafka cluster `my-cluster` running in `kafka` namespace
 #
-# Before running this script, install the CRD and the mcg-adapter from this repo:
+# Before running this script, install the CRD and the objectbucket-notifications-adapter from this repo:
 #   make install
-#   make deploy-kafka IMG=<some-registry>/mcg-adapter:tag
+#   make deploy-kafka IMG=<some-registry>/objectbucket-notifications-adapter:tag
 
 set -Eeuxo pipefail
 
-mcg_adapter_topic="mcg-adapter-notifications"
-mcg_adapter_namespace="mcg-adapter-system"
+mcg_adapter_topic="objectbucket-notifications-adapter-notifications"
+mcg_adapter_namespace="objectbucket-notifications-adapter-system"
 kafka_namespace="kafka"
 kafka_cluster="my-cluster"
-connection_name="mcg-adapter-connection"
+connection_name="objectbucket-notifications-adapter-connection"
 
 # --- Strimzi KafkaTopic and KafkaUsers ---
 
@@ -68,7 +68,7 @@ cat <<EOF | oc apply -f -
 apiVersion: kafka.strimzi.io/v1
 kind: KafkaUser
 metadata:
-  name: mcg-adapter-user
+  name: objectbucket-notifications-adapter-user
   namespace: ${kafka_namespace}
   labels:
     strimzi.io/cluster: ${kafka_cluster}
@@ -92,7 +92,7 @@ EOF
 
 echo "Waiting for KafkaUser secrets to be created..."
 oc wait --for=condition=Ready kafkauser/noobaa-notifications-user -n "${kafka_namespace}" --timeout=120s
-oc wait --for=condition=Ready kafkauser/mcg-adapter-user -n "${kafka_namespace}" --timeout=120s
+oc wait --for=condition=Ready kafkauser/objectbucket-notifications-adapter-user -n "${kafka_namespace}" --timeout=120s
 
 # --- NooBaa Kafka connection secret ---
 
@@ -138,19 +138,19 @@ oc patch noobaa noobaa --type='merge' -n openshift-storage -p '{
   }
 }'
 
-# --- mcg-adapter Kafka credentials secret ---
-# Copy the mcg-adapter-user password from the Strimzi-managed secret in the
+# --- objectbucket-notifications-adapter Kafka credentials secret ---
+# Copy the objectbucket-notifications-adapter-user password from the Strimzi-managed secret in the
 # kafka namespace into a secret in the adapter namespace, using the format
 # expected by the adapter (see kafka-secret-format.md).
 
 oc create namespace "${mcg_adapter_namespace}" 2>/dev/null || true
 
-adapter_password=$(oc get secret -n "${kafka_namespace}" mcg-adapter-user \
+adapter_password=$(oc get secret -n "${kafka_namespace}" objectbucket-notifications-adapter-user \
   -o jsonpath='{.data.password}' | base64 --decode)
 
-oc delete secret -n "${mcg_adapter_namespace}" mcg-adapter-user 2>/dev/null || true
-oc create secret generic mcg-adapter-user -n "${mcg_adapter_namespace}" \
+oc delete secret -n "${mcg_adapter_namespace}" objectbucket-notifications-adapter-user 2>/dev/null || true
+oc create secret generic objectbucket-notifications-adapter-user -n "${mcg_adapter_namespace}" \
   --from-literal=protocol=SASL_PLAINTEXT \
   --from-literal=sasl.mechanism=SCRAM-SHA-512 \
-  --from-literal=user=mcg-adapter-user \
+  --from-literal=user=objectbucket-notifications-adapter-user \
   --from-literal=password="${adapter_password}"
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -34,10 +34,10 @@ import (
 const namespace = "objectbucket-notifications-adapter-system"
 
 // serviceAccountName created for the project
-const serviceAccountName = "objectbucket-notifications-adapter-controller-manager"
+const serviceAccountName = "objectbucket-notifications-adapter-manager"
 
 // metricsServiceName is the name of the metrics service of the project
-const metricsServiceName = "objectbucket-notifications-adapter-controller-manager-metrics-service"
+const metricsServiceName = "objectbucket-notifications-adapter-metrics-service"
 
 // metricsRoleBindingName is the name of the RBAC that will be created to allow get the metrics data
 const metricsRoleBindingName = "objectbucket-notifications-adapter-metrics-binding"
@@ -143,7 +143,7 @@ var _ = Describe("Manager", Ordered, func() {
 			verifyControllerUp := func(g Gomega) {
 				// Get the name of the controller-manager pod
 				cmd := exec.Command("kubectl", "get",
-					"pods", "-l", "control-plane=controller-manager",
+					"pods", "-l", "control-plane=manager",
 					"-o", "go-template={{ range .items }}"+
 						"{{ if not .metadata.deletionTimestamp }}"+
 						"{{ .metadata.name }}"+
@@ -156,7 +156,7 @@ var _ = Describe("Manager", Ordered, func() {
 				podNames := utils.GetNonEmptyLines(podOutput)
 				g.Expect(podNames).To(HaveLen(1), "expected 1 controller pod running")
 				controllerPodName = podNames[0]
-				g.Expect(controllerPodName).To(ContainSubstring("controller-manager"))
+				g.Expect(controllerPodName).To(ContainSubstring("manager"))
 
 				// Validate the pod's status
 				cmd = exec.Command("kubectl", "get",
