Skip to content

Commit

Permalink
Charts: enforce templating on the channel resource
Browse files Browse the repository at this point in the history
also remove the registry url from the default images reference:
resources are already templated getting the registry url from the
global.cattle.systemDefaultRegistry variable.

Signed-off-by: Francesco Giudici <francesco.giudici@suse.com>
  • Loading branch information
fgiudici committed Aug 23, 2023
1 parent 2f6f9d2 commit 3ee37b3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion charts/operator/templates/channel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ metadata:
namespace: fleet-default
spec:
options:
image: {{ .Values.channel.repository }}:{{ .Values.channel.tag }}
image: {{ template "system_default_registry" . }}{{ .Values.channel.repository }}:{{ .Values.channel.tag }}
type: custom
{{ end }}
8 changes: 6 additions & 2 deletions charts/operator/values.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
image:
empty: rancher/pause:3.1
repository: "quay.io/costoolkit/elemental-operator"
repository: "rancher/elemental-operator"
tag: latest
imagePullPolicy: IfNotPresent

seedImage:
repository: "quay.io/costoolkit/seedimage-builder"
repository: "rancher/seedimage-builder"
tag: latest
imagePullPolicy: IfNotPresent

#channel:
# repository: rancher/elemental-teal-channel
# tag: latest

# number of operator replicas to deploy
replicas: 1

Expand Down

0 comments on commit 3ee37b3

Please sign in to comment.