Merge pull request #305 from stbenjam/revert-304-1701485835362

TRT-1378: Revert #304 "Undo TRT-1374: Revert for \"OCPCLOUD-2278: Add kube-rbac-proxy container & ensure metrics are only available via HTTPS\""

Author: openshift-merge-bot[bot]

manifests/0000_26_cloud-controller-manager-operator_05_metrics-service.yaml

@@ -46,10 +46,10 @@ spec:
           --leader-elect-retry-period=26s \
           --leader-elect-resource-namespace=openshift-cloud-controller-manager-operator \
           "--images-json=/etc/cloud-controller-manager-config/images.json" \
-          --metrics-bind-address=127.0.0.1:9257 \
+          --metrics-bind-address=:9258 \
           --health-addr=127.0.0.1:9259
         ports:
-        - containerPort: 9257
+        - containerPort: 9258
           name: metrics
           protocol: TCP
         - containerPort: 9259
@@ -103,33 +103,6 @@ spec:
           - mountPath: /etc/kubernetes
             name: host-etc-kube
             readOnly: true
-      - args:
-        - --secure-listen-address=0.0.0.0:9258
-        - --upstream=http://127.0.0.1:9257/
-        - --tls-cert-file=/etc/tls/private/tls.crt
-        - --tls-private-key-file=/etc/tls/private/tls.key
-        - --config-file=/etc/kube-rbac-proxy/config-file.yaml
-        - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
-        - --logtostderr=true
-        - --v=3
-        image: quay.io/openshift/origin-kube-rbac-proxy:4.2.0
-        imagePullPolicy: IfNotPresent
-        name: kube-rbac-proxy
-        ports:
-        - containerPort: 9258
-          name: https
-          protocol: TCP
-        terminationMessagePath: /dev/termination-log
-        terminationMessagePolicy: File
-        resources:
-          requests:
-            memory: 20Mi
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/kube-rbac-proxy
-          name: auth-proxy-config
-        - mountPath: /etc/tls/private
-          name: cloud-controller-manager-operator-tls
       hostNetwork: true
       nodeSelector:
         node-role.kubernetes.io/master: ""
@@ -166,10 +139,3 @@ spec:
         hostPath:
           path: /etc/kubernetes
           type: Directory
-      - configMap:
-          name: kube-rbac-proxy
-        name: auth-proxy-config
-      - name: cloud-controller-manager-operator-tls
-        secret:
-          secretName: cloud-controller-manager-operator-tls
-          optional: true