Re-enable metrics on controller deployment with auth proxy

Signed-off-by: Angel Misevski <[email protected]>

Author: amisevsk

deploy/templates/components/manager/kustomization.yaml

@@ -1,6 +1,7 @@
 resources:
 - manager.yaml
 - serviceaccount.yaml
+- metrics_service.yaml
 
 vars:
 - name: CONTROLLER_SERVICE_ACCOUNT

deploy/templates/components/manager/manager.yaml

@@ -10,6 +10,16 @@ spec:
       terminationGracePeriodSeconds: 10
       serviceAccountName: $(CONTROLLER_SERVICE_ACCOUNT)
       containers:
+        - name: kube-rbac-proxy
+          image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
+          args:
+          - "--secure-listen-address=0.0.0.0:8443"
+          - "--upstream=http://127.0.0.1:8080/"
+          - "--logtostderr=true"
+          - "--v=10"
+          ports:
+          - name: metrics
+            containerPort: 8443
         - name: devworkspace-controller
           image: quay.io/devfile/devworkspace-controller:next
           ports:
@@ -38,6 +48,7 @@ spec:
           args:
             - /usr/local/bin/devworkspace-controller
             - --enable-leader-election
+            - "--metrics-addr=127.0.0.1:8080"
           resources:
             limits:
               cpu: 200m

deploy/templates/components/manager/metrics_service.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: metrics-service
+  namespace: system
+spec:
+  ports:
+  - name: metrics
+    port: 8443
+    targetPort: metrics
+  selector:
+    app.kubernetes.io/name: devworkspace-controller
+    app.kubernetes.io/part-of: devworkspace-operator

deploy/templates/components/rbac/auth_proxy_client_clusterrole.yaml renamed to deploy/templates/components/rbac/auth_proxy_client_cluster_role.yaml

@@ -4,15 +4,12 @@ resources:
 - leader_election_role.yaml
 - leader_election_role_binding.yaml
 # Cluster-edit and view roles for devworkspaces and related resources
-- edit-workspaces-cluster-role.yaml
-- view-workspaces-cluster-role.yaml
-# Comment the following 4 lines if you want to disable
-# the auth proxy (https://github.com/brancz/kube-rbac-proxy)
-# which protects your /metrics endpoint.
-- auth_proxy_service.yaml
-- auth_proxy_role.yaml
-- auth_proxy_role_binding.yaml
-- auth_proxy_client_clusterrole.yaml
+- edit_workspaces_cluster_role.yaml
+- view_workspaces_cluster_role.yaml
+# Clusterroles for metrics auth proxy
+- auth_proxy_cluster_role.yaml
+- auth_proxy_cluster_role_binding.yaml
+- auth_proxy_client_cluster_role.yaml
 
 configurations:
 - kustomizeconfig.yaml