andata
/
rancher-charts
mirror of https://git.rancher.io/charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(dev-v2.6-archive) Update to rancher image, remove extra end in helper 

(partially cherry picked from commit 9808ea00df)
pull/1680/head
Brenda Rearden 2020-09-03 11:26:26 -07:00 committed by Arvind Iyengar
parent 97c85e9597
commit 93bfba0adb
No known key found for this signature in database
GPG Key ID: A8DD9BFD6C811498
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/rancher-kiali-server/rancher-kiali-server.patch
View File

@ -40,7 +40,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/C
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/templates/_helpers.tpl packages/rancher-kiali-server/charts/templates/_helpers.tpl diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/templates/_helpers.tpl packages/rancher-kiali-server/charts/templates/_helpers.tpl
--- packages/rancher-kiali-server/charts-original/templates/_helpers.tpl --- packages/rancher-kiali-server/charts-original/templates/_helpers.tpl
+++ packages/rancher-kiali-server/charts/templates/_helpers.tpl +++ packages/rancher-kiali-server/charts/templates/_helpers.tpl
@@ -17,10 +17,7 @@ @@ -17,11 +17,7 @@
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
{{- else }} {{- else }}
{{- $name := default .Chart.Name .Values.nameOverride }} {{- $name := default .Chart.Name .Values.nameOverride }}
@ -48,11 +48,12 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/t
- {{- .Release.Name | trunc 63 | trimSuffix "-" }} - {{- .Release.Name | trunc 63 | trimSuffix "-" }}
- {{- else }} - {{- else }}
- {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} - {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+ {{- printf "%s" $name | trunc 63 | trimSuffix "-" }} - {{- end }}
{{- end }} + {{- printf "%s" $name | trunc 63 | trimSuffix "-" }}
{{- end }} {{- end }}
{{- end }} {{- end }}
@@ -170,3 +167,11 @@
@@ -170,3 +166,11 @@
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
@ -137,7 +138,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/v
excludes: [''] excludes: ['']
includes: ['*'] includes: ['*']
- image_name: quay.io/kiali/kiali - image_name: quay.io/kiali/kiali
+ repository: kiali/kiali + repository: rancher/kiali-kiali
image_pull_policy: "Always" image_pull_policy: "Always"
image_pull_secrets: [] image_pull_secrets: []
- image_version: v1.22.0 - image_version: v1.22.0