Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(base-cluster): use template instead of duplicated value #1050

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/base-cluster/templates/backup/velero.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
cleanUpCRDs: true
initContainers:
- name: velero-plugin-for-aws
image: {{ printf "%s/velero/velero-plugin-for-aws:v1.7.0" (.Values.global.imageRegistry | default "docker.io") }}
image: {{ printf "%s/velero/velero-plugin-for-aws:v1.7.0" (.Values.global.imageRegistry | default (include "base-cluster.defaultRegistry" (dict))) }}
imagePullPolicy: IfNotPresent
volumeMounts:
- mountPath: /target
Expand Down
6 changes: 3 additions & 3 deletions charts/base-cluster/templates/kyverno/kyverno.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ spec:
{{- else }}
test:
image:
registry: docker.io
registry: {{ include "base-cluster.defaultRegistry" (dict) }}
cleanupJobs:
admissionReports: &defaultImage
image:
registry: docker.io
registry: {{ include "base-cluster.defaultRegistry" (dict) }}
updateRequests: *defaultImage
ephemeralReports: *defaultImage
clusterEphemeralReports: *defaultImage
Expand All @@ -53,7 +53,7 @@ spec:
enable: true
{{- if not .Values.global.imageRegistry }}
image:
registry: docker.io
registry: {{ include "base-cluster.defaultRegistry" (dict) }}
{{- end }}
serviceMonitor:
enabled: {{ .Values.monitoring.prometheus.enabled }}
Expand Down