Merge pull request #1565 from dprince/metrics_service_fix

openshift-merge-bot[bot] · web-flow · commit aaeffd20be86 · 2025-08-14T23:10:39.000Z
Align the metrics service selectors
diff --git a/bindata/rbac/barbican-operator-rbac.yaml b/bindata/rbac/barbican-operator-rbac.yaml
@@ -429,4 +429,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: barbican-operator
+    openstack.org/operator-name: barbican
diff --git a/bindata/rbac/cinder-operator-rbac.yaml b/bindata/rbac/cinder-operator-rbac.yaml
@@ -473,4 +473,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: cinder-operator
+    openstack.org/operator-name: cinder
diff --git a/bindata/rbac/designate-operator-rbac.yaml b/bindata/rbac/designate-operator-rbac.yaml
@@ -582,4 +582,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: designate-operator
+    openstack.org/operator-name: designate
diff --git a/bindata/rbac/glance-operator-rbac.yaml b/bindata/rbac/glance-operator-rbac.yaml
@@ -420,4 +420,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: glance-operator
+    openstack.org/operator-name: glance
diff --git a/bindata/rbac/heat-operator-rbac.yaml b/bindata/rbac/heat-operator-rbac.yaml
@@ -430,4 +430,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: heat-operator
+    openstack.org/operator-name: heat
diff --git a/bindata/rbac/horizon-operator-rbac.yaml b/bindata/rbac/horizon-operator-rbac.yaml
@@ -302,4 +302,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: horizon-operator
+    openstack.org/operator-name: horizon
diff --git a/bindata/rbac/infra-operator-rbac.yaml b/bindata/rbac/infra-operator-rbac.yaml
@@ -603,4 +603,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: infra-operator
+    openstack.org/operator-name: infra
diff --git a/bindata/rbac/ironic-operator-rbac.yaml b/bindata/rbac/ironic-operator-rbac.yaml
@@ -508,4 +508,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: ironic-operator
+    openstack.org/operator-name: ironic
diff --git a/bindata/rbac/keystone-operator-rbac.yaml b/bindata/rbac/keystone-operator-rbac.yaml
@@ -412,4 +412,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: keystone-operator
+    openstack.org/operator-name: keystone
diff --git a/bindata/rbac/manila-operator-rbac.yaml b/bindata/rbac/manila-operator-rbac.yaml
@@ -465,4 +465,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: manila-operator
+    openstack.org/operator-name: manila
diff --git a/bindata/rbac/mariadb-operator-rbac.yaml b/bindata/rbac/mariadb-operator-rbac.yaml
@@ -371,4 +371,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: mariadb-operator
+    openstack.org/operator-name: mariadb
diff --git a/bindata/rbac/neutron-operator-rbac.yaml b/bindata/rbac/neutron-operator-rbac.yaml
@@ -360,4 +360,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: neutron-operator
+    openstack.org/operator-name: neutron
diff --git a/bindata/rbac/nova-operator-rbac.yaml b/bindata/rbac/nova-operator-rbac.yaml
@@ -581,4 +581,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: nova-operator
+    openstack.org/operator-name: nova
diff --git a/bindata/rbac/octavia-operator-rbac.yaml b/bindata/rbac/octavia-operator-rbac.yaml
@@ -497,4 +497,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: octavia-operator
+    openstack.org/operator-name: octavia
diff --git a/bindata/rbac/openstack-baremetal-operator-rbac.yaml b/bindata/rbac/openstack-baremetal-operator-rbac.yaml
@@ -358,4 +358,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: openstack-baremetal-operator
+    openstack.org/operator-name: openstack-baremetal
diff --git a/bindata/rbac/ovn-operator-rbac.yaml b/bindata/rbac/ovn-operator-rbac.yaml
@@ -392,4 +392,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: ovn-operator
+    openstack.org/operator-name: ovn
diff --git a/bindata/rbac/placement-operator-rbac.yaml b/bindata/rbac/placement-operator-rbac.yaml
@@ -351,4 +351,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: placement-operator
+    openstack.org/operator-name: placement
diff --git a/bindata/rbac/rabbitmq-cluster-operator-rbac.yaml b/bindata/rbac/rabbitmq-cluster-operator-rbac.yaml
@@ -227,4 +227,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: rabbitmq-cluster-operator
+    openstack.org/operator-name: rabbitmq-cluster
diff --git a/bindata/rbac/swift-operator-rbac.yaml b/bindata/rbac/swift-operator-rbac.yaml
@@ -474,4 +474,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: swift-operator
+    openstack.org/operator-name: swift
diff --git a/bindata/rbac/telemetry-operator-rbac.yaml b/bindata/rbac/telemetry-operator-rbac.yaml
@@ -591,4 +591,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: telemetry-operator
+    openstack.org/operator-name: telemetry
diff --git a/bindata/rbac/test-operator-rbac.yaml b/bindata/rbac/test-operator-rbac.yaml
@@ -288,4 +288,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: test-operator
+    openstack.org/operator-name: test
diff --git a/bindata/rbac/watcher-operator-rbac.yaml b/bindata/rbac/watcher-operator-rbac.yaml
@@ -454,4 +454,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: watcher-operator
+    openstack.org/operator-name: watcher
diff --git a/hack/sync-bindata.sh b/hack/sync-bindata.sh
@@ -255,7 +255,7 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    openstack.org/operator-name: ${OPERATOR_NAME}
+    openstack.org/operator-name: ${OPERATOR_NAME//-operator}
 EOF_CAT
 done
 
