chore(helm): deprecating metrics RBAC proxy

projectcapsule · May 8, 2021 · 6c44a6a · 6c44a6a
1 parent d6e7437
commit 6c44a6a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 39 deletions.
diff --git a/charts/capsule/README.md b/charts/capsule/README.md
@@ -75,13 +75,6 @@ Parameter | Description | Default
 `manager.resources.requests/memory` | Set the memory requests assigned to the controller. | `128Mi`
 `manager.resources.limits/cpu` | Set the CPU limits assigned to the controller. | `200m`
 `manager.resources.limits/cpu` | Set the memory limits assigned to the controller. | `128Mi`
-`proxy.image.repository` | Set the image repository of the rbac proxy. | `gcr.io/kubebuilder/kube-rbac-proxy`
-`proxy.image.tag` | Set the image tag of the rbac proxy. | `v0.5.0`
-`proxy.image.pullPolicy` | Set the image pull policy. | `IfNotPresent`
-`proxy.resources.requests/cpu` | Set the CPU requests assigned to the rbac proxy. | `10m`
-`proxy.resources.requests/memory` | Set the memory requests assigned to the rbac proxy. | `64Mi`
-`proxy.resources.limits/cpu` | Set the CPU limits assigned to the rbac proxy. | `100m`
-`proxy.resources.limits/cpu` | Set the memory limits assigned to the rbac proxy. | `128Mi`
 `mutatingWebhooksTimeoutSeconds` | Timeout in seconds for mutating webhooks. | `30`
 `validatingWebhooksTimeoutSeconds` | Timeout in seconds for validating webhooks. | `30`
 `imagePullSecrets` | Configuration for `imagePullSecrets` so that you can use a private images registry. | `[]`

diff --git a/charts/capsule/templates/deployment.yaml b/charts/capsule/templates/deployment.yaml
@@ -46,7 +46,6 @@ spec:
           command:
           - /manager
           args:
-          - --metrics-addr=127.0.0.1:8080
           - --enable-leader-election
           - --zap-log-level={{ default 4 .Values.manager.options.logLevel }}
           {{ if .Values.manager.options.forceTenantPrefix }}- --force-tenant-prefix={{ .Values.manager.options.forceTenantPrefix }}{{ end }}
@@ -65,6 +64,9 @@ spec:
             - name: webhook-server
               containerPort: 9443
               protocol: TCP
+            - name: metrics
+              containerPort: 8080
+              protocol: TCP
           livenessProbe:
             {{- toYaml .Values.manager.livenessProbe | nindent 12}}
           readinessProbe:
@@ -77,19 +79,3 @@ spec:
             {{- toYaml .Values.manager.resources | nindent 12 }}
           securityContext:
             allowPrivilegeEscalation: false
-        - name: kube-rbac-proxy
-          image: {{ include "capsule.proxyFullyQualifiedDockerImage" . }}
-          imagePullPolicy: {{ .Values.proxy.image.pullPolicy }}
-          args:
-          - --secure-listen-address=0.0.0.0:8443
-          - --upstream=http://127.0.0.1:8080/
-          - --logtostderr=true
-          - --v=10
-          ports:
-          - containerPort: 8443
-            name: https
-            protocol: TCP
-          resources:
-            {{- toYaml .Values.proxy.resources | nindent 12 }}
-          securityContext:
-            allowPrivilegeEscalation: false
diff --git a/charts/capsule/templates/metrics-service.yaml b/charts/capsule/templates/metrics-service.yaml
@@ -6,10 +6,10 @@ metadata:
     {{- include "capsule.labels" . | nindent 4 }}
 spec:
   ports:
-  - port: 8443
-    name: https
+  - port: 8080
+    name: metrics
     protocol: TCP
-    targetPort: https
+    targetPort: 8080
   selector:
     {{- include "capsule.selectorLabels" . | nindent 4 }}
   sessionAffinity: None

diff --git a/charts/capsule/values.yaml b/charts/capsule/values.yaml
@@ -31,18 +31,6 @@ manager:
     requests:
       cpu: 200m
       memory: 128Mi
-proxy:
-  image:
-    repository: gcr.io/kubebuilder/kube-rbac-proxy
-    pullPolicy: IfNotPresent
-    tag: "v0.5.0"
-  resources:
-    limits:
-      cpu: 100m
-      memory: 128Mi
-    requests:
-      cpu: 10m
-      memory: 64Mi
 jobs:
   image:
     repository: bitnami/kubectl