From a461c3cd0dc8c369d66d0fbaef0974583e47bc1f Mon Sep 17 00:00:00 2001 From: gcaracuel <633810+gcaracuel@users.noreply.github.com> Date: Mon, 28 Oct 2024 21:55:39 +0100 Subject: [PATCH 1/4] fix .Values.podAnnotations when in a with --- charts/tor-controller/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tor-controller/templates/deployment.yaml b/charts/tor-controller/templates/deployment.yaml index 6a24b94..b28a0b1 100644 --- a/charts/tor-controller/templates/deployment.yaml +++ b/charts/tor-controller/templates/deployment.yaml @@ -18,7 +18,7 @@ spec: rollme: {{ randAlphaNum 5 | quote }} {{- end }} {{- with .Values.podAnnotations }} - {{- toYaml .Values.podAnnotations | nindent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} labels: {{- include "tor-controller.selectorLabels" . | nindent 8 }} From 0e4642c89a27f9a8ecddbaa16bcf4df6bf099e31 Mon Sep 17 00:00:00 2001 From: Chase Sillevis Date: Mon, 30 Dec 2024 18:06:32 +0100 Subject: [PATCH 2/4] [feat] Allow customizing the rbac container --- .../tor-controller/templates/deployment.yaml | 5 +++- charts/tor-controller/values.yaml | 23 +++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/charts/tor-controller/templates/deployment.yaml b/charts/tor-controller/templates/deployment.yaml index 6a24b94..5abc24c 100644 --- a/charts/tor-controller/templates/deployment.yaml +++ b/charts/tor-controller/templates/deployment.yaml @@ -59,7 +59,8 @@ spec: name: manager-config subPath: controller_manager_config.yaml - name: kube-rbac-proxy - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 + 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/ @@ -69,6 +70,8 @@ spec: - containerPort: 8443 name: https protocol: TCP + resources: + {{- toYaml .Values.kubeRbacProxy.resources | nindent 12 }} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/tor-controller/values.yaml b/charts/tor-controller/values.yaml index e5479f2..5b3cd78 100644 --- a/charts/tor-controller/values.yaml +++ b/charts/tor-controller/values.yaml @@ -42,6 +42,24 @@ onionbalance: # -- Overrides the image tag whose default is the chart appVersion. tag: "" +kubeRbacProxy: + image: + repository: gcr.io/kubebuilder/kube-rbac-proxy + pullPolicy: IfNotPresent + # -- Overrides the image tag whose default is the chart appVersion. + tag: "v0.8.0" + resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 250m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + imagePullSecrets: [] nameOverride: "" fullnameOverride: "" @@ -64,7 +82,7 @@ securityContext: allowPrivilegeEscalation: false capabilities: drop: - - ALL + - ALL # readOnlyRootFilesystem: true runAsNonRoot: true # runAsUser: 1000 @@ -73,7 +91,8 @@ service: type: ClusterIP port: 8443 -resources: {} +resources: + {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following From 35002b923772b9b68a4c257582d0437d3d4c2e14 Mon Sep 17 00:00:00 2001 From: BugFest Date: Mon, 30 Dec 2024 22:17:12 +0100 Subject: [PATCH 3/4] fix: increase chart version --- charts/tor-controller/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tor-controller/Chart.yaml b/charts/tor-controller/Chart.yaml index 08f639a..5671582 100644 --- a/charts/tor-controller/Chart.yaml +++ b/charts/tor-controller/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.15 +version: 0.1.16 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to From aa1c636c69990ee92abb3594dfc542daf8cc0c2c Mon Sep 17 00:00:00 2001 From: BugFest Date: Mon, 30 Dec 2024 22:21:20 +0100 Subject: [PATCH 4/4] fix: increase chart version --- charts/tor-controller/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tor-controller/Chart.yaml b/charts/tor-controller/Chart.yaml index 5671582..156b08a 100644 --- a/charts/tor-controller/Chart.yaml +++ b/charts/tor-controller/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.16 +version: 0.1.17 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to