Skip to content

Commit b70c902

Browse files
committed
Support global image registry
- introduce `.global.imageRegistry` value to allow global configuration of the image registry - split up `image.repository` into `image.registry` and `image.repository` to allow separate configuration - use `image.registry` if `.global.imageRegistry` is not set Signed-off-by: Fiete Ostkamp <F.Ostkamp@web.de>
1 parent 8ed6010 commit b70c902

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
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: 8.3.3
2+
version: 8.4.0
33
apiVersion: v2
44
appVersion: 7.13.0
55
home: https://oauth2-proxy.github.io/oauth2-proxy/
@@ -31,8 +31,8 @@ maintainers:
3131
kubeVersion: ">=1.16.0-0"
3232
annotations:
3333
artifacthub.io/changes: |
34-
- kind: changed
35-
description: Updated OAuth2-Proxy image to v7.13.0
34+
- kind: added
35+
description: Add .global.imageRegistry key to override image.registry
3636
links:
3737
- name: Github PR
38-
url: https://github.com/oauth2-proxy/manifests/pull/366
38+
url: https://github.com/oauth2-proxy/manifests/pull/367

helm/oauth2-proxy/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ spec:
108108
{{- end }}
109109
containers:
110110
- name: {{ .Chart.Name }}
111-
image: "{{ .Values.image.repository }}:{{ include "oauth2-proxy.version" . }}"
111+
image: "{{ .Values.global.imageRegistry | default .Values.image.registry }}/{{ .Values.image.repository }}:{{ include "oauth2-proxy.version" . }}"
112112
imagePullPolicy: {{ .Values.image.pullPolicy }}
113113
{{- if .Values.image.command }}
114114
command:

helm/oauth2-proxy/values.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
global: {}
2-
# To help compatibility with other charts which use global.imagePullSecrets.
3-
# global:
4-
# imagePullSecrets:
5-
# - name: pullSecret1
6-
# - name: pullSecret2
1+
global:
2+
# Global registry to pull the images from
3+
imageRegistry: ""
4+
# To help compatibility with other charts which use global.imagePullSecrets.
5+
imagePullSecrets: []
6+
# - name: pullSecret1
7+
# - name: pullSecret2
78

89
## Override the deployment namespace
910
##
@@ -75,7 +76,8 @@ alphaConfig:
7576
existingSecret: ~
7677

7778
image:
78-
repository: "quay.io/oauth2-proxy/oauth2-proxy"
79+
registry: "quay.io"
80+
repository: "oauth2-proxy/oauth2-proxy"
7981
# appVersion is used by default
8082
tag: ""
8183
pullPolicy: "IfNotPresent"

0 commit comments

Comments
 (0)