diff --git a/helm/oauth2-proxy/Chart.yaml b/helm/oauth2-proxy/Chart.yaml index 771dcb6..393d930 100644 --- a/helm/oauth2-proxy/Chart.yaml +++ b/helm/oauth2-proxy/Chart.yaml @@ -1,5 +1,5 @@ name: oauth2-proxy -version: 7.5.0 +version: 7.5.3 apiVersion: v2 appVersion: 7.6.0 home: https://oauth2-proxy.github.io/oauth2-proxy/ @@ -35,7 +35,7 @@ kubeVersion: ">=1.9.0-0" annotations: artifacthub.io/changes: | - kind: changed - description: Improved the readiness check for Redis to support all types + description: Redis parameters update in values links: - name: Github PR - url: https://github.com/oauth2-proxy/manifests/pull/197 + url: https://github.com/oauth2-proxy/manifests/issues/202 diff --git a/helm/oauth2-proxy/templates/deployment.yaml b/helm/oauth2-proxy/templates/deployment.yaml index f09b657..be20a45 100644 --- a/helm/oauth2-proxy/templates/deployment.yaml +++ b/helm/oauth2-proxy/templates/deployment.yaml @@ -222,6 +222,10 @@ spec: {{- end }} {{- if .Values.extraEnv }} {{ tpl (toYaml .Values.extraEnv) . | indent 8 }} + {{- end }} + {{- if .Values.envFrom }} + envFrom: +{{ tpl (toYaml .Values.envFrom) . | indent 8 }} {{- end }} ports: {{- if .Values.containerPort }} diff --git a/helm/oauth2-proxy/templates/servicemonitor.yaml b/helm/oauth2-proxy/templates/servicemonitor.yaml index bfb3084..3802666 100644 --- a/helm/oauth2-proxy/templates/servicemonitor.yaml +++ b/helm/oauth2-proxy/templates/servicemonitor.yaml @@ -44,7 +44,7 @@ spec: {{- end }} {{- with .Values.metrics.serviceMonitor.tlsConfig }} tlsConfig: - {{- toYaml .| nindent 4 }} + {{- toYaml .| nindent 6 }} {{- end }} {{- with .Values.metrics.serviceMonitor.metricRelabelings }} metricRelabelings: diff --git a/helm/oauth2-proxy/values.yaml b/helm/oauth2-proxy/values.yaml index c4fc488..3c373c6 100644 --- a/helm/oauth2-proxy/values.yaml +++ b/helm/oauth2-proxy/values.yaml @@ -86,6 +86,19 @@ image: extraArgs: {} extraEnv: [] +envFrom: [] +# Load environment variables from a ConfigMap(s) and/or Secret(s) +# that already exists (created and managed by you). +# ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#configure-all-key-value-pairs-in-a-configmap-as-container-environment-variables +# +# PS: Changes in these ConfigMaps or Secrets will not be automatically +# detected and you must manually restart the relevant Pods after changes. +# +# - configMapRef: +# name: special-config +# - secretRef: +# name: special-config-secret + # -- Custom labels to add into metadata customLabels: {} @@ -360,9 +373,7 @@ redis: # Redis specific helm chart settings, please see: # https://github.com/bitnami/charts/tree/master/bitnami/redis#parameters # redisPort: 6379 - # cluster: - # enabled: false - # slaveCount: 1 + # architecture: standalone # Enables apiVersion deprecation checks checkDeprecation: true