fix : remove kube-rbac-proxy sidecar metric proxy container from Operator deployment

build/scripts/generate_deployment.sh

@@ -31,7 +31,7 @@
 set -e
 
 # List of environment variables that will be replaced by envsubst
-SUBST_VARS='$NAMESPACE $DWO_IMG $RBAC_PROXY_IMAGE $PROJECT_CLONE_IMG $ROUTING_SUFFIX $DEFAULT_ROUTING $PULL_POLICY'
+SUBST_VARS='$NAMESPACE $DWO_IMG $PROJECT_CLONE_IMG $ROUTING_SUFFIX $DEFAULT_ROUTING $PULL_POLICY'
 
 SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd)
 DEPLOY_DIR="$SCRIPT_DIR/../../deploy/"
@@ -177,24 +177,19 @@ fi
 
 # Run kustomize to build yamls
 echo "Generating config for Kubernetes"
-export RBAC_PROXY_IMAGE="${KUBE_RBAC_PROXY_IMAGE:-quay.io/brancz/kube-rbac-proxy:v0.13.1}"
 ${KUSTOMIZE} build "${DEPLOY_DIR}/templates/cert-manager" \
   | envsubst "$SUBST_VARS" \
   > "${KUBERNETES_DIR}/${COMBINED_FILENAME}"
-unset RBAC_PROXY_IMAGE
 echo "File saved to ${KUBERNETES_DIR}/${COMBINED_FILENAME}"
 
 echo "Generating config for OpenShift"
-export RBAC_PROXY_IMAGE="${OPENSHIFT_RBAC_PROXY_IMAGE:-quay.io/brancz/kube-rbac-proxy:v0.13.1}"
 ${KUSTOMIZE} build "${DEPLOY_DIR}/templates/service-ca" \
   | envsubst "$SUBST_VARS" \
   > "${OPENSHIFT_DIR}/${COMBINED_FILENAME}"
-unset RBAC_PROXY_IMAGE
 echo "File saved to ${OPENSHIFT_DIR}/${COMBINED_FILENAME}"
 
 if $GEN_OLM; then
   echo "Generating base deployment files for OLM"
-  export RBAC_PROXY_IMAGE="${OPENSHIFT_RBAC_PROXY_IMAGE:-quay.io/brancz/kube-rbac-proxy:v0.13.1}"
   export NAMESPACE=openshift-operators
   # Generate .spec.relatedImages for CSV based on deployment
   TMPCSV="csv.tmp.yaml"
@@ -222,7 +217,6 @@ if $GEN_OLM; then
     | envsubst "$SUBST_VARS" \
     | yq -Y 'select(.kind != "ServiceAccount")' \
     > "${OLM_DIR}/${COMBINED_FILENAME}"
-  unset RBAC_PROXY_IMAGE
   echo "File saved to ${OLM_DIR}/${COMBINED_FILENAME}"
 fi
 

deploy/templates/base/manager_image_patch.yaml

@@ -14,9 +14,5 @@ spec:
         env:
           - name: RELATED_IMAGE_devworkspace_webhook_server
             value: ${DWO_IMG}
-          - name: RELATED_IMAGE_kube_rbac_proxy
-            value: ${RBAC_PROXY_IMAGE}
           - name: RELATED_IMAGE_project_clone
-            value: ${PROJECT_CLONE_IMG}
-      - name: kube-rbac-proxy
-        image: ${RBAC_PROXY_IMAGE}
+            value: ${PROJECT_CLONE_IMG}

deploy/templates/components/csv/clusterserviceversion.yaml

@@ -99,8 +99,6 @@ spec:
   relatedImages:
     - image: quay.io/devfile/devworkspace-controller:next
       name: devworkspace_webhook_server
-    - image: quay.io/brancz/kube-rbac-proxy:v0.13.1
-      name: kube_rbac_proxy
     - image: quay.io/devfile/project-clone:next
       name: project_clone
     - image: registry.access.redhat.com/ubi9/ubi-micro:9.5-1733126338

deploy/templates/components/manager/manager.yaml

@@ -10,16 +10,6 @@ spec:
       terminationGracePeriodSeconds: 10
       serviceAccountName: $(CONTROLLER_SERVICE_ACCOUNT)
       containers:
-        - name: kube-rbac-proxy
-          image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
-          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:
@@ -28,6 +18,8 @@ spec:
             - name: conversion
               protocol: TCP
               containerPort: 9443
+            - containerPort: 8443
+              name: metrics
           livenessProbe:
             failureThreshold: 5
             httpGet:
@@ -51,7 +43,7 @@ spec:
           args:
             - /usr/local/bin/devworkspace-controller
             - --enable-leader-election
-            - "--metrics-addr=127.0.0.1:8080"
+            - "--metrics-addr=0.0.0.0:8443"
           resources:
             limits:
               cpu: 3000m
@@ -92,5 +84,3 @@ spec:
               value: "quay.io/eclipse/che-sidecar-workspace-data-sync:0.0.1"
             - name: RELATED_IMAGE_project_clone
               value: "quay.io/devfile/project-clone:next"
-            - name: RELATED_IMAGE_kube_rbac_proxy
-              value: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1

go.mod

@@ -32,7 +32,10 @@ require (
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/ProtonMail/go-crypto v1.1.3 // indirect
+	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/blang/semver/v4 v4.0.0 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.5 // indirect
@@ -41,9 +44,11 @@ require (
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.6.0 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -52,8 +57,10 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/cel-go v0.17.8 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
@@ -75,7 +82,16 @@ require (
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/skeema/knownhosts v1.3.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/stoewer/go-strcase v1.2.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
+	go.opentelemetry.io/otel v1.19.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
+	go.opentelemetry.io/otel/metric v1.19.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
+	go.opentelemetry.io/otel/trace v1.19.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
@@ -89,13 +105,19 @@ require (
 	golang.org/x/tools v0.23.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/grpc v1.58.3 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/apiserver v0.30.1 // indirect
+	k8s.io/component-base v0.30.1 // indirect
 	k8s.io/klog/v2 v2.120.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )