Fix metrics and prometheus tests (#816)

Author: thegridman

Makefile

@@ -1552,17 +1552,14 @@ e2e-helm-test: $(BUILD_PROPS) $(BUILD_HELM)/coherence-operator-$(VERSION).tgz un
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Executes the Go end-to-end tests that require Prometheus in the k8s cluster
-# using a LOCAL operator instance (i.e. the operator is not deployed to k8s).
-#
-# This target DOES NOT install Prometheus, use the e2e-prometheus-test target
-# to fully reset the test namespace.
 #
 # These tests will use whichever k8s cluster the local environment
 # is pointing to.
 # ----------------------------------------------------------------------------------------------------------------------
 .PHONY: e2e-prometheus-test
 e2e-prometheus-test: export MF = $(MAKEFLAGS)
 e2e-prometheus-test: reset-namespace install-prometheus create-ssl-secrets ensure-pull-secret deploy-and-wait  ## Run the Operator metrics/Prometheus end-to-end functional tests
+	sleep 10
 	$(MAKE) run-prometheus-test $${MF} \
 	; rc=$$? \
 	; $(MAKE) uninstall-prometheus $${MF} \

config/components/restricted/cluster_role.yaml

@@ -0,0 +1,5 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: crd-webhook-install-role
+$patch: delete

config/components/restricted/cluster_role_binding.yaml

@@ -0,0 +1,9 @@
+# --------------------------------------------------------------------
+# This is the Cluster Role binding required by the Coherence Operator
+# to self-manage its CRDs and Web-Hooks.
+# --------------------------------------------------------------------
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: crd-webhook-install-rolebinding
+$patch: delete

config/components/restricted/kustomization.yaml

@@ -8,3 +8,5 @@ patches:
       name: controller-manager
   - path: node-viewer-role.yaml
   - path: node_viewer_role_binding.yaml
+  - path: cluster_role.yaml
+  - path: cluster_role_binding.yaml

config/default/manager_metrics_patch.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: metrics-service
-  namespace: system
+  namespace: default
 spec:
   ports:
   - name: https

config/default/metrics_service.yaml

@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/version: "3.5.6"
     app.kubernetes.io/part-of: coherence-operator
   name: allow-metrics-traffic
-  namespace: system
+  namespace: default
 spec:
   podSelector:
     matchLabels:

config/network-policy/allow-metrics-traffic.yaml

@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/version: "3.5.6"
     app.kubernetes.io/part-of: coherence-operator
   name: controller-manager-metrics-monitor
-  namespace: system
+  namespace: default
 spec:
   endpoints:
     - path: /metrics

config/prometheus/monitor.yaml

@@ -1,6 +1,14 @@
 # -------------------------------------------------------------
 # This is the Cluster Roles required by the Coherence Operator
 # to self-manage its CRDs and Web-Hooks.
+#
+# The Operator no longer installs its own CRDs so this role
+# is now only used by the operator to ensure any existing
+# webhook config gets removed when the operator starts.
+#
+# If the operator has never been installed with web hooks
+# enabled, or the web hook config has been manually removed,
+# then this role is not required.
 # -------------------------------------------------------------
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

config/rbac/cluster_role.yaml

@@ -9,6 +9,8 @@ resources:
   - role_binding.yaml
   - node_viewer_role.yaml
   - node_viewer_role_binding.yaml
+  - cluster_role.yaml
+  - cluster_role_binding.yaml
   - leader_election_role.yaml
   - leader_election_role_binding.yaml
   # The following RBAC configurations are used to protect