chore: remove metrics service and kube-rbac-proxy image (#261)

* chore: remove metrics service and kube-rbac-proxy image * f
replicatedhq · Jul 29, 2024 · 70ecb80 · 70ecb80
1 parent f9a5596
commit 70ecb80
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 2 deletions.
diff --git a/charts/embedded-cluster-operator/templates/embedded-cluster-operator-deployment.yaml b/charts/embedded-cluster-operator/templates/embedded-cluster-operator-deployment.yaml
@@ -22,6 +22,7 @@ spec:
           {{- toYaml . | nindent 8 }}
     {{- end }}
       containers:
+{{- if .Values.metrics.enabled }}
       - args:
         - --secure-listen-address=0.0.0.0:8443
         - --upstream=http://127.0.0.1:8080/
@@ -45,6 +46,7 @@ spec:
           capabilities:
             drop:
             - ALL
+{{- end }}
       - args:
         - --health-probe-bind-address=:8081
         - --metrics-bind-address=127.0.0.1:8080

diff --git a/...dded-cluster-operator/templates/embedded-cluster-operator-metrics-reader-clusterrole.yaml b/...dded-cluster-operator/templates/embedded-cluster-operator-metrics-reader-clusterrole.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.metrics.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -10,3 +11,4 @@ rules:
   - /metrics
   verbs:
   - get
+{{- end }}
diff --git a/charts/embedded-cluster-operator/templates/embedded-cluster-operator-metrics-service.yaml b/charts/embedded-cluster-operator/templates/embedded-cluster-operator-metrics-service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.metrics.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,3 +13,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector: {{- include "embedded-cluster-operator.selectorLabels" $ | nindent 4 }}
+{{- end }}
diff --git a/charts/embedded-cluster-operator/templates/embedded-cluster-operator-proxy-clusterrole.yaml b/charts/embedded-cluster-operator/templates/embedded-cluster-operator-proxy-clusterrole.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.metrics.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -18,3 +19,4 @@ rules:
   - subjectaccessreviews
   verbs:
   - create
+{{- end }}
diff --git a/charts/embedded-cluster-operator/templates/embedded-cluster-operator-proxy-rolebinding.yaml b/charts/embedded-cluster-operator/templates/embedded-cluster-operator-proxy-rolebinding.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.metrics.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -13,3 +14,4 @@ subjects:
 - kind: ServiceAccount
   name: {{ include "embedded-cluster-operator.serviceAccountName" $ | trunc 63 | trimAll "-"}}
   namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/embedded-cluster-operator/values.yaml b/charts/embedded-cluster-operator/values.yaml
@@ -13,7 +13,6 @@ image:
   tag: 0.0.8
   pullPolicy: IfNotPresent
 
-kubeProxyImage: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
 utilsImage: busybox:latest
 
 extraEnv: []
@@ -59,6 +58,10 @@ affinity:
           values:
           - linux
 
+metrics:
+  enabled: false
+kubeProxyImage: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
+
 crds:
   enabled: true
 

diff --git a/charts/embedded-cluster-operator/values.yaml.tmpl b/charts/embedded-cluster-operator/values.yaml.tmpl
@@ -12,7 +12,6 @@ image:
   tag: ${OPERATOR_IMAGE_TAG}
   pullPolicy: IfNotPresent
 
-kubeProxyImage: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
 utilsImage: busybox:latest
 
 extraEnv: []
@@ -58,6 +57,10 @@ affinity:
           values:
           - linux
 
+metrics:
+  enabled: false
+kubeProxyImage: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
+
 crds:
   enabled: true