From d8e862d30092e3025ff145d3a8ea27d45f46f396 Mon Sep 17 00:00:00 2001
From: shreddedbacon <b@benjackson.email>
Date: Mon, 2 Dec 2024 08:37:52 +1100
Subject: [PATCH] chore: remove kube-rbac-proxy from lagoon-build-deploy

---
 charts/lagoon-build-deploy/Chart.yaml         |  6 +++---
 .../templates/deployment.yaml                 | 19 ++-----------------
 charts/lagoon-build-deploy/values.yaml        | 10 ----------
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/charts/lagoon-build-deploy/Chart.yaml b/charts/lagoon-build-deploy/Chart.yaml
index 3e1f5db52..aaccb62e6 100644
--- a/charts/lagoon-build-deploy/Chart.yaml
+++ b/charts/lagoon-build-deploy/Chart.yaml
@@ -16,14 +16,14 @@ kubeVersion: ">= 1.25.0-0"
 
 type: application
 
-version: 0.30.3
+version: 0.31.0
 
-appVersion: v0.20.3
+appVersion: v0.21.0
 
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: update controller to v0.20.3
+      description: update controller to v0.21.0
   artifacthub.io/crds: |
     - kind: LagoonBuild
       version: v1beta2
diff --git a/charts/lagoon-build-deploy/templates/deployment.yaml b/charts/lagoon-build-deploy/templates/deployment.yaml
index 2f6cd49dc..d974d1923 100644
--- a/charts/lagoon-build-deploy/templates/deployment.yaml
+++ b/charts/lagoon-build-deploy/templates/deployment.yaml
@@ -25,21 +25,6 @@ spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
-      - name: kube-rbac-proxy
-        securityContext:
-          {{- toYaml .Values.kubeRBACProxy.securityContext | nindent 10 }}
-        image: "{{ .Values.kubeRBACProxy.image.repository }}:{{ .Values.kubeRBACProxy.image.tag }}"
-        imagePullPolicy: {{ .Values.kubeRBACProxy.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
-        resources:
-          {{- toYaml .Values.kubeRBACProxy.resources | nindent 10 }}
       - name: manager
         securityContext:
           {{- toYaml .Values.securityContext | nindent 10 }}
@@ -51,8 +36,8 @@ spec:
         - containerPort: 9912
           name: metrics
         args:
-        - "--metrics-addr=127.0.0.1:8080"
-        - "--enable-leader-election=true"
+        - "--metrics-bind-address=127.0.0.1:8080"
+        - "--leader-elect=true"
         {{- if .Values.harbor.enabled }}
         - "--enable-harbor=true"
         - "--harbor-password={{ .Values.harbor.adminPassword }}"
diff --git a/charts/lagoon-build-deploy/values.yaml b/charts/lagoon-build-deploy/values.yaml
index 9aa29a240..0bf97527d 100644
--- a/charts/lagoon-build-deploy/values.yaml
+++ b/charts/lagoon-build-deploy/values.yaml
@@ -197,13 +197,3 @@ tolerations: []
 
 affinity: {}
 
-# this is a sidecar in the same pod as the lagoonBuildDeploy container
-kubeRBACProxy:
-  image:
-    repository: gcr.io/kubebuilder/kube-rbac-proxy
-    pullPolicy: IfNotPresent
-    tag: v0.4.1
-
-  securityContext: {}
-
-  resources: {}