(dev-v2.6-archive) Update kiali to 1.23.0

(partially cherry picked from commit d397bb512c)

packages/fleet-agent/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/fleet/releases/download/v0.3.0-beta1/fleet-agent-0.3.0-beta1.tgz
+url: https://github.com/rancher/fleet/releases/download/v0.3.0-alpha9/fleet-agent-0.3.0-alpha9.tgz
 packageVersion: 00

packages/fleet-crd/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/fleet/releases/download/v0.3.0-beta1/fleet-crd-0.3.0-beta1.tgz
+url: https://github.com/rancher/fleet/releases/download/v0.3.0-alpha9/fleet-crd-0.3.0-alpha9.tgz
 packageVersion: 00

packages/fleet/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/fleet/releases/download/v0.3.0-beta1/fleet-0.3.0-beta1.tgz
+url: https://github.com/rancher/fleet/releases/download/v0.3.0-alpha9/fleet-0.3.0-alpha9.tgz
 packageVersion: 00

packages/rancher-istio/charts/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: 1.6.8
+appVersion: 1.7.1
-description: Helm chart for installing istio components with the istioctl
+description: A basic Istio setup that installs with the istioctl. Refer to https://istio.io/latest/ for details.
 name: rancher-istio
-version: 1.6.800
+version: 1.7.100
 icon: https://charts.rancher.io/assets/logos/istio.svg
 keywords:
 - networking
@@ -13,4 +13,5 @@ annotations:
   catalog.cattle.io/release-name: rancher-istio
   catalog.cattle.io/ui-component: istio
   catalog.cattle.io/requires-gvr: monitoring.coreos.com.prometheus/v1
+  catalog.cattle.io/provides-gvr: networking.istio.io.virtualservice/v1beta1
   catalog.cattle.io/auto-install: rancher-kiali-server-crd=1.22.001

packages/rancher-istio/charts/configs/istio-base.yaml

@@ -4,14 +4,6 @@ spec:
   addonComponents:
     istiocoredns:
       enabled: {{ .Values.istiocoredns.enabled }}
-    prometheus:
-      enabled: false
-    grafana:
-      enabled: false
-    kiali:
-      enabled: false
-    tracing:
-      enabled: false
   components:
     base:
       enabled: {{ .Values.base.enabled }}

packages/rancher-istio/charts/requirements.yaml

@@ -3,5 +3,5 @@ dependencies:
   - name: rancher-kiali-server
     alias: kiali
     condition: kiali.enabled
-    version: 1.22.0
+    version: 1.23.0
     repository: file://../../rancher-kiali-server/charts

packages/rancher-istio/charts/values.yaml

@@ -1,6 +1,6 @@
 overlayFile: ""
-tag: 1.6.8
+tag: 1.7.1
-installerVersion: 1.6.8-rancher1
+installerVersion: 1.7.1-rancher1
 forceInstall: false
 
 istiocoredns:
@@ -18,7 +18,7 @@ base:
 cni:
     enabled: false
     repository: rancher/istio-install-cni
-    tag: 1.6.8
+    tag: 1.7.1
 
 egressGateways:
     enabled: false
@@ -34,17 +34,17 @@ istiodRemote:
 pilot:
     enabled: true
     repository: rancher/istio-pilot
-    tag: 1.6.8
+    tag: 1.7.1
 
 policy:
     enabled: true
     repository: rancher/istio-mixer
-    tag: 1.6.8
+    tag: 1.7.1
 
 telemetry:
     enabled: true
     repository: rancher/istio-mixer
-    tag: 1.6.8
+    tag: 1.7.1
 
 sidecarInjectorWebhook:
   enableNamespacesByDefault: false
@@ -58,10 +58,10 @@ global:
     systemDefaultRegistry: ""
   proxy:
     repository: rancher/istio-proxyv2
-    tag: 1.6.8
+    tag: 1.7.1
   proxy_init:
     repository: rancher/istio-proxyv2
-    tag: 1.6.8
+    tag: 1.7.1
   defaultPodDisruptionBudget:
     enabled: true
 
@@ -77,7 +77,7 @@ kiali:
   deployment:
     ingress_enabled: false
     repository: rancher/kiali-kiali
-    tag: v1.22.1
+    tag: v1.23.0
   external_services:
     prometheus:
       custom_metrics_url: "http://rancher-monitoring-prometheus.cattle-monitoring-system.svc:9090"

packages/rancher-kiali-server/package.yaml

@@ -1,4 +1,4 @@
-url: https://kiali.org/helm-charts/kiali-server-1.22.0.tgz
+url: https://kiali.org/helm-charts/kiali-server-1.23.0.tgz
 packageVersion: 01
 generateCRDChart:
   enabled: true

packages/rancher-kiali-server/rancher-kiali-server.patch

@@ -1,12 +1,12 @@
 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/Chart.yaml packages/rancher-kiali-server/charts/Chart.yaml
 --- packages/rancher-kiali-server/charts-original/Chart.yaml
 +++ packages/rancher-kiali-server/charts/Chart.yaml
-@@ -1,20 +1,28 @@
+@@ -1,20 +1,27 @@
  apiVersion: v2
- appVersion: v1.22.0
+ appVersion: v1.23.0
 -description: Kiali is an open source project for service mesh observability, refer
 -  to https://www.kiali.io for details.
-+description: Rancher chart based on Kiali Server, containing standard defaults. Installed as sub-chart with customized values in Rancher's Istio.
++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.
  home: https://github.com/kiali/kiali
  icon: https://raw.githubusercontent.com/kiali/kiali.io/master/themes/kiali/static/img/kiali_logo_masthead.png
  keywords:
