Skip to content

Commit 7734015

Browse files
committed
feat: Add possibility to set resources for the wait-for-redis initContainer
1 parent 50692ad commit 7734015

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

helm/oauth2-proxy/Chart.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: oauth2-proxy
2-
version: 6.20.1
2+
version: 6.20.2
33
apiVersion: v2
44
appVersion: 7.5.1
55
home: https://oauth2-proxy.github.io/oauth2-proxy/
@@ -34,8 +34,8 @@ maintainers:
3434
kubeVersion: ">=1.9.0-0"
3535
annotations:
3636
artifacthub.io/changes: |
37-
- kind: fixed
38-
description: Fixed service account role and rolebinding created in the wrong namespace
37+
- kind: added
38+
description: Add possibility to set resources for the wait-for-redis initContainer
3939
links:
4040
- name: Github PR
41-
url: https://github.com/oauth2-proxy/manifests/pull/175
41+
url: https://github.com/oauth2-proxy/manifests/pull/176

helm/oauth2-proxy/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ Parameter | Description | Default
149149
`initContainers.waitForRedis.kubectlVersion` | kubectl version to use for the init container | `printf "%s.%s" .Capabilities.KubeVersion.Major (.Capabilities.KubeVersion.Minor | replace "+" "")`
150150
`initContainers.waitForRedis.securityContext.enabled` | enable Kubernetes security context on container | `true`
151151
`initContainers.waitForRedis.timeout` | number of seconds | 180
152+
`initContainers.waitForRedis.resources` | pod resource requests & limits | `{}`
152153
`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`
153154
`livenessProbe.initialDelaySeconds` | number of seconds | 0
154155
`livenessProbe.timeoutSeconds` | number of seconds | 1

helm/oauth2-proxy/templates/deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ spec:
7272
securityContext:
7373
{{- toYaml $securityContext | nindent 10 }}
7474
{{- end }}
75+
resources:
76+
{{ toYaml .Values.initContainers.waitForRedis.resources | indent 10 }}
7577
{{- end }}
7678
{{- if .Values.terminationGracePeriodSeconds }}
7779
terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}

helm/oauth2-proxy/values.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,13 @@ initContainers:
292292
seccompProfile:
293293
type: RuntimeDefault
294294
timeout: 180
295+
resources: {}
296+
# limits:
297+
# cpu: 100m
298+
# memory: 300Mi
299+
# requests:
300+
# cpu: 100m
301+
# memory: 300Mi
295302

296303
# Additionally authenticate against a htpasswd file. Entries must be created with "htpasswd -B" for bcrypt encryption.
297304
# Alternatively supply an existing secret which contains the required information.

0 commit comments

Comments
 (0)