Skip to content

Commit 88aaf0d

Browse files
authored
Add fully qualified image value (#723)
<!-- markdownlint-disable MD041 --> #### What this PR does / why we need it Add fully qualified image name to both manager and registry helm charts so they can be localized by OCM. #### Which issue(s) this PR fixes <!-- Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`. --> Fixes issue [595](open-component-model/ocm-project#595) --------- Signed-off-by: Henry Zeng <[email protected]>
1 parent f89d1f9 commit 88aaf0d

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

deploy/templates/deployment_manager.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ spec:
3333
{{- if not .Values.registry.tls.enabled }}
3434
- --oci-registry-insecure-skip-verify
3535
{{- end }}
36+
{{- if .Values.manager.image.fullyQualifiedImageName }}
37+
image: "{{ .Values.manager.image.fullyQualifiedImageName }}"
38+
{{- else }}
3639
image: "{{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag | default .Chart.AppVersion }}"
40+
{{- end }}
3741
name: manager
3842
imagePullPolicy: {{ .Values.manager.image.pullPolicy }}
3943
{{- if .Values.registry.tls.enabled }}

deploy/templates/deployment_registry.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ spec:
1919
enableServiceLinks: true
2020
containers:
2121
- name: registry
22+
{{- if .Values.registry.image.fullyQualifiedImageName }}
23+
image: "{{ .Values.registry.image.fullyQualifiedImageName }}"
24+
{{- else }}
2225
image: "{{ .Values.registry.image.repository }}:{{ .Values.registry.image.tag }}"
26+
{{- end }}
2327
imagePullPolicy: {{ .Values.registry.image.pullPolicy }}
2428
ports:
2529
- containerPort: 5000

deploy/values.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ registry:
2121
pullPolicy: IfNotPresent
2222
tag: 3
2323
imagePullSecrets:
24+
# A fully qualified image should be with format [registry_hostname[:port]/][namespace/]repository_name[:tag|@digest]
25+
# If set, it will override the repository and tag above
26+
fullyQualifiedImageName: ""
2427
address: registry.ocm-system.svc.cluster.local:5000
2528
tls:
2629
enabled: true
@@ -59,6 +62,9 @@ manager:
5962
# Overrides the image tag whose default is the chart appVersion.
6063
tag: ""
6164
imagePullSecrets:
65+
# A fully qualified image should be with format [registry_hostname[:port]/][namespace/]repository_name[:tag|@digest]
66+
# If set, it will override the repository and tag above
67+
fullyQualifiedImageName: ""
6268
volumeMounts:
6369
- mountPath: "/etc/ssl/certs/registry-root.pem"
6470
subPath: "registry-root.pem"

0 commit comments

Comments
 (0)