From 878081691a3c12066d3b5469a537014e0ef16321 Mon Sep 17 00:00:00 2001 From: Vaishnav Gaikwad Date: Wed, 18 May 2022 16:24:08 +0530 Subject: [PATCH] istio-1.11/add kiali-server:1.41.0 --- .../generated-changes/patch/Chart.yaml.patch | 2 +- .../patch/templates/_helpers.tpl.patch | 9 +++------ .../patch/templates/deployment.yaml.patch | 10 +++++----- .../generated-changes/patch/values.yaml.patch | 14 +++++++------- .../1.11/rancher-kiali-server/package.yaml | 2 +- 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/packages/rancher-istio/1.11/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch b/packages/rancher-istio/1.11/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch index 1a3101524..11d791cdc 100644 --- a/packages/rancher-istio/1.11/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-istio/1.11/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch @@ -8,7 +8,7 @@ + catalog.rancher.io/namespace: cattle-istio-system + catalog.rancher.io/release-name: rancher-kiali-server apiVersion: v2 - appVersion: v1.50.0 + appVersion: v1.41.0 description: Kiali is an open source project for service mesh observability, refer - to https://www.kiali.io for details. + to https://www.kiali.io for details. This is installed as sub-chart with customized diff --git a/packages/rancher-istio/1.11/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch b/packages/rancher-istio/1.11/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch index 08f76c6e7..01bd1406b 100644 --- a/packages/rancher-istio/1.11/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch +++ b/packages/rancher-istio/1.11/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch @@ -17,13 +17,10 @@ {{- end }} {{/* -@@ -170,4 +177,27 @@ - {{- else }} - {{- .Release.Namespace }} +@@ -141,3 +148,26 @@ + {{- end }} + {{- end }} {{- end }} --{{- end }} -\ No newline at end of file -+{{- end }} + +{{- define "system_default_registry" -}} +{{- if .Values.global.cattle.systemDefaultRegistry -}} diff --git a/packages/rancher-istio/1.11/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch b/packages/rancher-istio/1.11/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch index d1ed69f21..b40aaafd0 100644 --- a/packages/rancher-istio/1.11/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch +++ b/packages/rancher-istio/1.11/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch @@ -1,7 +1,7 @@ --- charts-original/templates/deployment.yaml +++ charts/templates/deployment.yaml -@@ -53,7 +53,7 @@ - {{- toYaml .Values.deployment.host_aliases | nindent 6 }} +@@ -48,7 +48,7 @@ + {{- end }} {{- end }} containers: - - image: "{{ .Values.deployment.image_name }}{{ if .Values.deployment.image_digest }}@{{ .Values.deployment.image_digest }}{{ end }}:{{ .Values.deployment.image_version }}" @@ -9,7 +9,7 @@ imagePullPolicy: {{ .Values.deployment.image_pull_policy | default "Always" }} name: {{ include "kiali-server.fullname" . }} command: -@@ -108,6 +108,11 @@ +@@ -103,6 +103,11 @@ - name: LOG_SAMPLER_RATE value: "{{ .Values.deployment.logger.sampler_rate }}" volumeMounts: @@ -21,7 +21,7 @@ - name: {{ include "kiali-server.fullname" . }}-configuration mountPath: "/kiali-configuration" - name: {{ include "kiali-server.fullname" . }}-cert -@@ -125,6 +130,14 @@ +@@ -116,6 +121,14 @@ {{- toYaml .Values.deployment.resources | nindent 10 }} {{- end }} volumes: @@ -36,7 +36,7 @@ - name: {{ include "kiali-server.fullname" . }}-configuration configMap: name: {{ include "kiali-server.fullname" . }} -@@ -169,12 +182,12 @@ +@@ -154,12 +167,12 @@ {{- toYaml .Values.deployment.affinity.pod_anti | nindent 10 }} {{- end }} {{- end }} diff --git a/packages/rancher-istio/1.11/rancher-kiali-server/generated-changes/patch/values.yaml.patch b/packages/rancher-istio/1.11/rancher-kiali-server/generated-changes/patch/values.yaml.patch index 8a24f361c..a3000a186 100644 --- a/packages/rancher-istio/1.11/rancher-kiali-server/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-istio/1.11/rancher-kiali-server/generated-changes/patch/values.yaml.patch @@ -10,7 +10,7 @@ # # Settings that mimic the Kiali CR which are placed in the ConfigMap. # Note that only those values used by the Helm Chart will be here. -@@ -42,10 +45,10 @@ +@@ -39,10 +42,10 @@ api_version: "autoscaling/v2beta2" spec: {} image_digest: "" # use "sha256" if image_version is a sha256 hash (do NOT prefix this value with a "@") @@ -18,12 +18,12 @@ + repository: rancher/mirrored-kiali-kiali image_pull_policy: "Always" image_pull_secrets: [] -- image_version: v1.50.0 # version like "v1.39" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash -+ tag: v1.50.0 # version like "v1.39" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash - ingress: - additional_labels: {} - class_name: "nginx" -@@ -106,3 +109,13 @@ +- image_version: v1.41.0 # version like "v1.39" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash ++ tag: v1.41.0 # version like "v1.39" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash + ingress_enabled: true + instance_name: "kiali" + logger: +@@ -89,3 +92,13 @@ metrics_enabled: true metrics_port: 9090 web_root: "" diff --git a/packages/rancher-istio/1.11/rancher-kiali-server/package.yaml b/packages/rancher-istio/1.11/rancher-kiali-server/package.yaml index f6832be7f..cda647ee1 100644 --- a/packages/rancher-istio/1.11/rancher-kiali-server/package.yaml +++ b/packages/rancher-istio/1.11/rancher-kiali-server/package.yaml @@ -1,3 +1,3 @@ -url: https://kiali.org/helm-charts/kiali-server-1.50.0.tgz +url: https://kiali.org/helm-charts/kiali-server-1.41.0.tgz version: 100.0.0 doNotRelease: true \ No newline at end of file