Merge pull request #176 from Farfaday/main

feat: Add possibility to set resources for the wait-for-redis initContainer
oauth2-proxy · Dec 7, 2023 · f5676f5 · f5676f5
2 parents 50692ad + 17cfc01
commit f5676f5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/helm/oauth2-proxy/Chart.yaml b/helm/oauth2-proxy/Chart.yaml
@@ -1,5 +1,5 @@
 name: oauth2-proxy
-version: 6.20.1
+version: 6.21.0
 apiVersion: v2
 appVersion: 7.5.1
 home: https://oauth2-proxy.github.io/oauth2-proxy/
@@ -34,8 +34,8 @@ maintainers:
 kubeVersion: ">=1.9.0-0"
 annotations:
   artifacthub.io/changes: |
-    - kind: fixed
-      description: Fixed service account role and rolebinding created in the wrong namespace
+    - kind: added
+      description: Add possibility to set resources for the wait-for-redis initContainer
       links:
         - name: Github PR
-          url: https://github.com/oauth2-proxy/manifests/pull/175
+          url: https://github.com/oauth2-proxy/manifests/pull/176
diff --git a/helm/oauth2-proxy/README.md b/helm/oauth2-proxy/README.md
@@ -149,6 +149,7 @@ Parameter | Description | Default
 `initContainers.waitForRedis.kubectlVersion` | kubectl version to use for the init container | `printf "%s.%s" .Capabilities.KubeVersion.Major (.Capabilities.KubeVersion.Minor | replace "+" "")`
 `initContainers.waitForRedis.securityContext.enabled` | enable Kubernetes security context on container | `true`
 `initContainers.waitForRedis.timeout` | number of seconds | 180
+`initContainers.waitForRedis.resources` | pod resource requests & limits | `{}`
 `livenessProbe.enabled`  | enable Kubernetes livenessProbe. Disable to use oauth2-proxy with Istio mTLS. See [Istio FAQ](https://istio.io/help/faq/security/#k8s-health-checks) | `true`
 `livenessProbe.initialDelaySeconds` | number of seconds | 0
 `livenessProbe.timeoutSeconds` | number of seconds | 1

diff --git a/helm/oauth2-proxy/templates/deployment.yaml b/helm/oauth2-proxy/templates/deployment.yaml
@@ -72,6 +72,8 @@ spec:
         securityContext:
           {{- toYaml $securityContext | nindent 10 }}
       {{- end }}
+        resources:
+          {{ toYaml .Values.initContainers.waitForRedis.resources | indent 10 }}
       {{- end }}
       {{- if .Values.terminationGracePeriodSeconds }}
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}

diff --git a/helm/oauth2-proxy/values.yaml b/helm/oauth2-proxy/values.yaml
@@ -292,6 +292,13 @@ initContainers:
       seccompProfile:
         type: RuntimeDefault
     timeout: 180
+    resources: {}
+      # limits:
+      #   cpu: 100m
+      #   memory: 300Mi
+      # requests:
+      #   cpu: 100m
+      #   memory: 300Mi
 
 # Additionally authenticate against a htpasswd file. Entries must be created with "htpasswd -B" for bcrypt encryption.
 # Alternatively supply an existing secret which contains the required information.