rancher-charts/packages/epinio/s3gw/generated-changes/patch/templates/_helpers.tpl.patch

--- charts-original/templates/_helpers.tpl
+++ charts/templates/_helpers.tpl
@@ -73,17 +73,17 @@
 */}}
 {{- define "s3gw.image" -}}
 {{- $defaulttag := printf "v%s" .Chart.Version }}
-{{- $tag := default $defaulttag .Values.imageTag }}
-{{- $name := default "s3gw/s3gw" .Values.imageName }}
-{{- $registry := default "quay.io" .Values.imageRegistry }}
-{{- printf "%s/%s:%s" $registry $name $tag }}
+{{- $tag := default $defaulttag .Values.image.tag }}
+{{- $name := default "s3gw/s3gw" .Values.image.repository }}
+{{- $registry := include "registry-url" . }}
+{{- printf "%s%s:%s" $registry $name $tag }}
 {{- end }}
 
 {{- define "s3gw-ui.image" -}}
-{{- $tag := default (printf "v%s" .Chart.Version) .Values.ui.imageTag }}
-{{- $name := default "s3gw/s3gw-ui" .Values.ui.imageName }}
-{{- $registry := default "quay.io" .Values.imageRegistry }}
-{{- printf "%s/%s:%s" $registry $name $tag }}
+{{- $tag := default (printf "v%s" .Chart.Version) .Values.ui.image.tag }}
+{{- $name := default "s3gw/s3gw-ui" .Values.ui.image.repository }}
+{{- $registry := include "registry-url" . }}
+{{- printf "%s%s:%s" $registry $name $tag }}
 {{- end }}
 
 {{/*
@@ -93,7 +93,7 @@
 {{- $un := .Values.imageCredentials.username }}
 {{- $pw := .Values.imageCredentials.password }}
 {{- $em := .Values.imageCredentials.email }}
-{{- $rg := .Values.imageRegistry }}
+{{- $rg := include "registry-url" . }}
 {{- $au := (printf "%s:%s" $un $pw | b64enc) }}
 {{- printf "{\"auths\":{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}}}" $rg $un $pw $em $au | b64enc}}
 {{- end }}
@@ -110,3 +110,31 @@
 {{- $key := default (randAlphaNum 32) .Values.secretKey }}
 {{- printf "%s" $key }}
 {{- end }}
+
+{{/*
+Windows cluster will add default taint for linux nodes, add below linux tolerations to
+workloads could be scheduled to those linux nodes
+*/}}
+{{- define "linux-node-tolerations" -}}
+- key: "cattle.io/os"
+  value: "linux"
+  effect: "NoSchedule"
+  operator: "Equal"
+{{- end -}}
+
+{{- define "linux-node-selector" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+beta.kubernetes.io/os: linux
+{{- else -}}
+kubernetes.io/os: linux
+{{- end -}}
+{{- end -}}
+
+{{/*
+URL prefix for container images to be compatible with Rancher
+*/}}
+{{- define "registry-url" -}}
+{{- if .Values.global.cattle.systemDefaultRegistry -}}
+{{ trimSuffix "/" .Values.global.cattle.systemDefaultRegistry }}/
+{{- end -}}
+{{- end -}}