Merge pull request kubernetes-retired#202 from erikgb/fix/metrics-service

Fix manifest kustomization for metrics service

Author: k8s-ci-robot

config/manager/kustomization.yaml

@@ -1,2 +1,3 @@
 resources:
 - manager.yaml
+- metrics_service.yaml

config/manager/manager.yaml

@@ -42,9 +42,6 @@ spec:
         - /manager
         args:
         - "--webhook-server-port=9443"
-        # If /config/default/manager_auth_proxy_patch.yaml is used, the port in
-        # --metrics-addr must match the value of --upstream passed to
-        # kube-rbac-proxy.
         - "--metrics-addr=:8080"
         - "--max-reconciles=10"
         - "--apiserver-qps-throttle=50"

config/rbac/auth_proxy_service.yaml renamed to config/manager/metrics_service.yaml

@@ -2,17 +2,17 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    prometheus.io/port: "8443"
-    prometheus.io/scheme: https
+    prometheus.io/port: "8080"
+    prometheus.io/scheme: http
     prometheus.io/scrape: "true"
   labels:
     control-plane: controller-manager
   name: controller-manager-metrics-service
   namespace: system
 spec:
   ports:
-  - name: https
-    port: 8443
-    targetPort: https
+  - name: metrics
+    port: 8080
+    targetPort: metrics
   selector:
     control-plane: controller-manager

config/rbac/auth_proxy_role.yaml

@@ -4,9 +4,3 @@ resources:
 - hnc_admin.yaml
 - leader_election_role.yaml
 - leader_election_role_binding.yaml
-# Comment the following 3 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