Temporarily disable metrics endpoint (#190)

* Temporarily disable metrics endpoint * Regenerate bundle config * Comment out additional kube-rbac-proxy config * Regenerate bundle manifests
cryostatio · Apr 12, 2021 · 563158e · 563158e
1 parent 71b1747
commit 563158e
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 119 deletions.
diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -6,9 +6,9 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=container-jfr-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
-LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.4.0+git
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
+LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 
 # Labels for testing.
 LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1

diff --git a/bundle/manifests/container-jfr-operator-controller-manager-metrics-service_v1_service.yaml b/bundle/manifests/container-jfr-operator-controller-manager-metrics-service_v1_service.yaml
diff --git a/...ifests/container-jfr-operator-leader-election-role_rbac.authorization.k8s.io_v1_role.yaml b/...ifests/container-jfr-operator-leader-election-role_rbac.authorization.k8s.io_v1_role.yaml
diff --git a/...er-jfr-operator-leader-election-rolebinding_rbac.authorization.k8s.io_v1_rolebinding.yaml b/...er-jfr-operator-leader-election-rolebinding_rbac.authorization.k8s.io_v1_rolebinding.yaml
diff --git a/...fests/container-jfr-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml b/...fests/container-jfr-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
diff --git a/...manifests/container-jfr-operator-proxy-role_rbac.authorization.k8s.io_v1_clusterrole.yaml b/...manifests/container-jfr-operator-proxy-role_rbac.authorization.k8s.io_v1_clusterrole.yaml
diff --git a/...ainer-jfr-operator-proxy-rolebinding_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml b/...ainer-jfr-operator-proxy-rolebinding_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
diff --git a/bundle/manifests/container-jfr-operator.clusterserviceversion.yaml b/bundle/manifests/container-jfr-operator.clusterserviceversion.yaml
@@ -267,19 +267,6 @@ spec:
             spec:
               containers:
               - args:
-                - --secure-listen-address=0.0.0.0:8443
-                - --upstream=http://127.0.0.1:8080/
-                - --logtostderr=true
-                - --v=10
-                image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
-                name: kube-rbac-proxy
-                ports:
-                - containerPort: 8443
-                  name: https
-                resources: {}
-              - args:
-                - --health-probe-bind-address=:8081
-                - --metrics-bind-address=127.0.0.1:8080
                 - --leader-elect
                 command:
                 - /manager

diff --git a/bundle/manifests/rhjmc.redhat.com_containerjfrs.yaml b/bundle/manifests/rhjmc.redhat.com_containerjfrs.yaml
@@ -31,6 +31,7 @@ spec:
             description: ContainerJFRSpec defines the desired state of ContainerJFR
             properties:
               minimal:
+                description: Deploy a pared-down ContainerJFR instance with no Grafana dashboard or jfr-datasource and no web-client UI.
                 type: boolean
               networkOptions:
                 description: Options to control how the operator exposes the application over a network
@@ -489,9 +490,6 @@ spec:
                         type: object
                     type: object
                 type: object
-              minimal:
-                description: Deploy a pared-down ContainerJFR instance with no Grafana dashboard or jfr-datasource and no web-client UI.
-                type: boolean
               storageOptions:
                 description: Options to customize the storage for Flight Recordings and Templates
                 properties:

diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -28,7 +28,10 @@ patchesStrategicMerge:
 # Protect the /metrics endpoint by putting it behind auth.
 # If you want your controller-manager to expose the /metrics
 # endpoint w/o any authn/z, please comment the following line.
-- manager_auth_proxy_patch.yaml
+#
+# FIXME uncomment when this issue is resolved:
+# https://github.com/operator-framework/operator-sdk/issues/4684
+#- manager_auth_proxy_patch.yaml
 
 # Mount the controller config file for loading manager configurations
 # through a ComponentConfig type

diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml
@@ -8,7 +8,10 @@ resources:
 # 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
+#
+# FIXME uncomment when this issue is resolved:
+# https://github.com/operator-framework/operator-sdk/issues/4684
+#- auth_proxy_service.yaml
+#- auth_proxy_role.yaml
+#- auth_proxy_role_binding.yaml
+#- auth_proxy_client_clusterrole.yaml
diff --git a/main.go b/main.go
@@ -85,6 +85,9 @@ func main() {
 
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
+	// FIXME Disable metrics until this issue is resolved:
+	// https://github.com/operator-framework/operator-sdk/issues/4684
+	metricsAddr = "0"
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:                 scheme,
 		MetricsBindAddress:     metricsAddr,