Skip to content

Commit 8bf7287

Browse files
authored
Registry Deployment template now gets image info from values.yaml (#660)
<!-- markdownlint-disable MD041 --> Address issue [502](open-component-model/ocm-project#502) #### Which issue(s) this PR fixes [502](open-component-model/ocm-project#502) --------- Signed-off-by: [email protected] <[email protected]>
1 parent 4119ac2 commit 8bf7287

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

deploy/templates/deployment_manager.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ spec:
1818
labels:
1919
app: ocm-controller
2020
spec:
21+
imagePullSecrets: {{ $.Values.manager.image.imagePullSecrets | toJson }}
2122
securityContext:
2223
runAsNonRoot: true
2324
seccompProfile:

deploy/templates/deployment_registry.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ spec:
1515
labels:
1616
app: registry
1717
spec:
18+
imagePullSecrets: {{ $.Values.registry.image.imagePullSecrets | toJson }}
1819
enableServiceLinks: true
1920
containers:
2021
- name: registry
21-
image: registry:2
22+
image: "{{ .Values.registry.image.repository }}:{{ .Values.registry.image.tag }}"
23+
imagePullPolicy: {{ .Values.registry.image.pullPolicy }}
2224
ports:
2325
- containerPort: 5000
2426
env:

deploy/values.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# This is a YAML-formatted file.
22
# Declare variables to be passed into your templates.
33
registry:
4+
image:
5+
repository: registry
6+
pullPolicy: IfNotPresent
7+
tag: 2
8+
imagePullSecrets:
49
address: registry.ocm-system.svc.cluster.local:5000
510
tls:
611
enabled: true
@@ -33,6 +38,7 @@ manager:
3338
pullPolicy: IfNotPresent
3439
# Overrides the image tag whose default is the chart appVersion.
3540
tag: ""
41+
imagePullSecrets:
3642
volumeMounts:
3743
- mountPath: "/etc/ssl/certs/registry-root.pem"
3844
subPath: "registry-root.pem"

0 commit comments

Comments
 (0)