@@ -34,13 +34,12 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/C
 +  - https://github.com/kiali/kiali-ui
 +  - https://github.com/kiali/kiali-operator
 +  - https://github.com/kiali/helm-charts
- version: 1.22.0
+ version: 1.23.0
 +annotations:
 +  catalog.cattle.io/requires-gvr: monitoring.coreos.com.prometheus/v1
 +  catalog.rancher.io/namespace: cattle-istio-system
 +  catalog.rancher.io/release-name: rancher-kiali-server
 +  catalog.cattle.io/hidden: true
-+  catalog.cattle.io/auto-install: rancher-kiali-server-crd=match
 +  catalog.cattle.io/provides-gvr: monitoringdashboards.monitoring.kiali.io/v1alpha1
 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
@@ -64,8 +63,8 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/t
  {{- end }}
 +
 +{{- define "system_default_registry" -}}
-+{{- if .Values.global.systemDefaultRegistry -}}
++{{- if .Values.global.cattle.systemDefaultRegistry -}}
-+{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
++{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
 +{{- else -}}
 +{{- "" -}}
 +{{- end -}}
@@ -123,7 +122,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/t
 +    {{- include "kiali-server.labels" . | nindent 4 }}
 +data:
 +  env.js: |
-+    window.WEB_ROOT='/k8s/clusters/{{ .Values.global.rancher.clusterId }}/api/v1/namespaces/{{ .Release.Namespace }}/services/http:rancher-istio-kiali:20001/proxy';
++    window.WEB_ROOT='/k8s/clusters/{{ .Values.global.cattle.clusterId }}/api/v1/namespaces/{{ .Release.Namespace }}/services/http:rancher-istio-kiali:20001/proxy';
 +{{- end }}
 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/values.yaml packages/rancher-kiali-server/charts/values.yaml
 --- packages/rancher-kiali-server/charts-original/values.yaml
@@ -136,9 +135,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/v
 +web_root_override: true
 +
  #
- # Settings that mimic the Kiali CR which are placed in the ConfigMap
+ # 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.
-@@ -57,10 +60,10 @@
+@@ -34,10 +37,10 @@
    custom_dashboards:
      excludes: ['']
      includes: ['*']
@@ -146,22 +145,20 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/v
 +  repository: rancher/kiali-kiali
    image_pull_policy: "Always"
    image_pull_secrets: []
--  image_version: v1.22.0
+-  image_version: v1.23.0
-+  tag: v1.22.0
++  tag: v1.23.0
    ingress_enabled: true
    node_selector: {}
    override_ingress_yaml:
-@@ -182,3 +185,13 @@
+@@ -66,3 +69,11 @@
-   web_fqdn: ""
+   metrics_enabled: true
+   metrics_port: 9090
    web_root: ""
-   web_schema: ""
 +
 +# Common settings used among istio subcharts.
 +global:
-+
 +  # Specify rancher clusterId of external tracing config
 +  # https://github.com/istio/istio.io/issues/4146#issuecomment-493543032
-+  rancher:
++  cattle:
++    systemDefaultRegistry: ""
 +    clusterId:
-+
-+  systemDefaultRegistry: ""

packages/rancher-monitoring/package.yaml

@@ -1,4 +1,4 @@
-url: https://github.com/prometheus-community/helm-charts/releases/download/kube-prometheus-stack-9.4.2/kube-prometheus-stack-9.4.2.tgz
+url: https://kubernetes-charts.storage.googleapis.com/prometheus-operator-8.16.1.tgz
 packageVersion: 00
 generateCRDChart:
   enabled: true

packages/rancher-operator-crd/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/rancher-operator/releases/download/v0.1.0-alpha7/rancher-operator-crd-0.1.0-alpha7.tgz
+url: https://github.com/rancher/rancher-operator/releases/download/v0.1.0-alpha6/rancher-operator-crd-0.1.0-alpha6.tgz
 packageVersion: 00

packages/rancher-operator/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/rancher-operator/releases/download/v0.1.0-alpha7/rancher-operator-0.1.0-alpha7.tgz
+url: https://github.com/rancher/rancher-operator/releases/download/v0.1.0-alpha6/rancher-operator-0.1.0-alpha6.tgz
 packageVersion: 00

packages/rio/charts/Chart.yaml

@@ -9,5 +9,4 @@ annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/namespace: rio-system
   catalog.cattle.io/release-name: rio
-  catalog.cattle.io/experimental: true
+  catalog.cattle.io/experimental: true
-  catalog.cattle.io/requires-gvr: networking.istio.io.virtualservice/v1beta1

packages/rio/charts/README.md

@@ -12,7 +12,12 @@ See values.yaml for installation options.
 
 ## Prerequisites
 
-Rio requires Kubernetes 1.15 or newer cluster.
+1. Rio requires Kubernetes 1.15 or newer cluster.
+1. Helm installed in the cluster. If Tiller and its service account are not already installed run the following:
+    ```bash
+    $ kubectl apply -f helm/tiller-serviceaccount.yaml
+    $ helm init --service-account tiller
+    ```
 
 ## Installation
 

packages/rio/charts/helm/tiller-serviceaccount.yaml

@@ -0,0 +1,20 @@
+# This grants Helm/tiller the cluster admin role.
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: tiller
+  namespace: kube-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: tiller-cluster-rule
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+- kind: ServiceAccount
+  name: tiller
+  namespace: kube-system
+