diff --git a/packages/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch b/packages/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch index cdcaf2e37..05f63fab1 100644 --- a/packages/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch @@ -1,8 +1,8 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -1,20 +1,29 @@ +@@ -1,20 +1,28 @@ apiVersion: v2 - appVersion: v1.35.0 + appVersion: v1.41.0 -description: Kiali is an open source project for service mesh observability, refer - to https://www.kiali.io for details. +description: Kiali is an open source project for service mesh observability, refer to https://www.kiali.io for details. This is installed as sub-chart with customized values in Rancher's Istio. @@ -24,7 +24,7 @@ - https://github.com/kiali/kiali-ui - https://github.com/kiali/kiali-operator - https://github.com/kiali/helm-charts - version: 1.35.0 + version: 1.41.0 +annotations: + catalog.cattle.io/requires-gvr: monitoring.coreos.com.prometheus/v1 + catalog.rancher.io/namespace: cattle-istio-system @@ -32,4 +32,3 @@ + catalog.cattle.io/hidden: true + catalog.cattle.io/provides-gvr: monitoringdashboards.monitoring.kiali.io/v1alpha1 + catalog.cattle.io/os: linux -+ catalog.cattle.io/auto-install: rancher-kiali-server-crd=match diff --git a/packages/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch b/packages/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch index 252aa1bc9..8bacb2c3e 100644 --- a/packages/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch +++ b/packages/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch @@ -17,7 +17,7 @@ {{- end }} {{/* -@@ -176,3 +183,11 @@ +@@ -141,3 +148,11 @@ {{- end }} {{- end }} {{- end }} diff --git a/packages/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch b/packages/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch index 706c390a0..ee23d0fdb 100644 --- a/packages/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch +++ b/packages/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch @@ -4,8 +4,8 @@ {{- end }} {{- end }} containers: -- - image: "{{ .Values.deployment.image_name }}:{{ .Values.deployment.image_version }}" -+ - image: "{{ template "system_default_registry" . }}{{ .Values.deployment.repository }}:{{ .Values.deployment.tag }}" +- - image: "{{ .Values.deployment.image_name }}{{ if .Values.deployment.image_digest }}@{{ .Values.deployment.image_digest }}{{ end }}:{{ .Values.deployment.image_version }}" ++ - image: "{{ template "system_default_registry" . }}{{ .Values.deployment.repository }}{{ if .Values.deployment.image_digest }}@{{ .Values.deployment.image_digest }}{{ end }}:{{ .Values.deployment.tag }}" imagePullPolicy: {{ .Values.deployment.image_pull_policy | default "Always" }} name: {{ include "kiali-server.fullname" . }} command: @@ -21,7 +21,7 @@ - name: {{ include "kiali-server.fullname" . }}-configuration mountPath: "/kiali-configuration" - name: {{ include "kiali-server.fullname" . }}-cert -@@ -118,6 +123,14 @@ +@@ -116,6 +121,14 @@ {{- toYaml .Values.deployment.resources | nindent 10 }} {{- end }} volumes: diff --git a/packages/rancher-kiali-server/generated-changes/patch/values.yaml.patch b/packages/rancher-kiali-server/generated-changes/patch/values.yaml.patch index 0c5278b7e..a9b92dc8c 100644 --- a/packages/rancher-kiali-server/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-kiali-server/generated-changes/patch/values.yaml.patch @@ -10,20 +10,20 @@ # # 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. -@@ -41,10 +44,10 @@ - hpa: +@@ -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 "@") - image_name: quay.io/kiali/kiali + repository: rancher/mirrored-kiali-kiali image_pull_policy: "Always" image_pull_secrets: [] -- image_version: v1.35.0 -+ tag: v1.35.0 +- 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: -@@ -83,3 +86,13 @@ +@@ -89,3 +92,13 @@ metrics_enabled: true metrics_port: 9090 web_root: "" @@ -37,3 +37,4 @@ + clusterId: + rbac: + pspEnabled: false +\ No newline at end of file diff --git a/packages/rancher-kiali-server/package.yaml b/packages/rancher-kiali-server/package.yaml index 1dad0de0b..cda647ee1 100644 --- a/packages/rancher-kiali-server/package.yaml +++ b/packages/rancher-kiali-server/package.yaml @@ -1,8 +1,3 @@ -url: https://kiali.org/helm-charts/kiali-server-1.35.0.tgz +url: https://kiali.org/helm-charts/kiali-server-1.41.0.tgz version: 100.0.0 -additionalCharts: - - workingDir: charts-crd - crdOptions: - templateDirectory: crd-template - crdDirectory: templates - addCRDValidationToMainChart: true +doNotRelease: true \ No newline at end of file diff --git a/packages/rancher-kiali-server/templates/crd-template/Chart.yaml b/packages/rancher-kiali-server/templates/crd-template/Chart.yaml index 811b50cff..41ae7cc19 100644 --- a/packages/rancher-kiali-server/templates/crd-template/Chart.yaml +++ b/packages/rancher-kiali-server/templates/crd-template/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -version: 1.35.0 +version: 1.41.0 description: Installs the CRDs for rancher-kiali-server. name: rancher-kiali-server-crd type: application diff --git a/packages/rancher-prom2teams/package.yaml b/packages/rancher-prom2teams/package.yaml index c9372f478..01b696e75 100644 --- a/packages/rancher-prom2teams/package.yaml +++ b/packages/rancher-prom2teams/package.yaml @@ -2,4 +2,3 @@ url: https://github.com/idealista/prom2teams.git subdirectory: helm commit: a1691cce91855536be93311fe6b2a4b95b9ce97c # the commit points to the tag 3.2.3 version: 100.0.1 -doNotRelease: true diff --git a/packages/rancher-sachet/package.yaml b/packages/rancher-sachet/package.yaml index 5d204f842..98913ea9a 100644 --- a/packages/rancher-sachet/package.yaml +++ b/packages/rancher-sachet/package.yaml @@ -1,3 +1,2 @@ url: local version: 100.0.1 -doNotRelease: true