move service to kustomize manager dir, rename for general purpose use

Signed-off-by: Joe Lanford <[email protected]>

Author: joelanford

config/base/rbac/auth_proxy_service.yaml config/base/manager/service.yamlconfig/base/rbac/auth_proxy_service.yaml renamed to config/base/manager/service.yaml

@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
+  name: service
+  namespace: system
   labels:
     control-plane: operator-controller-controller-manager
-  name: controller-manager-metrics-service
-  namespace: system
 spec:
   ports:
   - name: https

config/components/tls/resources/manager_cert.yaml

@@ -5,10 +5,8 @@ metadata:
 spec:
   secretName: olmv1-cert
   dnsNames:
-    - operator-controller.olmv1-system.svc
-    - operator-controller.olmv1-system.svc.cluster.local
-    - operator-controller-controller-manager-metrics-service.olmv1-system.svc
-    - operator-controller-controller-manager-metrics-service.olmv1-system.svc.cluster.local
+    - operator-controller-service.olmv1-system.svc
+    - operator-controller-service.olmv1-system.svc.cluster.local
   privateKey:
     algorithm: ECDSA
     size: 256

test/e2e/metrics_test.go

@@ -98,7 +98,7 @@ func TestOperatorControllerMetricsExportedEndpoint(t *testing.T) {
 	require.NoError(t, waitErr, "Error waiting for curl pod to be ready: %s", string(waitOutput))
 
 	t.Log("Validating the metrics endpoint")
-	metricsURL := "https://operator-controller-controller-manager-metrics-service." + namespace + ".svc.cluster.local:8443/metrics"
+	metricsURL := "https://operator-controller-service." + namespace + ".svc.cluster.local:8443/metrics"
 	curlCmd := exec.Command(client, "exec", curlPod, "-n", namespace, "--",
 		"curl", "-v", "-k", "-H", "Authorization: Bearer "+token, metricsURL)
 	output, err = curlCmd.CombinedOutput()