diff --git a/assets/rancher-istio/rancher-istio-106.0.0+up1.22.1.tgz b/assets/rancher-istio/rancher-istio-106.0.0+up1.22.1.tgz new file mode 100644 index 0000000000..dd09d670fb Binary files /dev/null and b/assets/rancher-istio/rancher-istio-106.0.0+up1.22.1.tgz differ diff --git a/assets/rancher-istio/rancher-istio-106.1.0+up1.23.2.tgz b/assets/rancher-istio/rancher-istio-106.1.0+up1.23.2.tgz new file mode 100644 index 0000000000..da122380bf Binary files /dev/null and b/assets/rancher-istio/rancher-istio-106.1.0+up1.23.2.tgz differ diff --git a/assets/rancher-istio/rancher-istio-106.2.0+up1.24.1.tgz b/assets/rancher-istio/rancher-istio-106.2.0+up1.24.1.tgz new file mode 100644 index 0000000000..b7465b83fe Binary files /dev/null and b/assets/rancher-istio/rancher-istio-106.2.0+up1.24.1.tgz differ diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/Chart.yaml b/charts/rancher-istio/106.0.0+up1.22.1/Chart.yaml similarity index 75% rename from packages/rancher-istio/1.21/rancher-istio/charts/Chart.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/Chart.yaml index d8176b88cc..1964bfc43f 100644 --- a/packages/rancher-istio/1.21/rancher-istio/charts/Chart.yaml +++ b/charts/rancher-istio/106.0.0+up1.22.1/Chart.yaml @@ -1,19 +1,19 @@ annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/display-name: Istio - catalog.cattle.io/kube-version: '>= 1.26.0-0 < 1.30.0-0' + catalog.cattle.io/kube-version: '>= 1.27.0-0 < 1.31.0-0' catalog.cattle.io/namespace: istio-system catalog.cattle.io/os: linux catalog.cattle.io/permits-os: linux,windows - catalog.cattle.io/rancher-version: '>= 2.10.0-0 < 2.11.0-0' + catalog.cattle.io/rancher-version: '>= 2.11.0-0 < 2.12.0-0' catalog.cattle.io/release-name: rancher-istio catalog.cattle.io/requests-cpu: 710m catalog.cattle.io/requests-memory: 2314Mi catalog.cattle.io/type: cluster-tool catalog.cattle.io/ui-component: istio - catalog.cattle.io/upstream-version: 1.21.1 + catalog.cattle.io/upstream-version: 1.22.1 apiVersion: v1 -appVersion: 1.21.1 +appVersion: 1.22.1 description: A basic Istio setup that installs with the istioctl. Refer to https://istio.io/latest/ for details. icon: https://charts.rancher.io/assets/logos/istio.svg @@ -21,4 +21,4 @@ keywords: - networking - infrastructure name: rancher-istio -version: 1.21.1 +version: 106.0.0+up1.22.1 diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/README.md b/charts/rancher-istio/106.0.0+up1.22.1/README.md similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/README.md rename to charts/rancher-istio/106.0.0+up1.22.1/README.md diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/app-readme.md b/charts/rancher-istio/106.0.0+up1.22.1/app-readme.md similarity index 98% rename from packages/rancher-istio/1.21/rancher-istio/charts/app-readme.md rename to charts/rancher-istio/106.0.0+up1.22.1/app-readme.md index df1f81fe5c..284f0720f3 100644 --- a/packages/rancher-istio/1.21/rancher-istio/charts/app-readme.md +++ b/charts/rancher-istio/106.0.0+up1.22.1/app-readme.md @@ -38,7 +38,7 @@ To install istio with CNI enabled, e.g. when cluster has a default PSP set to "r See [this issue](https://github.com/rancher/rancher/issues/33291) for details. ## Installing istio with distroless-images. -Istio `104.3.0+up1.21.1` uses distroless images for `istio-proxyv2`, `istio-install-cni` and `istio-pilot`. Distroless images don't have the common debugging tools like `bash`, `curl`, etc. If you wish to troubleshoot Istio, you can switch to regular images by updating `values.yaml` file. +Istio `104.4.0+up1.22.1` uses distroless images for `istio-proxyv2`, `istio-install-cni` and `istio-pilot`. Distroless images don't have the common debugging tools like `bash`, `curl`, etc. If you wish to troubleshoot Istio, you can switch to regular images by updating `values.yaml` file. ## Deprecations diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/Chart.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/Chart.yaml new file mode 100644 index 0000000000..d117115029 --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/Chart.yaml @@ -0,0 +1,28 @@ +annotations: + catalog.cattle.io/hidden: "true" + catalog.cattle.io/os: linux + 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 +apiVersion: v2 +appVersion: v1.86.0 +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/current/assets/icons/logo.svg +keywords: +- istio +- kiali +- networking +- infrastructure +maintainers: +- email: kiali-users@googlegroups.com + name: Kiali + url: https://kiali.io +name: kiali +sources: +- https://github.com/kiali/kiali +- https://github.com/kiali/kiali-operator +- https://github.com/kiali/helm-charts +version: 1.86.0 diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/NOTES.txt b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/NOTES.txt new file mode 100644 index 0000000000..751019401b --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/NOTES.txt @@ -0,0 +1,5 @@ +Welcome to Kiali! For more details on Kiali, see: https://kiali.io + +The Kiali Server [{{ .Chart.AppVersion }}] has been installed in namespace [{{ .Release.Namespace }}]. It will be ready soon. + +(Helm: Chart=[{{ .Chart.Name }}], Release=[{{ .Release.Name }}], Version=[{{ .Chart.Version }}]) diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/_helpers.tpl b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/_helpers.tpl new file mode 100644 index 0000000000..91c9ff0ca5 --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/_helpers.tpl @@ -0,0 +1,222 @@ +{{/* vim: set filetype=mustache: */}} + +{{/* +Create a default fully qualified instance name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +To simulate the way the operator works, use deployment.instance_name rather than the old fullnameOverride. +For backwards compatibility, if fullnameOverride is not kiali but deployment.instance_name is kiali, +use fullnameOverride, otherwise use deployment.instance_name. +*/}} +{{- define "kiali-server.fullname" -}} +{{- if (and (eq .Values.deployment.instance_name "kiali") (ne .Values.fullnameOverride "kiali")) }} + {{- .Values.fullnameOverride | trunc 63 }} +{{- else }} + {{- .Values.deployment.instance_name | trunc 63 }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "kiali-server.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Identifies the log_level. +*/}} +{{- define "kiali-server.logLevel" -}} +{{- .Values.deployment.logger.log_level -}} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "kiali-server.labels" -}} +helm.sh/chart: {{ include "kiali-server.chart" . }} +app: kiali +{{ include "kiali-server.selectorLabels" . }} +version: {{ .Values.deployment.version_label | default .Chart.AppVersion | quote }} +app.kubernetes.io/version: {{ .Values.deployment.version_label | default .Chart.AppVersion | quote }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +app.kubernetes.io/part-of: "kiali" +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "kiali-server.selectorLabels" -}} +{{- $releaseName := .Release.Name -}} +{{- $fullName := include "kiali-server.fullname" . -}} +{{- $deployment := (lookup "apps/v1" "Deployment" .Release.Namespace $fullName) -}} +app.kubernetes.io/name: kiali +{{- if (and .Release.IsUpgrade $deployment)}} +app.kubernetes.io/instance: {{ (get (($deployment).metadata.labels) "app.kubernetes.io/instance") | default $fullName }} +{{- else }} +app.kubernetes.io/instance: {{ $fullName }} +{{- end }} +{{- end }} + +{{/* +Determine the default login token signing key. +*/}} +{{- define "kiali-server.login_token.signing_key" -}} +{{- if .Values.login_token.signing_key }} + {{- .Values.login_token.signing_key }} +{{- else }} + {{- randAlphaNum 16 }} +{{- end }} +{{- end }} + +{{/* +Determine the default web root. +*/}} +{{- define "kiali-server.server.web_root" -}} +{{- if .Values.server.web_root }} + {{- if (eq .Values.server.web_root "/") }} + {{- .Values.server.web_root }} + {{- else }} + {{- .Values.server.web_root | trimSuffix "/" }} + {{- end }} +{{- else }} + {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} + {{- "/" }} + {{- else }} + {{- "/kiali" }} + {{- end }} +{{- end }} +{{- end }} + +{{/* +Determine the default identity cert file. There is no default if on k8s; only on OpenShift. +*/}} +{{- define "kiali-server.identity.cert_file" -}} +{{- if hasKey .Values.identity "cert_file" }} + {{- .Values.identity.cert_file }} +{{- else }} + {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} + {{- "/kiali-cert/tls.crt" }} + {{- else }} + {{- "" }} + {{- end }} +{{- end }} +{{- end }} + +{{/* +Determine the default identity private key file. There is no default if on k8s; only on OpenShift. +*/}} +{{- define "kiali-server.identity.private_key_file" -}} +{{- if hasKey .Values.identity "private_key_file" }} + {{- .Values.identity.private_key_file }} +{{- else }} + {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} + {{- "/kiali-cert/tls.key" }} + {{- else }} + {{- "" }} + {{- end }} +{{- end }} +{{- end }} + +{{/* +Determine the default deployment.ingress.enabled. Disable it on k8s; enable it on OpenShift. +*/}} +{{- define "kiali-server.deployment.ingress.enabled" -}} +{{- if hasKey .Values.deployment.ingress "enabled" }} + {{- .Values.deployment.ingress.enabled }} +{{- else }} + {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} + {{- true }} + {{- else }} + {{- false }} + {{- end }} +{{- end }} +{{- end }} + +{{/* +Determine the istio namespace - default is where Kiali is installed. +*/}} +{{- define "kiali-server.istio_namespace" -}} +{{- if .Values.istio_namespace }} + {{- .Values.istio_namespace }} +{{- else }} + {{- .Release.Namespace }} +{{- end }} +{{- end }} + +{{/* +Determine the auth strategy to use - default is "token" on Kubernetes and "openshift" on OpenShift. +*/}} +{{- define "kiali-server.auth.strategy" -}} +{{- if .Values.auth.strategy }} + {{- if (and (eq .Values.auth.strategy "openshift") (not .Values.kiali_route_url)) }} + {{- fail "You did not define what the Kiali Route URL will be (--set kiali_route_url=...). Without this set, the openshift auth strategy will not work. Either set that or use a different auth strategy via the --set auth.strategy=... option." }} + {{- end }} + {{- .Values.auth.strategy }} +{{- else }} + {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} + {{- if not .Values.kiali_route_url }} + {{- fail "You did not define what the Kiali Route URL will be (--set kiali_route_url=...). Without this set, the openshift auth strategy will not work. Either set that or explicitly indicate another auth strategy you want via the --set auth.strategy=... option." }} + {{- end }} + {{- "openshift" }} + {{- else }} + {{- "token" }} + {{- end }} +{{- end }} +{{- end }} + +{{/* +Determine the root namespace - default is where Kiali is installed. +*/}} +{{- define "kiali-server.external_services.istio.root_namespace" -}} +{{- if .Values.external_services.istio.root_namespace }} + {{- .Values.external_services.istio.root_namespace }} +{{- else }} + {{- .Release.Namespace }} +{{- end }} +{{- end }} + +{{- define "system_default_registry" -}} +{{- if .Values.global.cattle.systemDefaultRegistry -}} +{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}} +{{- else -}} +{{- "" -}} +{{- end -}} +{{- 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" -}} +kubernetes.io/os: linux +{{- end -}} + +{{/* +Autodetect remote cluster secrets if enabled - looks for secrets in the same namespace where Kiali is installed. +Returns a JSON dict whose keys are the cluster names and values are the cluster secret data. +*/}} +{{- define "kiali-server.remote-cluster-secrets" -}} +{{- $theDict := dict }} +{{- if .Values.clustering.autodetect_secrets.enabled }} + {{- $secretLabelToLookFor := (regexSplit "=" .Values.clustering.autodetect_secrets.label 2) }} + {{- $secretLabelNameToLookFor := first $secretLabelToLookFor }} + {{- $secretLabelValueToLookFor := last $secretLabelToLookFor }} + {{- range $i, $secret := (lookup "v1" "Secret" .Release.Namespace "").items }} + {{- if (and (and (hasKey $secret.metadata "labels") (hasKey $secret.metadata.labels $secretLabelNameToLookFor)) (eq (get $secret.metadata.labels $secretLabelNameToLookFor) ($secretLabelValueToLookFor))) }} + {{- $clusterName := $secret.metadata.name }} + {{- if (and (hasKey $secret.metadata "annotations") (hasKey $secret.metadata.annotations "kiali.io/cluster")) }} + {{- $clusterName = get $secret.metadata.annotations "kiali.io/cluster" }} + {{- end }} + {{- $theDict = set $theDict $clusterName $secret.metadata.name }} + {{- end }} + {{- end }} +{{- end }} +{{- $theDict | toJson }} +{{- end }} diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/cabundle.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/cabundle.yaml new file mode 100644 index 0000000000..7462b95a7f --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/cabundle.yaml @@ -0,0 +1,13 @@ +{{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "kiali-server.fullname" . }}-cabundle + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} + annotations: + service.beta.openshift.io/inject-cabundle: "true" +... +{{- end }} diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/configmap.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/configmap.yaml new file mode 100644 index 0000000000..f7b68294d7 --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/configmap.yaml @@ -0,0 +1,30 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} + {{- if .Values.deployment.configmap_annotations }} + annotations: + {{- toYaml .Values.deployment.configmap_annotations | nindent 4 }} + {{- end }} +data: + config.yaml: | + {{- /* Most of .Values is simply the ConfigMap - strip out the keys that are not part of the ConfigMap */}} + {{- $cm := omit .Values "nameOverride" "fullnameOverride" "kiali_route_url" }} + {{- /* The helm chart defines namespace for us, but pass it to the ConfigMap in case the server needs it */}} + {{- $_ := set $cm.deployment "namespace" .Release.Namespace }} + {{- /* Some values of the ConfigMap are generated, but might not be identical, from .Values */}} + {{- $_ := set $cm "istio_namespace" (include "kiali-server.istio_namespace" .) }} + {{- $_ := set $cm.auth "strategy" (include "kiali-server.auth.strategy" .) }} + {{- $_ := set $cm.auth.openshift "client_id_prefix" (include "kiali-server.fullname" .) }} + {{- $_ := set $cm.deployment "instance_name" (include "kiali-server.fullname" .) }} + {{- $_ := set $cm.identity "cert_file" (include "kiali-server.identity.cert_file" .) }} + {{- $_ := set $cm.identity "private_key_file" (include "kiali-server.identity.private_key_file" .) }} + {{- $_ := set $cm.login_token "signing_key" (include "kiali-server.login_token.signing_key" .) }} + {{- $_ := set $cm.external_services.istio "root_namespace" (include "kiali-server.external_services.istio.root_namespace" .) }} + {{- $_ := set $cm.server "web_root" (include "kiali-server.server.web_root" .) }} + {{- toYaml $cm | nindent 4 }} +... diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/deployment.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/deployment.yaml new file mode 100644 index 0000000000..dfb5d24081 --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/deployment.yaml @@ -0,0 +1,238 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": post-install, post-upgrade + "helm.sh/hook-weight": "-4" +spec: + replicas: {{ .Values.deployment.replicas }} + selector: + matchLabels: + {{- include "kiali-server.selectorLabels" . | nindent 6 }} + strategy: + rollingUpdate: + maxSurge: 1 + maxUnavailable: 1 + type: RollingUpdate + template: + metadata: + name: {{ include "kiali-server.fullname" . }} + labels: + {{- include "kiali-server.labels" . | nindent 8 }} + {{- if .Values.deployment.pod_labels }} + {{- toYaml .Values.deployment.pod_labels | nindent 8 }} + {{- end }} + annotations: + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- if .Values.server.observability.metrics.enabled }} + prometheus.io/scrape: "true" + prometheus.io/port: {{ .Values.server.observability.metrics.port | quote }} + {{- else }} + prometheus.io/scrape: "false" + prometheus.io/port: "" + {{- end }} + kiali.io/dashboards: go,kiali + {{- if .Values.deployment.pod_annotations }} + {{- toYaml .Values.deployment.pod_annotations | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ include "kiali-server.fullname" . }} + {{- if .Values.deployment.priority_class_name }} + priorityClassName: {{ .Values.deployment.priority_class_name | quote }} + {{- end }} + {{- if .Values.deployment.image_pull_secrets }} + imagePullSecrets: + {{- range .Values.deployment.image_pull_secrets }} + - name: {{ . }} + {{- end }} + {{- end }} + {{- if .Values.deployment.host_aliases }} + hostAliases: + {{- toYaml .Values.deployment.host_aliases | nindent 6 }} + {{- end }} + {{- if .Values.deployment.dns }} + {{- if .Values.deployment.dns.policy }} + dnsPolicy: "{{ .Values.deployment.dns.policy }}" + {{- end }} + {{- if .Values.deployment.dns.config }} + dnsConfig: + {{- toYaml .Values.deployment.dns.config | nindent 8 }} + {{- end }} + {{- end }} + containers: + - 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: + - "/opt/kiali/kiali" + - "-config" + - "/kiali-configuration/config.yaml" + securityContext: + {{- if .Values.deployment.security_context}} + {{- toYaml .Values.deployment.security_context | nindent 10 }} + {{- else }} + allowPrivilegeEscalation: false + privileged: false + readOnlyRootFilesystem: true + runAsNonRoot: true + capabilities: + drop: + - ALL + {{- end }} + ports: + - name: api-port + containerPort: {{ .Values.server.port | default 20001 }} + {{- if .Values.server.observability.metrics.enabled }} + - name: http-metrics + containerPort: {{ .Values.server.observability.metrics.port | default 9090 }} + {{- end }} + readinessProbe: + httpGet: + path: {{ include "kiali-server.server.web_root" . | trimSuffix "/" }}/healthz + port: api-port + {{- if (include "kiali-server.identity.cert_file" .) }} + scheme: HTTPS + {{- else }} + scheme: HTTP + {{- end }} + initialDelaySeconds: 5 + periodSeconds: 30 + livenessProbe: + httpGet: + path: {{ include "kiali-server.server.web_root" . | trimSuffix "/" }}/healthz + port: api-port + {{- if (include "kiali-server.identity.cert_file" .) }} + scheme: HTTPS + {{- else }} + scheme: HTTP + {{- end }} + initialDelaySeconds: 5 + periodSeconds: 30 + env: + - name: ACTIVE_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: LOG_LEVEL + value: "{{ include "kiali-server.logLevel" . }}" + - name: LOG_FORMAT + value: "{{ .Values.deployment.logger.log_format }}" + - name: LOG_TIME_FIELD_FORMAT + value: "{{ .Values.deployment.logger.time_field_format }}" + - name: LOG_SAMPLER_RATE + value: "{{ .Values.deployment.logger.sampler_rate }}" + volumeMounts: + {{- if .Values.web_root_override }} + - name: kiali-console + subPath: env.js + mountPath: /opt/kiali/console/env.js + {{- end }} + - name: {{ include "kiali-server.fullname" . }}-configuration + mountPath: "/kiali-configuration" + - name: {{ include "kiali-server.fullname" . }}-cert + mountPath: "/kiali-cert" + - name: {{ include "kiali-server.fullname" . }}-secret + mountPath: "/kiali-secret" + - name: {{ include "kiali-server.fullname" . }}-cabundle + mountPath: "/kiali-cabundle" + {{- range .Values.deployment.custom_secrets }} + - name: {{ .name }} + mountPath: "{{ .mount }}" + {{- end }} + {{- range $key, $val := (include "kiali-server.remote-cluster-secrets" .) | fromJson }} + - name: {{ $key }} + mountPath: "/kiali-remote-cluster-secrets/{{ $val }}" + {{- end }} + {{- range .Values.clustering.clusters }} + {{- if .secret_name }} + - name: {{ .name }} + mountPath: "/kiali-remote-cluster-secrets/{{ .secret_name }}" + {{- end }} + {{- end }} + {{- if .Values.deployment.resources }} + resources: + {{- toYaml .Values.deployment.resources | nindent 10 }} + {{- end }} + volumes: + {{- if .Values.web_root_override }} + - name: kiali-console + configMap: + name: kiali-console + items: + - key: env.js + path: env.js + {{- end }} + - name: {{ include "kiali-server.fullname" . }}-configuration + configMap: + name: {{ include "kiali-server.fullname" . }} + - name: {{ include "kiali-server.fullname" . }}-cert + secret: + {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} + secretName: {{ include "kiali-server.fullname" . }}-cert-secret + {{- else }} + secretName: istio.{{ include "kiali-server.fullname" . }}-service-account + {{- end }} + {{- if not (include "kiali-server.identity.cert_file" .) }} + optional: true + {{- end }} + - name: {{ include "kiali-server.fullname" . }}-secret + secret: + secretName: {{ .Values.deployment.secret_name }} + optional: true + - name: {{ include "kiali-server.fullname" . }}-cabundle + configMap: + name: {{ include "kiali-server.fullname" . }}-cabundle + {{- if not (.Capabilities.APIVersions.Has "route.openshift.io/v1") }} + optional: true + {{- end }} + {{- range .Values.deployment.custom_secrets }} + - name: {{ .name }} + {{- if .csi}} + csi: {{ toYaml .csi | nindent 10 }} + {{- else }} + secret: + secretName: {{ .name }} + optional: {{ .optional | default false }} + {{- end }} + {{- end }} + {{- range $key, $val := (include "kiali-server.remote-cluster-secrets" .) | fromJson }} + - name: {{ $key }} + secret: + secretName: {{ $val }} + {{- end }} + {{- range .Values.clustering.clusters }} + {{- if .secret_name }} + - name: {{ .name }} + secret: + secretName: {{ .secret_name }} + {{- end }} + {{- end }} + {{- if or (.Values.deployment.affinity.node) (or (.Values.deployment.affinity.pod) (.Values.deployment.affinity.pod_anti)) }} + affinity: + {{- if .Values.deployment.affinity.node }} + nodeAffinity: + {{- toYaml .Values.deployment.affinity.node | nindent 10 }} + {{- end }} + {{- if .Values.deployment.affinity.pod }} + podAffinity: + {{- toYaml .Values.deployment.affinity.pod | nindent 10 }} + {{- end }} + {{- if .Values.deployment.affinity.pod_anti }} + podAntiAffinity: + {{- toYaml .Values.deployment.affinity.pod_anti | nindent 10 }} + {{- end }} + {{- end }} + tolerations: {{ include "linux-node-tolerations" . | nindent 8 }} +{{- if .Values.deployment.tolerations }} +{{ toYaml .Values.deployment.tolerations | indent 8 }} +{{- end }} + nodeSelector: {{ include "linux-node-selector" . | nindent 8 }} +{{- if .Values.deployment.node_selector }} +{{ toYaml .Values.deployment.node_selector | indent 8 }} +{{- end }} +... diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/hpa.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/hpa.yaml new file mode 100644 index 0000000000..934c4c1e9d --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/hpa.yaml @@ -0,0 +1,17 @@ +{{- if .Values.deployment.hpa.spec }} +--- +apiVersion: {{ .Values.deployment.hpa.api_version }} +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "kiali-server.fullname" . }} + {{- toYaml .Values.deployment.hpa.spec | nindent 2 }} +... +{{- end }} diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/ingress.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/ingress.yaml new file mode 100644 index 0000000000..27807fc3de --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/ingress.yaml @@ -0,0 +1,62 @@ +{{- if not (.Capabilities.APIVersions.Has "route.openshift.io/v1") }} +{{- if eq "true" (include "kiali-server.deployment.ingress.enabled" .) }} +--- +{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} +apiVersion: networking.k8s.io/v1 +{{- else }} +apiVersion: networking.k8s.io/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- if .Values.deployment.ingress.additional_labels }} + {{- toYaml .Values.deployment.ingress.additional_labels | nindent 4 }} + {{- end }} + {{- include "kiali-server.labels" . | nindent 4 }} + annotations: + {{- if .Values.deployment.ingress.override_yaml.metadata.annotations }} + {{- toYaml .Values.deployment.ingress.override_yaml.metadata.annotations | nindent 4 }} + {{- else }} + # For ingress-nginx versions older than 0.20.0 use secure-backends. + # (see: https://github.com/kubernetes/ingress-nginx/issues/3416#issuecomment-438247948) + # For ingress-nginx versions 0.20.0 and later use backend-protocol. + {{- if (include "kiali-server.identity.cert_file" .) }} + nginx.ingress.kubernetes.io/secure-backends: "true" + nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" + {{- else }} + nginx.ingress.kubernetes.io/secure-backends: "false" + nginx.ingress.kubernetes.io/backend-protocol: "HTTP" + {{- end }} + {{- end }} +spec: + {{- if hasKey .Values.deployment.ingress.override_yaml "spec" }} + {{- toYaml .Values.deployment.ingress.override_yaml.spec | nindent 2 }} + {{- else }} + {{- if .Values.deployment.ingress.class_name }} + ingressClassName: {{ .Values.deployment.ingress.class_name }} + {{- end }} + rules: + - http: + paths: + - path: {{ include "kiali-server.server.web_root" . }} + {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} + pathType: Prefix + backend: + service: + name: {{ include "kiali-server.fullname" . }} + port: + number: {{ .Values.server.port }} + {{- else }} + backend: + serviceName: {{ include "kiali-server.fullname" . }} + servicePort: {{ .Values.server.port }} + {{- end }} + {{- if not (empty .Values.server.web_fqdn) }} + host: {{ .Values.server.web_fqdn }} + {{- end }} + {{- end }} +... +{{- end }} +{{- end }} diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/oauth.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/oauth.yaml new file mode 100644 index 0000000000..44c8d7cbb1 --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/oauth.yaml @@ -0,0 +1,25 @@ +{{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} +{{- if .Values.kiali_route_url }} +--- +apiVersion: oauth.openshift.io/v1 +kind: OAuthClient +metadata: + name: {{ include "kiali-server.fullname" . }}-{{ .Release.Namespace }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +redirectURIs: +- {{ .Values.kiali_route_url }} +{{- if .Values.server.web_port }} +- {{ .Values.kiali_route_url }}:{{ .Values.server.web_port }} +{{- end }} +grantMethod: auto +{{- if .Values.auth.openshift.token_inactivity_timeout }} +accessTokenInactivityTimeoutSeconds: {{ .Values.auth.openshift.token_inactivity_timeout }} +{{- end }} +{{- if .Values.auth.openshift.token_max_age }} +accessTokenMaxAgeSeconds: {{ .Values.auth.openshift.token_max_age }} +{{- end }} +... +{{- end }} +{{- end }} diff --git a/packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/overlay/templates/psp.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/psp.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/overlay/templates/psp.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/psp.yaml diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/role-controlplane.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/role-controlplane.yaml new file mode 100644 index 0000000000..707501c677 --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/role-controlplane.yaml @@ -0,0 +1,23 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: {{ include "kiali-server.fullname" . }}-controlplane + namespace: {{ include "kiali-server.istio_namespace" . }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +rules: +{{- if .Values.kiali_feature_flags.certificates_information_indicators.enabled }} +- apiGroups: [""] + resourceNames: + {{- range .Values.kiali_feature_flags.certificates_information_indicators.secrets }} + - {{ . }} + {{- end }} + resources: + - secrets + verbs: + - get + - list + - watch +{{- end }} +... diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/role-viewer.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/role-viewer.yaml new file mode 100644 index 0000000000..0811b20118 --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/role-viewer.yaml @@ -0,0 +1,96 @@ +{{- if or (.Values.deployment.view_only_mode) (ne .Values.auth.strategy "anonymous") -}} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: {{ include "kiali-server.fullname" . }}-viewer + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +rules: +- apiGroups: [""] + resources: + - configmaps + - endpoints +{{- if not (has "logs-tab" .Values.kiali_feature_flags.disabled_features) }} + - pods/log +{{- end }} + verbs: + - get + - list + - watch +- apiGroups: [""] + resources: + - namespaces + - pods + - replicationcontrollers + - services + verbs: + - get + - list + - watch +- apiGroups: [""] + resources: + - pods/portforward + verbs: + - create + - post +- apiGroups: ["extensions", "apps"] + resources: + - daemonsets + - deployments + - replicasets + - statefulsets + verbs: + - get + - list + - watch +- apiGroups: ["batch"] + resources: + - cronjobs + - jobs + verbs: + - get + - list + - watch +- apiGroups: + - networking.istio.io + - security.istio.io + - extensions.istio.io + - telemetry.istio.io + - gateway.networking.k8s.io + resources: ["*"] + verbs: + - get + - list + - watch +- apiGroups: ["apps.openshift.io"] + resources: + - deploymentconfigs + verbs: + - get + - list + - watch +- apiGroups: ["project.openshift.io"] + resources: + - projects + verbs: + - get +- apiGroups: ["route.openshift.io"] + resources: + - routes + verbs: + - get +- apiGroups: ["authentication.k8s.io"] + resources: + - tokenreviews + verbs: + - create +- apiGroups: ["oauth.openshift.io"] + resources: + - oauthclients + resourceNames: + - {{ include "kiali-server.fullname" . }}-{{ .Release.Namespace }} + verbs: + - get +... +{{- end -}} diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/role.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/role.yaml new file mode 100644 index 0000000000..de23cc5c83 --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/role.yaml @@ -0,0 +1,103 @@ +{{- if not (or (.Values.deployment.view_only_mode) (ne .Values.auth.strategy "anonymous")) -}} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: {{ include "kiali-server.fullname" . }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +rules: +- apiGroups: [""] + resources: + - configmaps + - endpoints +{{- if not (has "logs-tab" .Values.kiali_feature_flags.disabled_features) }} + - pods/log +{{- end }} + verbs: + - get + - list + - watch +- apiGroups: [""] + resources: + - namespaces + - pods + - replicationcontrollers + - services + verbs: + - get + - list + - watch + - patch +- apiGroups: [""] + resources: + - pods/portforward + verbs: + - create + - post +- apiGroups: ["extensions", "apps"] + resources: + - daemonsets + - deployments + - replicasets + - statefulsets + verbs: + - get + - list + - watch + - patch +- apiGroups: ["batch"] + resources: + - cronjobs + - jobs + verbs: + - get + - list + - watch + - patch +- apiGroups: + - networking.istio.io + - security.istio.io + - extensions.istio.io + - telemetry.istio.io + - gateway.networking.k8s.io + resources: ["*"] + verbs: + - get + - list + - watch + - create + - delete + - patch +- apiGroups: ["apps.openshift.io"] + resources: + - deploymentconfigs + verbs: + - get + - list + - watch + - patch +- apiGroups: ["project.openshift.io"] + resources: + - projects + verbs: + - get +- apiGroups: ["route.openshift.io"] + resources: + - routes + verbs: + - get +- apiGroups: ["authentication.k8s.io"] + resources: + - tokenreviews + verbs: + - create +- apiGroups: ["oauth.openshift.io"] + resources: + - oauthclients + resourceNames: + - {{ include "kiali-server.fullname" . }}-{{ .Release.Namespace }} + verbs: + - get +... +{{- end -}} diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/rolebinding-controlplane.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/rolebinding-controlplane.yaml new file mode 100644 index 0000000000..5a00158360 --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/rolebinding-controlplane.yaml @@ -0,0 +1,17 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: {{ include "kiali-server.fullname" . }}-controlplane + namespace: {{ include "kiali-server.istio_namespace" . }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: {{ include "kiali-server.fullname" . }}-controlplane +subjects: +- kind: ServiceAccount + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} +... diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/rolebinding.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/rolebinding.yaml new file mode 100644 index 0000000000..63f1922ac1 --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/rolebinding.yaml @@ -0,0 +1,24 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + {{- if or (.Values.deployment.view_only_mode) (ne .Values.auth.strategy "anonymous") }} + name: {{ include "kiali-server.fullname" . }}-viewer + {{- else }} + name: {{ include "kiali-server.fullname" . }} + {{- end }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + {{- if or (.Values.deployment.view_only_mode) (ne .Values.auth.strategy "anonymous") }} + name: {{ include "kiali-server.fullname" . }}-viewer + {{- else }} + name: {{ include "kiali-server.fullname" . }} + {{- end }} +subjects: +- kind: ServiceAccount + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} +... diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/route.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/route.yaml new file mode 100644 index 0000000000..8325c14a74 --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/route.yaml @@ -0,0 +1,34 @@ +{{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} +{{- if eq "true" (include "kiali-server.deployment.ingress.enabled" .) }} +# As of OpenShift 4.5, need to use --disable-openapi-validation when installing via Helm +--- +apiVersion: route.openshift.io/v1 +kind: Route +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- if .Values.deployment.ingress.additional_labels }} + {{- toYaml .Values.deployment.ingress.additional_labels | nindent 4 }} + {{- end }} + {{- include "kiali-server.labels" . | nindent 4 }} + {{- if .Values.deployment.ingress.override_yaml.metadata.annotations }} + annotations: + {{- toYaml .Values.deployment.ingress.override_yaml.metadata.annotations | nindent 4 }} + {{- end }} +spec: + {{- if hasKey .Values.deployment.ingress.override_yaml "spec" }} + {{- toYaml .Values.deployment.ingress.override_yaml.spec | nindent 2 }} + {{- else }} + tls: + termination: reencrypt + insecureEdgeTerminationPolicy: Redirect + to: + kind: Service + name: {{ include "kiali-server.fullname" . }} + port: + targetPort: {{ .Values.server.port }} + {{- end }} +... +{{- end }} +{{- end }} diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/service.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/service.yaml new file mode 100644 index 0000000000..111be7f879 --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/service.yaml @@ -0,0 +1,51 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} + annotations: + {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} + service.beta.openshift.io/serving-cert-secret-name: {{ include "kiali-server.fullname" . }}-cert-secret + {{- end }} + {{- if and (not (empty .Values.server.web_fqdn)) (not (empty .Values.server.web_schema)) }} + {{- if empty .Values.server.web_port }} + kiali.io/external-url: {{ .Values.server.web_schema }}://{{ .Values.server.web_fqdn }}{{ include "kiali-server.server.web_root" . }} + {{- else }} + kiali.io/external-url: {{ .Values.server.web_schema }}://{{ .Values.server.web_fqdn }}:{{ .Values.server.web_port }}{{ include "kiali-server.server.web_root" . }} + {{- end }} + {{- end }} + {{- if .Values.deployment.service_annotations }} + {{- toYaml .Values.deployment.service_annotations | nindent 4 }} + {{- end }} +spec: + {{- if .Values.deployment.service_type }} + type: {{ .Values.deployment.service_type }} + {{- end }} + ports: + {{- if (include "kiali-server.identity.cert_file" .) }} + - name: tcp + appProtocol: https + {{- else }} + - name: http + appProtocol: http + {{- end }} + protocol: TCP + port: {{ .Values.server.port }} + {{- if and (not (empty .Values.server.node_port)) (eq .Values.deployment.service_type "NodePort") }} + nodePort: {{ .Values.server.node_port }} + {{- end }} + {{- if .Values.server.observability.metrics.enabled }} + - name: http-metrics + appProtocol: http + protocol: TCP + port: {{ .Values.server.observability.metrics.port }} + {{- end }} + selector: + {{- include "kiali-server.selectorLabels" . | nindent 4 }} + {{- if .Values.deployment.additional_service_yaml }} + {{- toYaml .Values.deployment.additional_service_yaml | nindent 2 }} + {{- end }} +... diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/serviceaccount.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/serviceaccount.yaml new file mode 100644 index 0000000000..9151b6f6a1 --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/serviceaccount.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +... diff --git a/packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/overlay/templates/validate-psp-install.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/validate-psp-install.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/overlay/templates/validate-psp-install.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/validate-psp-install.yaml diff --git a/packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/overlay/templates/web-root-configmap.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/web-root-configmap.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/overlay/templates/web-root-configmap.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/templates/web-root-configmap.yaml diff --git a/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/values.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/values.yaml new file mode 100644 index 0000000000..4e9c57da3d --- /dev/null +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/kiali/values.yaml @@ -0,0 +1,136 @@ +# 'fullnameOverride' is deprecated. Use 'deployment.instance_name' instead. +# This is only supported for backward compatibility and will be removed in a future version. +# If 'fullnameOverride' is not "kiali" and 'deployment.instance_name' is "kiali", +# then 'deployment.instance_name' will take the value of 'fullnameOverride' value. +# Otherwise, 'fullnameOverride' is ignored and 'deployment.instance_name' is used. +fullnameOverride: "kiali" + +# This is required for "openshift" auth strategy. +# You have to know ahead of time what your Route URL will be because +# right now the helm chart can't figure this out at runtime (it would +# need to wait for the Kiali Route to be deployed and for OpenShift +# to start it up). If someone knows how to update this helm chart to +# do this, a PR would be welcome. +kiali_route_url: "" + +# rancher specific override that allows proxy access to kiali url +web_root_override: true +# +# 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. +# + +additional_display_details: +- annotation: kiali.io/api-spec + icon_annotation: kiali.io/api-type + title: API Documentation + +istio_namespace: "" # default is where Kiali is installed + +auth: + openid: {} + openshift: {} + strategy: "" + +clustering: + autodetect_secrets: + enabled: true + label: "kiali.io/multiCluster=true" + clusters: [] + +deployment: + # This only limits what Kiali will attempt to see, but Kiali Service Account has permissions to see everything. + # For more control over what the Kial Service Account can see, use the Kiali Operator + accessible_namespaces: + - "**" + additional_service_yaml: {} + affinity: + node: {} + pod: {} + pod_anti: {} + configmap_annotations: {} + custom_secrets: [] + dns: + config: {} + policy: "" + host_aliases: [] + hpa: + api_version: "autoscaling/v2" + spec: {} + image_digest: "" # use "sha256" if image_version is a sha256 hash (do NOT prefix this value with a "@") + repository: rancher/mirrored-kiali-kiali + image_pull_policy: "Always" + image_pull_secrets: [] + tag: v1.86.0 # version like "v1.39" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash + ingress: + additional_labels: {} + class_name: "nginx" + #enabled: + override_yaml: + metadata: {} + instance_name: "kiali" + logger: + log_format: "text" + log_level: "info" + time_field_format: "2006-01-02T15:04:05Z07:00" + sampler_rate: "1" + node_selector: {} + pod_annotations: {} + pod_labels: {} + priority_class_name: "" + replicas: 1 + resources: + requests: + cpu: "10m" + memory: "64Mi" + limits: + memory: "1Gi" + secret_name: "kiali" + security_context: {} + service_annotations: {} + service_type: "" + tolerations: [] + version_label: v1.86.0 # v1.39 # v1.39.0 # see: https://quay.io/repository/kiali/kiali?tab=tags + view_only_mode: false + +external_services: + custom_dashboards: + enabled: true + istio: + root_namespace: "" + +identity: {} + #cert_file: + #private_key_file: + +kiali_feature_flags: + certificates_information_indicators: + enabled: true + secrets: + - cacerts + - istio-ca-secret + disabled_features: [] + validations: + ignore: ["KIA1301"] + +login_token: + signing_key: "" + +server: + port: 20001 + #node_port: + observability: + metrics: + enabled: true + port: 9090 + web_root: "" + +# Common settings used among istio subcharts. +global: + # Specify rancher clusterId of external tracing config + # https://github.com/istio/istio.io/issues/4146#issuecomment-493543032 + cattle: + systemDefaultRegistry: "" + clusterId: + psp: + enabled: false \ No newline at end of file diff --git a/packages/rancher-istio/1.19/rancher-tracing/charts/.helmignore b/charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/.helmignore similarity index 100% rename from packages/rancher-istio/1.19/rancher-tracing/charts/.helmignore rename to charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/.helmignore diff --git a/packages/rancher-istio/1.19/rancher-tracing/charts/Chart.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/Chart.yaml similarity index 87% rename from packages/rancher-istio/1.19/rancher-tracing/charts/Chart.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/Chart.yaml index 7fdc7accb9..87c13ce47e 100644 --- a/packages/rancher-istio/1.19/rancher-tracing/charts/Chart.yaml +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/Chart.yaml @@ -5,8 +5,8 @@ annotations: catalog.rancher.io/namespace: istio-system catalog.rancher.io/release-name: rancher-tracing apiVersion: v1 -appVersion: 1.52.0 +appVersion: 1.57.0 description: A quick start Jaeger Tracing installation using the all-in-one demo. This is not production qualified. Refer to https://www.jaegertracing.io/ for details. -name: rancher-tracing -version: 1.52.0 +name: tracing +version: 1.57.0 diff --git a/packages/rancher-istio/1.19/rancher-tracing/charts/README.md b/charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/README.md similarity index 100% rename from packages/rancher-istio/1.19/rancher-tracing/charts/README.md rename to charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/README.md diff --git a/packages/rancher-istio/1.19/rancher-tracing/charts/templates/_affinity.tpl b/charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/_affinity.tpl similarity index 100% rename from packages/rancher-istio/1.19/rancher-tracing/charts/templates/_affinity.tpl rename to charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/_affinity.tpl diff --git a/packages/rancher-istio/1.19/rancher-tracing/charts/templates/_helpers.tpl b/charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/_helpers.tpl similarity index 100% rename from packages/rancher-istio/1.19/rancher-tracing/charts/templates/_helpers.tpl rename to charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/_helpers.tpl diff --git a/packages/rancher-istio/1.19/rancher-tracing/charts/templates/deployment.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/deployment.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-tracing/charts/templates/deployment.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/deployment.yaml diff --git a/packages/rancher-istio/1.19/rancher-tracing/charts/templates/psp.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/psp.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-tracing/charts/templates/psp.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/psp.yaml diff --git a/packages/rancher-istio/1.19/rancher-tracing/charts/templates/pvc.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/pvc.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-tracing/charts/templates/pvc.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/pvc.yaml diff --git a/packages/rancher-istio/1.20/rancher-tracing/charts/templates/service.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/service.yaml similarity index 92% rename from packages/rancher-istio/1.20/rancher-tracing/charts/templates/service.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/service.yaml index 4210a9b5fc..3ee5a54247 100644 --- a/packages/rancher-istio/1.20/rancher-tracing/charts/templates/service.yaml +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/service.yaml @@ -59,5 +59,12 @@ spec: port: 14250 targetPort: 14250 protocol: TCP + - port: 9411 + targetPort: 9411 + name: http-zipkin + - port: 4317 + name: grpc-otel + - port: 4318 + name: http-otel selector: app: {{ .Values.provider }} diff --git a/packages/rancher-istio/1.19/rancher-tracing/charts/templates/serviceaccount.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/serviceaccount.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-tracing/charts/templates/serviceaccount.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/serviceaccount.yaml diff --git a/packages/rancher-istio/1.19/rancher-tracing/charts/templates/validate-psp-install.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/validate-psp-install.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-tracing/charts/templates/validate-psp-install.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/templates/validate-psp-install.yaml diff --git a/packages/rancher-istio/1.21/rancher-tracing/charts/values.yaml b/charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/values.yaml similarity index 98% rename from packages/rancher-istio/1.21/rancher-tracing/charts/values.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/values.yaml index d6debaf4d4..0070dee9d4 100644 --- a/packages/rancher-istio/1.21/rancher-tracing/charts/values.yaml +++ b/charts/rancher-istio/106.0.0+up1.22.1/charts/tracing/values.yaml @@ -31,7 +31,7 @@ global: jaeger: repository: rancher/mirrored-jaegertracing-all-in-one - tag: 1.56.0 + tag: 1.57.0 # spanStorageType value can be "memory" and "badger" for all-in-one image spanStorageType: badger resources: diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/configs/istio-base.yaml b/charts/rancher-istio/106.0.0+up1.22.1/configs/istio-base.yaml similarity index 97% rename from packages/rancher-istio/1.20/rancher-istio/charts/configs/istio-base.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/configs/istio-base.yaml index 9d99112e36..17fb5ff8c3 100644 --- a/packages/rancher-istio/1.20/rancher-istio/charts/configs/istio-base.yaml +++ b/charts/rancher-istio/106.0.0+up1.22.1/configs/istio-base.yaml @@ -96,6 +96,11 @@ spec: revision: {{ .Values.revision }} meshConfig: defaultConfig: + {{- if .Values.tracing.enabled }} + tracing: + zipkin: + address: {{ .Values.tracing.zipkinAddress }} + {{- end }} proxyMetadata: {{- if .Values.dns.enabled }} ISTIO_META_DNS_CAPTURE: "true" diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/requirements.yaml b/charts/rancher-istio/106.0.0+up1.22.1/requirements.yaml similarity index 82% rename from packages/rancher-istio/1.20/rancher-istio/charts/requirements.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/requirements.yaml index 73bc894951..9e21bd425d 100644 --- a/packages/rancher-istio/1.20/rancher-istio/charts/requirements.yaml +++ b/charts/rancher-istio/106.0.0+up1.22.1/requirements.yaml @@ -2,8 +2,8 @@ dependencies: - condition: kiali.enabled name: kiali repository: file://./charts/kiali - version: 1.78.0 + version: 1.86.0 - condition: tracing.enabled name: tracing repository: file://./charts/tracing - version: 1.53.0 + version: 1.57.0 diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/samples/overlay-example.yaml b/charts/rancher-istio/106.0.0+up1.22.1/samples/overlay-example.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/samples/overlay-example.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/samples/overlay-example.yaml diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/templates/_helpers.tpl b/charts/rancher-istio/106.0.0+up1.22.1/templates/_helpers.tpl similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/templates/_helpers.tpl rename to charts/rancher-istio/106.0.0+up1.22.1/templates/_helpers.tpl diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/templates/admin-role.yaml b/charts/rancher-istio/106.0.0+up1.22.1/templates/admin-role.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/templates/admin-role.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/templates/admin-role.yaml diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/templates/base-config-map.yaml b/charts/rancher-istio/106.0.0+up1.22.1/templates/base-config-map.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/templates/base-config-map.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/templates/base-config-map.yaml diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/templates/clusterrole.yaml b/charts/rancher-istio/106.0.0+up1.22.1/templates/clusterrole.yaml similarity index 95% rename from packages/rancher-istio/1.19/rancher-istio/charts/templates/clusterrole.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/templates/clusterrole.yaml index f8f229987d..31163f9325 100644 --- a/packages/rancher-istio/1.19/rancher-istio/charts/templates/clusterrole.yaml +++ b/charts/rancher-istio/106.0.0+up1.22.1/templates/clusterrole.yaml @@ -123,6 +123,14 @@ rules: - serviceaccounts verbs: - '*' +- apiGroups: + - "" + resources: + - nodes + verbs: + - 'get' + - 'list' + - 'watch' {{- if and .Values.global.cattle.psp.enabled }} - apiGroups: - policy diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/templates/clusterrolebinding.yaml b/charts/rancher-istio/106.0.0+up1.22.1/templates/clusterrolebinding.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/templates/clusterrolebinding.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/templates/clusterrolebinding.yaml diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/templates/edit-role.yaml b/charts/rancher-istio/106.0.0+up1.22.1/templates/edit-role.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/templates/edit-role.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/templates/edit-role.yaml diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/templates/istio-cni-psp.yaml b/charts/rancher-istio/106.0.0+up1.22.1/templates/istio-cni-psp.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/templates/istio-cni-psp.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/templates/istio-cni-psp.yaml diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/templates/istio-install-job.yaml b/charts/rancher-istio/106.0.0+up1.22.1/templates/istio-install-job.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/templates/istio-install-job.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/templates/istio-install-job.yaml diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/templates/istio-install-psp.yaml b/charts/rancher-istio/106.0.0+up1.22.1/templates/istio-install-psp.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/templates/istio-install-psp.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/templates/istio-install-psp.yaml diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/templates/istio-psp.yaml b/charts/rancher-istio/106.0.0+up1.22.1/templates/istio-psp.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/templates/istio-psp.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/templates/istio-psp.yaml diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/templates/istio-uninstall-job.yaml b/charts/rancher-istio/106.0.0+up1.22.1/templates/istio-uninstall-job.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/templates/istio-uninstall-job.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/templates/istio-uninstall-job.yaml diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/templates/overlay-config-map.yaml b/charts/rancher-istio/106.0.0+up1.22.1/templates/overlay-config-map.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/templates/overlay-config-map.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/templates/overlay-config-map.yaml diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/templates/service-monitors.yaml b/charts/rancher-istio/106.0.0+up1.22.1/templates/service-monitors.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/templates/service-monitors.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/templates/service-monitors.yaml diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/templates/serviceaccount.yaml b/charts/rancher-istio/106.0.0+up1.22.1/templates/serviceaccount.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/templates/serviceaccount.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/templates/serviceaccount.yaml diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/templates/validate-psp-install.yaml b/charts/rancher-istio/106.0.0+up1.22.1/templates/validate-psp-install.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/templates/validate-psp-install.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/templates/validate-psp-install.yaml diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/templates/view-role.yaml b/charts/rancher-istio/106.0.0+up1.22.1/templates/view-role.yaml similarity index 100% rename from packages/rancher-istio/1.19/rancher-istio/charts/templates/view-role.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/templates/view-role.yaml diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/values.yaml b/charts/rancher-istio/106.0.0+up1.22.1/values.yaml similarity index 93% rename from packages/rancher-istio/1.19/rancher-istio/charts/values.yaml rename to charts/rancher-istio/106.0.0+up1.22.1/values.yaml index 9694223e4e..8c7bfa8d89 100644 --- a/packages/rancher-istio/1.19/rancher-istio/charts/values.yaml +++ b/charts/rancher-istio/106.0.0+up1.22.1/values.yaml @@ -1,11 +1,11 @@ overlayFile: "" -tag: 1.19.6 +tag: 1.22.1 ##Setting forceInstall: true will remove the check for istio version < 1.6.x and will not analyze your install cluster prior to install forceInstall: false installer: repository: rancher/istio-installer - tag: 1.19.6-rancher1 + tag: 1.22.1-rancher1 ##releaseMirror are configurations for istio upgrades. ##Setting releaseMirror.enabled: true will cause istio to use bundled in images from rancher/istio-installer to perfom an upgrade - this is ideal ##for airgap setups. Setting releaseMirror.enabled to false means istio will call externally to github to fetch the required assets. @@ -28,8 +28,8 @@ cni: repository: rancher/mirrored-istio-install-cni # If you wish to troubleshoot Istio, you can switch to regular images by uncommenting the following tag and deleting # the distroless tag: -# tag: 1.19.6 - tag: 1.19.6-distroless +# tag: 1.22.1 + tag: 1.22.1-distroless logLevel: info excludeNamespaces: - istio-system @@ -55,8 +55,8 @@ pilot: repository: rancher/mirrored-istio-pilot # If you wish to troubleshoot Istio, you can switch to regular images by uncommenting the following tag and deleting # the distroless tag: -# tag: 1.19.6 - tag: 1.19.6-distroless +# tag: 1.22.1 + tag: 1.22.1-distroless hpaSpec: {} podDisruptionBudget: {} @@ -74,14 +74,14 @@ global: repository: rancher/mirrored-istio-proxyv2 # If you wish to troubleshoot Istio, you can switch to regular images by uncommenting the following tag and deleting # the distroless tag: -# tag: 1.19.6 - tag: 1.19.6-distroless +# tag: 1.22.1 + tag: 1.22.1-distroless proxy_init: repository: rancher/mirrored-istio-proxyv2 # If you wish to troubleshoot Istio, you can switch to regular images by uncommenting the following tag and deleting # the distroless tag: -# tag: 1.19.6 - tag: 1.19.6-distroless +# tag: 1.22.1 + tag: 1.22.1-distroless defaultPodDisruptionBudget: enabled: true @@ -109,6 +109,7 @@ kiali: tracing: enabled: false contextPath: "/jaeger" + zipkinAddress: zipkin.istio-system.svc:9411 ## Node labels for pod assignment ## Ref: https://kubernetes.io/docs/user-guide/node-selection/ diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/Chart.yaml b/charts/rancher-istio/106.1.0+up1.23.2/Chart.yaml similarity index 75% rename from packages/rancher-istio/1.20/rancher-istio/charts/Chart.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/Chart.yaml index 3872f16812..da70840695 100644 --- a/packages/rancher-istio/1.20/rancher-istio/charts/Chart.yaml +++ b/charts/rancher-istio/106.1.0+up1.23.2/Chart.yaml @@ -1,19 +1,19 @@ annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/display-name: Istio - catalog.cattle.io/kube-version: '>= 1.25.0-0 < 1.30.0-0' + catalog.cattle.io/kube-version: '>= 1.27.0-0 < 1.31.0-0' catalog.cattle.io/namespace: istio-system catalog.cattle.io/os: linux catalog.cattle.io/permits-os: linux,windows - catalog.cattle.io/rancher-version: '>= 2.10.0-0 < 2.11.0-0' + catalog.cattle.io/rancher-version: '>= 2.11.0-0 < 2.12.0-0' catalog.cattle.io/release-name: rancher-istio catalog.cattle.io/requests-cpu: 710m catalog.cattle.io/requests-memory: 2314Mi catalog.cattle.io/type: cluster-tool catalog.cattle.io/ui-component: istio - catalog.cattle.io/upstream-version: 1.20.3 + catalog.cattle.io/upstream-version: 1.23.2 apiVersion: v1 -appVersion: 1.20.3 +appVersion: 1.23.2 description: A basic Istio setup that installs with the istioctl. Refer to https://istio.io/latest/ for details. icon: https://charts.rancher.io/assets/logos/istio.svg @@ -21,4 +21,4 @@ keywords: - networking - infrastructure name: rancher-istio -version: 1.20.3 +version: 106.1.0+up1.23.2 diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/README.md b/charts/rancher-istio/106.1.0+up1.23.2/README.md similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/README.md rename to charts/rancher-istio/106.1.0+up1.23.2/README.md diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/app-readme.md b/charts/rancher-istio/106.1.0+up1.23.2/app-readme.md similarity index 98% rename from packages/rancher-istio/1.19/rancher-istio/charts/app-readme.md rename to charts/rancher-istio/106.1.0+up1.23.2/app-readme.md index 92a0952e2f..8be230ff00 100644 --- a/packages/rancher-istio/1.19/rancher-istio/charts/app-readme.md +++ b/charts/rancher-istio/106.1.0+up1.23.2/app-readme.md @@ -38,7 +38,7 @@ To install istio with CNI enabled, e.g. when cluster has a default PSP set to "r See [this issue](https://github.com/rancher/rancher/issues/33291) for details. ## Installing istio with distroless-images. -Istio `104.1.0+up1.19.6` uses distroless images for `istio-proxyv2`, `istio-install-cni` and `istio-pilot`. Distroless images don't have the common debugging tools like `bash`, `curl`, etc. If you wish to troubleshoot Istio, you can switch to regular images by updating `values.yaml` file. +Istio `104.5.0+up1.23.2` uses distroless images for `istio-proxyv2`, `istio-install-cni` and `istio-pilot`. Distroless images don't have the common debugging tools like `bash`, `curl`, etc. If you wish to troubleshoot Istio, you can switch to regular images by updating `values.yaml` file. ## Deprecations diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/Chart.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/Chart.yaml new file mode 100644 index 0000000000..e282a06c7b --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/Chart.yaml @@ -0,0 +1,28 @@ +annotations: + catalog.cattle.io/hidden: "true" + catalog.cattle.io/os: linux + 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 +apiVersion: v2 +appVersion: v1.89.3 +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/current/assets/icons/logo.svg +keywords: +- istio +- kiali +- networking +- infrastructure +maintainers: +- email: kiali-users@googlegroups.com + name: Kiali + url: https://kiali.io +name: kiali +sources: +- https://github.com/kiali/kiali +- https://github.com/kiali/kiali-operator +- https://github.com/kiali/helm-charts +version: 1.89.3 diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/NOTES.txt b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/NOTES.txt new file mode 100644 index 0000000000..751019401b --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/NOTES.txt @@ -0,0 +1,5 @@ +Welcome to Kiali! For more details on Kiali, see: https://kiali.io + +The Kiali Server [{{ .Chart.AppVersion }}] has been installed in namespace [{{ .Release.Namespace }}]. It will be ready soon. + +(Helm: Chart=[{{ .Chart.Name }}], Release=[{{ .Release.Name }}], Version=[{{ .Chart.Version }}]) diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/_helpers.tpl b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/_helpers.tpl new file mode 100644 index 0000000000..91c9ff0ca5 --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/_helpers.tpl @@ -0,0 +1,222 @@ +{{/* vim: set filetype=mustache: */}} + +{{/* +Create a default fully qualified instance name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +To simulate the way the operator works, use deployment.instance_name rather than the old fullnameOverride. +For backwards compatibility, if fullnameOverride is not kiali but deployment.instance_name is kiali, +use fullnameOverride, otherwise use deployment.instance_name. +*/}} +{{- define "kiali-server.fullname" -}} +{{- if (and (eq .Values.deployment.instance_name "kiali") (ne .Values.fullnameOverride "kiali")) }} + {{- .Values.fullnameOverride | trunc 63 }} +{{- else }} + {{- .Values.deployment.instance_name | trunc 63 }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "kiali-server.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Identifies the log_level. +*/}} +{{- define "kiali-server.logLevel" -}} +{{- .Values.deployment.logger.log_level -}} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "kiali-server.labels" -}} +helm.sh/chart: {{ include "kiali-server.chart" . }} +app: kiali +{{ include "kiali-server.selectorLabels" . }} +version: {{ .Values.deployment.version_label | default .Chart.AppVersion | quote }} +app.kubernetes.io/version: {{ .Values.deployment.version_label | default .Chart.AppVersion | quote }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +app.kubernetes.io/part-of: "kiali" +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "kiali-server.selectorLabels" -}} +{{- $releaseName := .Release.Name -}} +{{- $fullName := include "kiali-server.fullname" . -}} +{{- $deployment := (lookup "apps/v1" "Deployment" .Release.Namespace $fullName) -}} +app.kubernetes.io/name: kiali +{{- if (and .Release.IsUpgrade $deployment)}} +app.kubernetes.io/instance: {{ (get (($deployment).metadata.labels) "app.kubernetes.io/instance") | default $fullName }} +{{- else }} +app.kubernetes.io/instance: {{ $fullName }} +{{- end }} +{{- end }} + +{{/* +Determine the default login token signing key. +*/}} +{{- define "kiali-server.login_token.signing_key" -}} +{{- if .Values.login_token.signing_key }} + {{- .Values.login_token.signing_key }} +{{- else }} + {{- randAlphaNum 16 }} +{{- end }} +{{- end }} + +{{/* +Determine the default web root. +*/}} +{{- define "kiali-server.server.web_root" -}} +{{- if .Values.server.web_root }} + {{- if (eq .Values.server.web_root "/") }} + {{- .Values.server.web_root }} + {{- else }} + {{- .Values.server.web_root | trimSuffix "/" }} + {{- end }} +{{- else }} + {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} + {{- "/" }} + {{- else }} + {{- "/kiali" }} + {{- end }} +{{- end }} +{{- end }} + +{{/* +Determine the default identity cert file. There is no default if on k8s; only on OpenShift. +*/}} +{{- define "kiali-server.identity.cert_file" -}} +{{- if hasKey .Values.identity "cert_file" }} + {{- .Values.identity.cert_file }} +{{- else }} + {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} + {{- "/kiali-cert/tls.crt" }} + {{- else }} + {{- "" }} + {{- end }} +{{- end }} +{{- end }} + +{{/* +Determine the default identity private key file. There is no default if on k8s; only on OpenShift. +*/}} +{{- define "kiali-server.identity.private_key_file" -}} +{{- if hasKey .Values.identity "private_key_file" }} + {{- .Values.identity.private_key_file }} +{{- else }} + {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} + {{- "/kiali-cert/tls.key" }} + {{- else }} + {{- "" }} + {{- end }} +{{- end }} +{{- end }} + +{{/* +Determine the default deployment.ingress.enabled. Disable it on k8s; enable it on OpenShift. +*/}} +{{- define "kiali-server.deployment.ingress.enabled" -}} +{{- if hasKey .Values.deployment.ingress "enabled" }} + {{- .Values.deployment.ingress.enabled }} +{{- else }} + {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} + {{- true }} + {{- else }} + {{- false }} + {{- end }} +{{- end }} +{{- end }} + +{{/* +Determine the istio namespace - default is where Kiali is installed. +*/}} +{{- define "kiali-server.istio_namespace" -}} +{{- if .Values.istio_namespace }} + {{- .Values.istio_namespace }} +{{- else }} + {{- .Release.Namespace }} +{{- end }} +{{- end }} + +{{/* +Determine the auth strategy to use - default is "token" on Kubernetes and "openshift" on OpenShift. +*/}} +{{- define "kiali-server.auth.strategy" -}} +{{- if .Values.auth.strategy }} + {{- if (and (eq .Values.auth.strategy "openshift") (not .Values.kiali_route_url)) }} + {{- fail "You did not define what the Kiali Route URL will be (--set kiali_route_url=...). Without this set, the openshift auth strategy will not work. Either set that or use a different auth strategy via the --set auth.strategy=... option." }} + {{- end }} + {{- .Values.auth.strategy }} +{{- else }} + {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} + {{- if not .Values.kiali_route_url }} + {{- fail "You did not define what the Kiali Route URL will be (--set kiali_route_url=...). Without this set, the openshift auth strategy will not work. Either set that or explicitly indicate another auth strategy you want via the --set auth.strategy=... option." }} + {{- end }} + {{- "openshift" }} + {{- else }} + {{- "token" }} + {{- end }} +{{- end }} +{{- end }} + +{{/* +Determine the root namespace - default is where Kiali is installed. +*/}} +{{- define "kiali-server.external_services.istio.root_namespace" -}} +{{- if .Values.external_services.istio.root_namespace }} + {{- .Values.external_services.istio.root_namespace }} +{{- else }} + {{- .Release.Namespace }} +{{- end }} +{{- end }} + +{{- define "system_default_registry" -}} +{{- if .Values.global.cattle.systemDefaultRegistry -}} +{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}} +{{- else -}} +{{- "" -}} +{{- end -}} +{{- 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" -}} +kubernetes.io/os: linux +{{- end -}} + +{{/* +Autodetect remote cluster secrets if enabled - looks for secrets in the same namespace where Kiali is installed. +Returns a JSON dict whose keys are the cluster names and values are the cluster secret data. +*/}} +{{- define "kiali-server.remote-cluster-secrets" -}} +{{- $theDict := dict }} +{{- if .Values.clustering.autodetect_secrets.enabled }} + {{- $secretLabelToLookFor := (regexSplit "=" .Values.clustering.autodetect_secrets.label 2) }} + {{- $secretLabelNameToLookFor := first $secretLabelToLookFor }} + {{- $secretLabelValueToLookFor := last $secretLabelToLookFor }} + {{- range $i, $secret := (lookup "v1" "Secret" .Release.Namespace "").items }} + {{- if (and (and (hasKey $secret.metadata "labels") (hasKey $secret.metadata.labels $secretLabelNameToLookFor)) (eq (get $secret.metadata.labels $secretLabelNameToLookFor) ($secretLabelValueToLookFor))) }} + {{- $clusterName := $secret.metadata.name }} + {{- if (and (hasKey $secret.metadata "annotations") (hasKey $secret.metadata.annotations "kiali.io/cluster")) }} + {{- $clusterName = get $secret.metadata.annotations "kiali.io/cluster" }} + {{- end }} + {{- $theDict = set $theDict $clusterName $secret.metadata.name }} + {{- end }} + {{- end }} +{{- end }} +{{- $theDict | toJson }} +{{- end }} diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/cabundle.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/cabundle.yaml new file mode 100644 index 0000000000..7462b95a7f --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/cabundle.yaml @@ -0,0 +1,13 @@ +{{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "kiali-server.fullname" . }}-cabundle + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} + annotations: + service.beta.openshift.io/inject-cabundle: "true" +... +{{- end }} diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/configmap.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/configmap.yaml new file mode 100644 index 0000000000..f7b68294d7 --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/configmap.yaml @@ -0,0 +1,30 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} + {{- if .Values.deployment.configmap_annotations }} + annotations: + {{- toYaml .Values.deployment.configmap_annotations | nindent 4 }} + {{- end }} +data: + config.yaml: | + {{- /* Most of .Values is simply the ConfigMap - strip out the keys that are not part of the ConfigMap */}} + {{- $cm := omit .Values "nameOverride" "fullnameOverride" "kiali_route_url" }} + {{- /* The helm chart defines namespace for us, but pass it to the ConfigMap in case the server needs it */}} + {{- $_ := set $cm.deployment "namespace" .Release.Namespace }} + {{- /* Some values of the ConfigMap are generated, but might not be identical, from .Values */}} + {{- $_ := set $cm "istio_namespace" (include "kiali-server.istio_namespace" .) }} + {{- $_ := set $cm.auth "strategy" (include "kiali-server.auth.strategy" .) }} + {{- $_ := set $cm.auth.openshift "client_id_prefix" (include "kiali-server.fullname" .) }} + {{- $_ := set $cm.deployment "instance_name" (include "kiali-server.fullname" .) }} + {{- $_ := set $cm.identity "cert_file" (include "kiali-server.identity.cert_file" .) }} + {{- $_ := set $cm.identity "private_key_file" (include "kiali-server.identity.private_key_file" .) }} + {{- $_ := set $cm.login_token "signing_key" (include "kiali-server.login_token.signing_key" .) }} + {{- $_ := set $cm.external_services.istio "root_namespace" (include "kiali-server.external_services.istio.root_namespace" .) }} + {{- $_ := set $cm.server "web_root" (include "kiali-server.server.web_root" .) }} + {{- toYaml $cm | nindent 4 }} +... diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/deployment.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/deployment.yaml new file mode 100644 index 0000000000..6173579ab4 --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/deployment.yaml @@ -0,0 +1,240 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": post-install, post-upgrade + "helm.sh/hook-weight": "-4" +spec: +{{- if not .Values.deployment.hpa.spec }} + replicas: {{ .Values.deployment.replicas }} +{{- end }} + selector: + matchLabels: + {{- include "kiali-server.selectorLabels" . | nindent 6 }} + strategy: + rollingUpdate: + maxSurge: 1 + maxUnavailable: 1 + type: RollingUpdate + template: + metadata: + name: {{ include "kiali-server.fullname" . }} + labels: + {{- include "kiali-server.labels" . | nindent 8 }} + {{- if .Values.deployment.pod_labels }} + {{- toYaml .Values.deployment.pod_labels | nindent 8 }} + {{- end }} + annotations: + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- if .Values.server.observability.metrics.enabled }} + prometheus.io/scrape: "true" + prometheus.io/port: {{ .Values.server.observability.metrics.port | quote }} + {{- else }} + prometheus.io/scrape: "false" + prometheus.io/port: "" + {{- end }} + kiali.io/dashboards: go,kiali + {{- if .Values.deployment.pod_annotations }} + {{- toYaml .Values.deployment.pod_annotations | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ include "kiali-server.fullname" . }} + {{- if .Values.deployment.priority_class_name }} + priorityClassName: {{ .Values.deployment.priority_class_name | quote }} + {{- end }} + {{- if .Values.deployment.image_pull_secrets }} + imagePullSecrets: + {{- range .Values.deployment.image_pull_secrets }} + - name: {{ . }} + {{- end }} + {{- end }} + {{- if .Values.deployment.host_aliases }} + hostAliases: + {{- toYaml .Values.deployment.host_aliases | nindent 6 }} + {{- end }} + {{- if .Values.deployment.dns }} + {{- if .Values.deployment.dns.policy }} + dnsPolicy: "{{ .Values.deployment.dns.policy }}" + {{- end }} + {{- if .Values.deployment.dns.config }} + dnsConfig: + {{- toYaml .Values.deployment.dns.config | nindent 8 }} + {{- end }} + {{- end }} + containers: + - 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: + - "/opt/kiali/kiali" + - "-config" + - "/kiali-configuration/config.yaml" + securityContext: + {{- if .Values.deployment.security_context}} + {{- toYaml .Values.deployment.security_context | nindent 10 }} + {{- else }} + allowPrivilegeEscalation: false + privileged: false + readOnlyRootFilesystem: true + runAsNonRoot: true + capabilities: + drop: + - ALL + {{- end }} + ports: + - name: api-port + containerPort: {{ .Values.server.port | default 20001 }} + {{- if .Values.server.observability.metrics.enabled }} + - name: http-metrics + containerPort: {{ .Values.server.observability.metrics.port | default 9090 }} + {{- end }} + readinessProbe: + httpGet: + path: {{ include "kiali-server.server.web_root" . | trimSuffix "/" }}/healthz + port: api-port + {{- if (include "kiali-server.identity.cert_file" .) }} + scheme: HTTPS + {{- else }} + scheme: HTTP + {{- end }} + initialDelaySeconds: 5 + periodSeconds: 30 + livenessProbe: + httpGet: + path: {{ include "kiali-server.server.web_root" . | trimSuffix "/" }}/healthz + port: api-port + {{- if (include "kiali-server.identity.cert_file" .) }} + scheme: HTTPS + {{- else }} + scheme: HTTP + {{- end }} + initialDelaySeconds: 5 + periodSeconds: 30 + env: + - name: ACTIVE_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: LOG_LEVEL + value: "{{ include "kiali-server.logLevel" . }}" + - name: LOG_FORMAT + value: "{{ .Values.deployment.logger.log_format }}" + - name: LOG_TIME_FIELD_FORMAT + value: "{{ .Values.deployment.logger.time_field_format }}" + - name: LOG_SAMPLER_RATE + value: "{{ .Values.deployment.logger.sampler_rate }}" + volumeMounts: + {{- if .Values.web_root_override }} + - name: kiali-console + subPath: env.js + mountPath: /opt/kiali/console/env.js + {{- end }} + - name: {{ include "kiali-server.fullname" . }}-configuration + mountPath: "/kiali-configuration" + - name: {{ include "kiali-server.fullname" . }}-cert + mountPath: "/kiali-cert" + - name: {{ include "kiali-server.fullname" . }}-secret + mountPath: "/kiali-secret" + - name: {{ include "kiali-server.fullname" . }}-cabundle + mountPath: "/kiali-cabundle" + {{- range .Values.deployment.custom_secrets }} + - name: {{ .name }} + mountPath: "{{ .mount }}" + {{- end }} + {{- range $key, $val := (include "kiali-server.remote-cluster-secrets" .) | fromJson }} + - name: {{ $key }} + mountPath: "/kiali-remote-cluster-secrets/{{ $val }}" + {{- end }} + {{- range .Values.clustering.clusters }} + {{- if .secret_name }} + - name: {{ .name }} + mountPath: "/kiali-remote-cluster-secrets/{{ .secret_name }}" + {{- end }} + {{- end }} + {{- if .Values.deployment.resources }} + resources: + {{- toYaml .Values.deployment.resources | nindent 10 }} + {{- end }} + volumes: + {{- if .Values.web_root_override }} + - name: kiali-console + configMap: + name: kiali-console + items: + - key: env.js + path: env.js + {{- end }} + - name: {{ include "kiali-server.fullname" . }}-configuration + configMap: + name: {{ include "kiali-server.fullname" . }} + - name: {{ include "kiali-server.fullname" . }}-cert + secret: + {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} + secretName: {{ include "kiali-server.fullname" . }}-cert-secret + {{- else }} + secretName: istio.{{ include "kiali-server.fullname" . }}-service-account + {{- end }} + {{- if not (include "kiali-server.identity.cert_file" .) }} + optional: true + {{- end }} + - name: {{ include "kiali-server.fullname" . }}-secret + secret: + secretName: {{ .Values.deployment.secret_name }} + optional: true + - name: {{ include "kiali-server.fullname" . }}-cabundle + configMap: + name: {{ include "kiali-server.fullname" . }}-cabundle + {{- if not (.Capabilities.APIVersions.Has "route.openshift.io/v1") }} + optional: true + {{- end }} + {{- range .Values.deployment.custom_secrets }} + - name: {{ .name }} + {{- if .csi}} + csi: {{ toYaml .csi | nindent 10 }} + {{- else }} + secret: + secretName: {{ .name }} + optional: {{ .optional | default false }} + {{- end }} + {{- end }} + {{- range $key, $val := (include "kiali-server.remote-cluster-secrets" .) | fromJson }} + - name: {{ $key }} + secret: + secretName: {{ $val }} + {{- end }} + {{- range .Values.clustering.clusters }} + {{- if .secret_name }} + - name: {{ .name }} + secret: + secretName: {{ .secret_name }} + {{- end }} + {{- end }} + {{- if or (.Values.deployment.affinity.node) (or (.Values.deployment.affinity.pod) (.Values.deployment.affinity.pod_anti)) }} + affinity: + {{- if .Values.deployment.affinity.node }} + nodeAffinity: + {{- toYaml .Values.deployment.affinity.node | nindent 10 }} + {{- end }} + {{- if .Values.deployment.affinity.pod }} + podAffinity: + {{- toYaml .Values.deployment.affinity.pod | nindent 10 }} + {{- end }} + {{- if .Values.deployment.affinity.pod_anti }} + podAntiAffinity: + {{- toYaml .Values.deployment.affinity.pod_anti | nindent 10 }} + {{- end }} + {{- end }} + tolerations: {{ include "linux-node-tolerations" . | nindent 8 }} +{{- if .Values.deployment.tolerations }} +{{ toYaml .Values.deployment.tolerations | indent 8 }} +{{- end }} + nodeSelector: {{ include "linux-node-selector" . | nindent 8 }} +{{- if .Values.deployment.node_selector }} +{{ toYaml .Values.deployment.node_selector | indent 8 }} +{{- end }} +... diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/deployment.yaml.orig b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/deployment.yaml.orig new file mode 100644 index 0000000000..34560fceaf --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/deployment.yaml.orig @@ -0,0 +1,224 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +spec: +{{- if not .Values.deployment.hpa.spec }} + replicas: {{ .Values.deployment.replicas }} +{{- end }} + selector: + matchLabels: + {{- include "kiali-server.selectorLabels" . | nindent 6 }} + strategy: + rollingUpdate: + maxSurge: 1 + maxUnavailable: 1 + type: RollingUpdate + template: + metadata: + name: {{ include "kiali-server.fullname" . }} + labels: + {{- include "kiali-server.labels" . | nindent 8 }} + {{- if .Values.deployment.pod_labels }} + {{- toYaml .Values.deployment.pod_labels | nindent 8 }} + {{- end }} + annotations: + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- if .Values.server.observability.metrics.enabled }} + prometheus.io/scrape: "true" + prometheus.io/port: {{ .Values.server.observability.metrics.port | quote }} + {{- else }} + prometheus.io/scrape: "false" + prometheus.io/port: "" + {{- end }} + kiali.io/dashboards: go,kiali + {{- if .Values.deployment.pod_annotations }} + {{- toYaml .Values.deployment.pod_annotations | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ include "kiali-server.fullname" . }} + {{- if .Values.deployment.priority_class_name }} + priorityClassName: {{ .Values.deployment.priority_class_name | quote }} + {{- end }} + {{- if .Values.deployment.image_pull_secrets }} + imagePullSecrets: + {{- range .Values.deployment.image_pull_secrets }} + - name: {{ . }} + {{- end }} + {{- end }} + {{- if .Values.deployment.host_aliases }} + hostAliases: + {{- toYaml .Values.deployment.host_aliases | nindent 6 }} + {{- end }} + {{- if .Values.deployment.dns }} + {{- if .Values.deployment.dns.policy }} + dnsPolicy: "{{ .Values.deployment.dns.policy }}" + {{- end }} + {{- if .Values.deployment.dns.config }} + dnsConfig: + {{- toYaml .Values.deployment.dns.config | nindent 8 }} + {{- end }} + {{- end }} + containers: + - image: "{{ .Values.deployment.image_name }}{{ if .Values.deployment.image_digest }}@{{ .Values.deployment.image_digest }}{{ end }}:{{ .Values.deployment.image_version }}" + imagePullPolicy: {{ .Values.deployment.image_pull_policy | default "Always" }} + name: {{ include "kiali-server.fullname" . }} + command: + - "/opt/kiali/kiali" + - "-config" + - "/kiali-configuration/config.yaml" + securityContext: + {{- if .Values.deployment.security_context}} + {{- toYaml .Values.deployment.security_context | nindent 10 }} + {{- else }} + allowPrivilegeEscalation: false + privileged: false + readOnlyRootFilesystem: true + runAsNonRoot: true + capabilities: + drop: + - ALL + {{- end }} + ports: + - name: api-port + containerPort: {{ .Values.server.port | default 20001 }} + {{- if .Values.server.observability.metrics.enabled }} + - name: http-metrics + containerPort: {{ .Values.server.observability.metrics.port | default 9090 }} + {{- end }} + readinessProbe: + httpGet: + path: {{ include "kiali-server.server.web_root" . | trimSuffix "/" }}/healthz + port: api-port + {{- if (include "kiali-server.identity.cert_file" .) }} + scheme: HTTPS + {{- else }} + scheme: HTTP + {{- end }} + initialDelaySeconds: 5 + periodSeconds: 30 + livenessProbe: + httpGet: + path: {{ include "kiali-server.server.web_root" . | trimSuffix "/" }}/healthz + port: api-port + {{- if (include "kiali-server.identity.cert_file" .) }} + scheme: HTTPS + {{- else }} + scheme: HTTP + {{- end }} + initialDelaySeconds: 5 + periodSeconds: 30 + env: + - name: ACTIVE_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: LOG_LEVEL + value: "{{ include "kiali-server.logLevel" . }}" + - name: LOG_FORMAT + value: "{{ .Values.deployment.logger.log_format }}" + - name: LOG_TIME_FIELD_FORMAT + value: "{{ .Values.deployment.logger.time_field_format }}" + - name: LOG_SAMPLER_RATE + value: "{{ .Values.deployment.logger.sampler_rate }}" + volumeMounts: + - name: {{ include "kiali-server.fullname" . }}-configuration + mountPath: "/kiali-configuration" + - name: {{ include "kiali-server.fullname" . }}-cert + mountPath: "/kiali-cert" + - name: {{ include "kiali-server.fullname" . }}-secret + mountPath: "/kiali-secret" + - name: {{ include "kiali-server.fullname" . }}-cabundle + mountPath: "/kiali-cabundle" + {{- range .Values.deployment.custom_secrets }} + - name: {{ .name }} + mountPath: "{{ .mount }}" + {{- end }} + {{- range $key, $val := (include "kiali-server.remote-cluster-secrets" .) | fromJson }} + - name: {{ $key }} + mountPath: "/kiali-remote-cluster-secrets/{{ $val }}" + {{- end }} + {{- range .Values.clustering.clusters }} + {{- if .secret_name }} + - name: {{ .name }} + mountPath: "/kiali-remote-cluster-secrets/{{ .secret_name }}" + {{- end }} + {{- end }} + {{- if .Values.deployment.resources }} + resources: + {{- toYaml .Values.deployment.resources | nindent 10 }} + {{- end }} + volumes: + - name: {{ include "kiali-server.fullname" . }}-configuration + configMap: + name: {{ include "kiali-server.fullname" . }} + - name: {{ include "kiali-server.fullname" . }}-cert + secret: + {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} + secretName: {{ include "kiali-server.fullname" . }}-cert-secret + {{- else }} + secretName: istio.{{ include "kiali-server.fullname" . }}-service-account + {{- end }} + {{- if not (include "kiali-server.identity.cert_file" .) }} + optional: true + {{- end }} + - name: {{ include "kiali-server.fullname" . }}-secret + secret: + secretName: {{ .Values.deployment.secret_name }} + optional: true + - name: {{ include "kiali-server.fullname" . }}-cabundle + configMap: + name: {{ include "kiali-server.fullname" . }}-cabundle + {{- if not (.Capabilities.APIVersions.Has "route.openshift.io/v1") }} + optional: true + {{- end }} + {{- range .Values.deployment.custom_secrets }} + - name: {{ .name }} + {{- if .csi}} + csi: {{ toYaml .csi | nindent 10 }} + {{- else }} + secret: + secretName: {{ .name }} + optional: {{ .optional | default false }} + {{- end }} + {{- end }} + {{- range $key, $val := (include "kiali-server.remote-cluster-secrets" .) | fromJson }} + - name: {{ $key }} + secret: + secretName: {{ $val }} + {{- end }} + {{- range .Values.clustering.clusters }} + {{- if .secret_name }} + - name: {{ .name }} + secret: + secretName: {{ .secret_name }} + {{- end }} + {{- end }} + {{- if or (.Values.deployment.affinity.node) (or (.Values.deployment.affinity.pod) (.Values.deployment.affinity.pod_anti)) }} + affinity: + {{- if .Values.deployment.affinity.node }} + nodeAffinity: + {{- toYaml .Values.deployment.affinity.node | nindent 10 }} + {{- end }} + {{- if .Values.deployment.affinity.pod }} + podAffinity: + {{- toYaml .Values.deployment.affinity.pod | nindent 10 }} + {{- end }} + {{- if .Values.deployment.affinity.pod_anti }} + podAntiAffinity: + {{- toYaml .Values.deployment.affinity.pod_anti | nindent 10 }} + {{- end }} + {{- end }} + {{- if .Values.deployment.tolerations }} + tolerations: + {{- toYaml .Values.deployment.tolerations | nindent 8 }} + {{- end }} + {{- if .Values.deployment.node_selector }} + nodeSelector: + {{- toYaml .Values.deployment.node_selector | nindent 8 }} + {{- end }} +... diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/hpa.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/hpa.yaml new file mode 100644 index 0000000000..934c4c1e9d --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/hpa.yaml @@ -0,0 +1,17 @@ +{{- if .Values.deployment.hpa.spec }} +--- +apiVersion: {{ .Values.deployment.hpa.api_version }} +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "kiali-server.fullname" . }} + {{- toYaml .Values.deployment.hpa.spec | nindent 2 }} +... +{{- end }} diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/ingress.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/ingress.yaml new file mode 100644 index 0000000000..27807fc3de --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/ingress.yaml @@ -0,0 +1,62 @@ +{{- if not (.Capabilities.APIVersions.Has "route.openshift.io/v1") }} +{{- if eq "true" (include "kiali-server.deployment.ingress.enabled" .) }} +--- +{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} +apiVersion: networking.k8s.io/v1 +{{- else }} +apiVersion: networking.k8s.io/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- if .Values.deployment.ingress.additional_labels }} + {{- toYaml .Values.deployment.ingress.additional_labels | nindent 4 }} + {{- end }} + {{- include "kiali-server.labels" . | nindent 4 }} + annotations: + {{- if .Values.deployment.ingress.override_yaml.metadata.annotations }} + {{- toYaml .Values.deployment.ingress.override_yaml.metadata.annotations | nindent 4 }} + {{- else }} + # For ingress-nginx versions older than 0.20.0 use secure-backends. + # (see: https://github.com/kubernetes/ingress-nginx/issues/3416#issuecomment-438247948) + # For ingress-nginx versions 0.20.0 and later use backend-protocol. + {{- if (include "kiali-server.identity.cert_file" .) }} + nginx.ingress.kubernetes.io/secure-backends: "true" + nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" + {{- else }} + nginx.ingress.kubernetes.io/secure-backends: "false" + nginx.ingress.kubernetes.io/backend-protocol: "HTTP" + {{- end }} + {{- end }} +spec: + {{- if hasKey .Values.deployment.ingress.override_yaml "spec" }} + {{- toYaml .Values.deployment.ingress.override_yaml.spec | nindent 2 }} + {{- else }} + {{- if .Values.deployment.ingress.class_name }} + ingressClassName: {{ .Values.deployment.ingress.class_name }} + {{- end }} + rules: + - http: + paths: + - path: {{ include "kiali-server.server.web_root" . }} + {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} + pathType: Prefix + backend: + service: + name: {{ include "kiali-server.fullname" . }} + port: + number: {{ .Values.server.port }} + {{- else }} + backend: + serviceName: {{ include "kiali-server.fullname" . }} + servicePort: {{ .Values.server.port }} + {{- end }} + {{- if not (empty .Values.server.web_fqdn) }} + host: {{ .Values.server.web_fqdn }} + {{- end }} + {{- end }} +... +{{- end }} +{{- end }} diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/oauth.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/oauth.yaml new file mode 100644 index 0000000000..8658c7f947 --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/oauth.yaml @@ -0,0 +1,25 @@ +{{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} +{{- if .Values.kiali_route_url }} +--- +apiVersion: oauth.openshift.io/v1 +kind: OAuthClient +metadata: + name: {{ include "kiali-server.fullname" . }}-{{ .Release.Namespace }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +redirectURIs: +- {{ .Values.kiali_route_url }}/api/auth/callback +{{- if .Values.server.web_port }} +- {{ .Values.kiali_route_url }}:{{ .Values.server.web_port }}/api/auth/callback +{{- end }} +grantMethod: auto +{{- if .Values.auth.openshift.token_inactivity_timeout }} +accessTokenInactivityTimeoutSeconds: {{ .Values.auth.openshift.token_inactivity_timeout }} +{{- end }} +{{- if .Values.auth.openshift.token_max_age }} +accessTokenMaxAgeSeconds: {{ .Values.auth.openshift.token_max_age }} +{{- end }} +... +{{- end }} +{{- end }} diff --git a/packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/overlay/templates/psp.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/psp.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/overlay/templates/psp.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/psp.yaml diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/role-controlplane.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/role-controlplane.yaml new file mode 100644 index 0000000000..707501c677 --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/role-controlplane.yaml @@ -0,0 +1,23 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: {{ include "kiali-server.fullname" . }}-controlplane + namespace: {{ include "kiali-server.istio_namespace" . }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +rules: +{{- if .Values.kiali_feature_flags.certificates_information_indicators.enabled }} +- apiGroups: [""] + resourceNames: + {{- range .Values.kiali_feature_flags.certificates_information_indicators.secrets }} + - {{ . }} + {{- end }} + resources: + - secrets + verbs: + - get + - list + - watch +{{- end }} +... diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/role-viewer.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/role-viewer.yaml new file mode 100644 index 0000000000..0811b20118 --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/role-viewer.yaml @@ -0,0 +1,96 @@ +{{- if or (.Values.deployment.view_only_mode) (ne .Values.auth.strategy "anonymous") -}} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: {{ include "kiali-server.fullname" . }}-viewer + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +rules: +- apiGroups: [""] + resources: + - configmaps + - endpoints +{{- if not (has "logs-tab" .Values.kiali_feature_flags.disabled_features) }} + - pods/log +{{- end }} + verbs: + - get + - list + - watch +- apiGroups: [""] + resources: + - namespaces + - pods + - replicationcontrollers + - services + verbs: + - get + - list + - watch +- apiGroups: [""] + resources: + - pods/portforward + verbs: + - create + - post +- apiGroups: ["extensions", "apps"] + resources: + - daemonsets + - deployments + - replicasets + - statefulsets + verbs: + - get + - list + - watch +- apiGroups: ["batch"] + resources: + - cronjobs + - jobs + verbs: + - get + - list + - watch +- apiGroups: + - networking.istio.io + - security.istio.io + - extensions.istio.io + - telemetry.istio.io + - gateway.networking.k8s.io + resources: ["*"] + verbs: + - get + - list + - watch +- apiGroups: ["apps.openshift.io"] + resources: + - deploymentconfigs + verbs: + - get + - list + - watch +- apiGroups: ["project.openshift.io"] + resources: + - projects + verbs: + - get +- apiGroups: ["route.openshift.io"] + resources: + - routes + verbs: + - get +- apiGroups: ["authentication.k8s.io"] + resources: + - tokenreviews + verbs: + - create +- apiGroups: ["oauth.openshift.io"] + resources: + - oauthclients + resourceNames: + - {{ include "kiali-server.fullname" . }}-{{ .Release.Namespace }} + verbs: + - get +... +{{- end -}} diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/role.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/role.yaml new file mode 100644 index 0000000000..de23cc5c83 --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/role.yaml @@ -0,0 +1,103 @@ +{{- if not (or (.Values.deployment.view_only_mode) (ne .Values.auth.strategy "anonymous")) -}} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: {{ include "kiali-server.fullname" . }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +rules: +- apiGroups: [""] + resources: + - configmaps + - endpoints +{{- if not (has "logs-tab" .Values.kiali_feature_flags.disabled_features) }} + - pods/log +{{- end }} + verbs: + - get + - list + - watch +- apiGroups: [""] + resources: + - namespaces + - pods + - replicationcontrollers + - services + verbs: + - get + - list + - watch + - patch +- apiGroups: [""] + resources: + - pods/portforward + verbs: + - create + - post +- apiGroups: ["extensions", "apps"] + resources: + - daemonsets + - deployments + - replicasets + - statefulsets + verbs: + - get + - list + - watch + - patch +- apiGroups: ["batch"] + resources: + - cronjobs + - jobs + verbs: + - get + - list + - watch + - patch +- apiGroups: + - networking.istio.io + - security.istio.io + - extensions.istio.io + - telemetry.istio.io + - gateway.networking.k8s.io + resources: ["*"] + verbs: + - get + - list + - watch + - create + - delete + - patch +- apiGroups: ["apps.openshift.io"] + resources: + - deploymentconfigs + verbs: + - get + - list + - watch + - patch +- apiGroups: ["project.openshift.io"] + resources: + - projects + verbs: + - get +- apiGroups: ["route.openshift.io"] + resources: + - routes + verbs: + - get +- apiGroups: ["authentication.k8s.io"] + resources: + - tokenreviews + verbs: + - create +- apiGroups: ["oauth.openshift.io"] + resources: + - oauthclients + resourceNames: + - {{ include "kiali-server.fullname" . }}-{{ .Release.Namespace }} + verbs: + - get +... +{{- end -}} diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/rolebinding-controlplane.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/rolebinding-controlplane.yaml new file mode 100644 index 0000000000..5a00158360 --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/rolebinding-controlplane.yaml @@ -0,0 +1,17 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: {{ include "kiali-server.fullname" . }}-controlplane + namespace: {{ include "kiali-server.istio_namespace" . }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: {{ include "kiali-server.fullname" . }}-controlplane +subjects: +- kind: ServiceAccount + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} +... diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/rolebinding.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/rolebinding.yaml new file mode 100644 index 0000000000..63f1922ac1 --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/rolebinding.yaml @@ -0,0 +1,24 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + {{- if or (.Values.deployment.view_only_mode) (ne .Values.auth.strategy "anonymous") }} + name: {{ include "kiali-server.fullname" . }}-viewer + {{- else }} + name: {{ include "kiali-server.fullname" . }} + {{- end }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + {{- if or (.Values.deployment.view_only_mode) (ne .Values.auth.strategy "anonymous") }} + name: {{ include "kiali-server.fullname" . }}-viewer + {{- else }} + name: {{ include "kiali-server.fullname" . }} + {{- end }} +subjects: +- kind: ServiceAccount + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} +... diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/route.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/route.yaml new file mode 100644 index 0000000000..8325c14a74 --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/route.yaml @@ -0,0 +1,34 @@ +{{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} +{{- if eq "true" (include "kiali-server.deployment.ingress.enabled" .) }} +# As of OpenShift 4.5, need to use --disable-openapi-validation when installing via Helm +--- +apiVersion: route.openshift.io/v1 +kind: Route +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- if .Values.deployment.ingress.additional_labels }} + {{- toYaml .Values.deployment.ingress.additional_labels | nindent 4 }} + {{- end }} + {{- include "kiali-server.labels" . | nindent 4 }} + {{- if .Values.deployment.ingress.override_yaml.metadata.annotations }} + annotations: + {{- toYaml .Values.deployment.ingress.override_yaml.metadata.annotations | nindent 4 }} + {{- end }} +spec: + {{- if hasKey .Values.deployment.ingress.override_yaml "spec" }} + {{- toYaml .Values.deployment.ingress.override_yaml.spec | nindent 2 }} + {{- else }} + tls: + termination: reencrypt + insecureEdgeTerminationPolicy: Redirect + to: + kind: Service + name: {{ include "kiali-server.fullname" . }} + port: + targetPort: {{ .Values.server.port }} + {{- end }} +... +{{- end }} +{{- end }} diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/service.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/service.yaml new file mode 100644 index 0000000000..111be7f879 --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/service.yaml @@ -0,0 +1,51 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} + annotations: + {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} + service.beta.openshift.io/serving-cert-secret-name: {{ include "kiali-server.fullname" . }}-cert-secret + {{- end }} + {{- if and (not (empty .Values.server.web_fqdn)) (not (empty .Values.server.web_schema)) }} + {{- if empty .Values.server.web_port }} + kiali.io/external-url: {{ .Values.server.web_schema }}://{{ .Values.server.web_fqdn }}{{ include "kiali-server.server.web_root" . }} + {{- else }} + kiali.io/external-url: {{ .Values.server.web_schema }}://{{ .Values.server.web_fqdn }}:{{ .Values.server.web_port }}{{ include "kiali-server.server.web_root" . }} + {{- end }} + {{- end }} + {{- if .Values.deployment.service_annotations }} + {{- toYaml .Values.deployment.service_annotations | nindent 4 }} + {{- end }} +spec: + {{- if .Values.deployment.service_type }} + type: {{ .Values.deployment.service_type }} + {{- end }} + ports: + {{- if (include "kiali-server.identity.cert_file" .) }} + - name: tcp + appProtocol: https + {{- else }} + - name: http + appProtocol: http + {{- end }} + protocol: TCP + port: {{ .Values.server.port }} + {{- if and (not (empty .Values.server.node_port)) (eq .Values.deployment.service_type "NodePort") }} + nodePort: {{ .Values.server.node_port }} + {{- end }} + {{- if .Values.server.observability.metrics.enabled }} + - name: http-metrics + appProtocol: http + protocol: TCP + port: {{ .Values.server.observability.metrics.port }} + {{- end }} + selector: + {{- include "kiali-server.selectorLabels" . | nindent 4 }} + {{- if .Values.deployment.additional_service_yaml }} + {{- toYaml .Values.deployment.additional_service_yaml | nindent 2 }} + {{- end }} +... diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/serviceaccount.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/serviceaccount.yaml new file mode 100644 index 0000000000..9151b6f6a1 --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/serviceaccount.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +... diff --git a/packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/overlay/templates/validate-psp-install.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/validate-psp-install.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/overlay/templates/validate-psp-install.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/validate-psp-install.yaml diff --git a/packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/overlay/templates/web-root-configmap.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/web-root-configmap.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/overlay/templates/web-root-configmap.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/templates/web-root-configmap.yaml diff --git a/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/values.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/values.yaml new file mode 100644 index 0000000000..984432789a --- /dev/null +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/kiali/values.yaml @@ -0,0 +1,137 @@ +# 'fullnameOverride' is deprecated. Use 'deployment.instance_name' instead. +# This is only supported for backward compatibility and will be removed in a future version. +# If 'fullnameOverride' is not "kiali" and 'deployment.instance_name' is "kiali", +# then 'deployment.instance_name' will take the value of 'fullnameOverride' value. +# Otherwise, 'fullnameOverride' is ignored and 'deployment.instance_name' is used. +fullnameOverride: "kiali" + +# This is required for "openshift" auth strategy. +# You have to know ahead of time what your Route URL will be because +# right now the helm chart can't figure this out at runtime (it would +# need to wait for the Kiali Route to be deployed and for OpenShift +# to start it up). If someone knows how to update this helm chart to +# do this, a PR would be welcome. +kiali_route_url: "" + +# rancher specific override that allows proxy access to kiali url +web_root_override: true +# +# 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. +# + +additional_display_details: +- annotation: kiali.io/api-spec + icon_annotation: kiali.io/api-type + title: API Documentation + +istio_namespace: "" # default is where Kiali is installed + +auth: + openid: {} + openshift: {} + strategy: "" + +clustering: + autodetect_secrets: + enabled: true + label: "kiali.io/multiCluster=true" + clusters: [] + +deployment: + # This only limits what Kiali will attempt to see, but Kiali Service Account has permissions to see everything. + # For more control over what the Kial Service Account can see, use the Kiali Operator + accessible_namespaces: + - "**" + additional_service_yaml: {} + affinity: + node: {} + pod: {} + pod_anti: {} + configmap_annotations: {} + custom_secrets: [] + dns: + config: {} + policy: "" + host_aliases: [] + hpa: + api_version: "autoscaling/v2" + spec: {} + image_digest: "" # use "sha256" if image_version is a sha256 hash (do NOT prefix this value with a "@") + repository: rancher/mirrored-kiali-kiali + image_pull_policy: "Always" + image_pull_secrets: [] + tag: v1.89.3 # version like "v1.39" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash + ingress: + additional_labels: {} + class_name: "nginx" + #enabled: + override_yaml: + metadata: {} + instance_name: "kiali" + logger: + log_format: "text" + log_level: "info" + time_field_format: "2006-01-02T15:04:05Z07:00" + sampler_rate: "1" + node_selector: {} + pod_annotations: {} + pod_labels: {} + priority_class_name: "" + # if deployment.hpa is defined, this replicas setting will be ignored + replicas: 1 + resources: + requests: + cpu: "10m" + memory: "64Mi" + limits: + memory: "1Gi" + secret_name: "kiali" + security_context: {} + service_annotations: {} + service_type: "" + tolerations: [] + version_label: v1.89.3 # v1.39 # v1.39.0 # see: https://quay.io/repository/kiali/kiali?tab=tags + view_only_mode: false + +external_services: + custom_dashboards: + enabled: true + istio: + root_namespace: "" + +identity: {} + #cert_file: + #private_key_file: + +kiali_feature_flags: + certificates_information_indicators: + enabled: true + secrets: + - cacerts + - istio-ca-secret + disabled_features: [] + validations: + ignore: ["KIA1301"] + +login_token: + signing_key: "" + +server: + port: 20001 + #node_port: + observability: + metrics: + enabled: true + port: 9090 + web_root: "" + +# Common settings used among istio subcharts. +global: + # Specify rancher clusterId of external tracing config + # https://github.com/istio/istio.io/issues/4146#issuecomment-493543032 + cattle: + systemDefaultRegistry: "" + clusterId: + psp: + enabled: false \ No newline at end of file diff --git a/packages/rancher-istio/1.20/rancher-tracing/charts/.helmignore b/charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/.helmignore similarity index 100% rename from packages/rancher-istio/1.20/rancher-tracing/charts/.helmignore rename to charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/.helmignore diff --git a/packages/rancher-istio/1.20/rancher-tracing/charts/Chart.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/Chart.yaml similarity index 87% rename from packages/rancher-istio/1.20/rancher-tracing/charts/Chart.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/Chart.yaml index 9d5ccb67bc..b27e4ed2ce 100644 --- a/packages/rancher-istio/1.20/rancher-tracing/charts/Chart.yaml +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/Chart.yaml @@ -5,8 +5,8 @@ annotations: catalog.rancher.io/namespace: istio-system catalog.rancher.io/release-name: rancher-tracing apiVersion: v1 -appVersion: 1.53.0 +appVersion: 1.60.0 description: A quick start Jaeger Tracing installation using the all-in-one demo. This is not production qualified. Refer to https://www.jaegertracing.io/ for details. -name: rancher-tracing -version: 1.53.0 +name: tracing +version: 1.60.0 diff --git a/packages/rancher-istio/1.20/rancher-tracing/charts/README.md b/charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/README.md similarity index 100% rename from packages/rancher-istio/1.20/rancher-tracing/charts/README.md rename to charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/README.md diff --git a/packages/rancher-istio/1.20/rancher-tracing/charts/templates/_affinity.tpl b/charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/_affinity.tpl similarity index 100% rename from packages/rancher-istio/1.20/rancher-tracing/charts/templates/_affinity.tpl rename to charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/_affinity.tpl diff --git a/packages/rancher-istio/1.20/rancher-tracing/charts/templates/_helpers.tpl b/charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/_helpers.tpl similarity index 100% rename from packages/rancher-istio/1.20/rancher-tracing/charts/templates/_helpers.tpl rename to charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/_helpers.tpl diff --git a/packages/rancher-istio/1.20/rancher-tracing/charts/templates/deployment.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/deployment.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-tracing/charts/templates/deployment.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/deployment.yaml diff --git a/packages/rancher-istio/1.20/rancher-tracing/charts/templates/psp.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/psp.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-tracing/charts/templates/psp.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/psp.yaml diff --git a/packages/rancher-istio/1.20/rancher-tracing/charts/templates/pvc.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/pvc.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-tracing/charts/templates/pvc.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/pvc.yaml diff --git a/packages/rancher-istio/1.21/rancher-tracing/charts/templates/service.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/service.yaml similarity index 92% rename from packages/rancher-istio/1.21/rancher-tracing/charts/templates/service.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/service.yaml index 4210a9b5fc..3ee5a54247 100644 --- a/packages/rancher-istio/1.21/rancher-tracing/charts/templates/service.yaml +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/service.yaml @@ -59,5 +59,12 @@ spec: port: 14250 targetPort: 14250 protocol: TCP + - port: 9411 + targetPort: 9411 + name: http-zipkin + - port: 4317 + name: grpc-otel + - port: 4318 + name: http-otel selector: app: {{ .Values.provider }} diff --git a/packages/rancher-istio/1.20/rancher-tracing/charts/templates/serviceaccount.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/serviceaccount.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-tracing/charts/templates/serviceaccount.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/serviceaccount.yaml diff --git a/packages/rancher-istio/1.20/rancher-tracing/charts/templates/validate-psp-install.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/validate-psp-install.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-tracing/charts/templates/validate-psp-install.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/templates/validate-psp-install.yaml diff --git a/packages/rancher-istio/1.20/rancher-tracing/charts/values.yaml b/charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/values.yaml similarity index 98% rename from packages/rancher-istio/1.20/rancher-tracing/charts/values.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/values.yaml index 86a4063091..cb58f51fdb 100644 --- a/packages/rancher-istio/1.20/rancher-tracing/charts/values.yaml +++ b/charts/rancher-istio/106.1.0+up1.23.2/charts/tracing/values.yaml @@ -31,7 +31,7 @@ global: jaeger: repository: rancher/mirrored-jaegertracing-all-in-one - tag: 1.53.0 + tag: 1.60.0 # spanStorageType value can be "memory" and "badger" for all-in-one image spanStorageType: badger resources: diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/configs/istio-base.yaml b/charts/rancher-istio/106.1.0+up1.23.2/configs/istio-base.yaml similarity index 97% rename from packages/rancher-istio/1.21/rancher-istio/charts/configs/istio-base.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/configs/istio-base.yaml index 9d99112e36..17fb5ff8c3 100644 --- a/packages/rancher-istio/1.21/rancher-istio/charts/configs/istio-base.yaml +++ b/charts/rancher-istio/106.1.0+up1.23.2/configs/istio-base.yaml @@ -96,6 +96,11 @@ spec: revision: {{ .Values.revision }} meshConfig: defaultConfig: + {{- if .Values.tracing.enabled }} + tracing: + zipkin: + address: {{ .Values.tracing.zipkinAddress }} + {{- end }} proxyMetadata: {{- if .Values.dns.enabled }} ISTIO_META_DNS_CAPTURE: "true" diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/requirements.yaml b/charts/rancher-istio/106.1.0+up1.23.2/requirements.yaml similarity index 82% rename from packages/rancher-istio/1.21/rancher-istio/charts/requirements.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/requirements.yaml index 6db92ab2fa..cb4c3fe75c 100644 --- a/packages/rancher-istio/1.21/rancher-istio/charts/requirements.yaml +++ b/charts/rancher-istio/106.1.0+up1.23.2/requirements.yaml @@ -2,8 +2,8 @@ dependencies: - condition: kiali.enabled name: kiali repository: file://./charts/kiali - version: 1.79.0 + version: 1.89.3 - condition: tracing.enabled name: tracing repository: file://./charts/tracing - version: 1.56.0 + version: 1.60.0 diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/samples/overlay-example.yaml b/charts/rancher-istio/106.1.0+up1.23.2/samples/overlay-example.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/samples/overlay-example.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/samples/overlay-example.yaml diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/templates/_helpers.tpl b/charts/rancher-istio/106.1.0+up1.23.2/templates/_helpers.tpl similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/templates/_helpers.tpl rename to charts/rancher-istio/106.1.0+up1.23.2/templates/_helpers.tpl diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/templates/admin-role.yaml b/charts/rancher-istio/106.1.0+up1.23.2/templates/admin-role.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/templates/admin-role.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/templates/admin-role.yaml diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/templates/base-config-map.yaml b/charts/rancher-istio/106.1.0+up1.23.2/templates/base-config-map.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/templates/base-config-map.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/templates/base-config-map.yaml diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/templates/clusterrole.yaml b/charts/rancher-istio/106.1.0+up1.23.2/templates/clusterrole.yaml similarity index 95% rename from packages/rancher-istio/1.21/rancher-istio/charts/templates/clusterrole.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/templates/clusterrole.yaml index f8f229987d..31163f9325 100644 --- a/packages/rancher-istio/1.21/rancher-istio/charts/templates/clusterrole.yaml +++ b/charts/rancher-istio/106.1.0+up1.23.2/templates/clusterrole.yaml @@ -123,6 +123,14 @@ rules: - serviceaccounts verbs: - '*' +- apiGroups: + - "" + resources: + - nodes + verbs: + - 'get' + - 'list' + - 'watch' {{- if and .Values.global.cattle.psp.enabled }} - apiGroups: - policy diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/templates/clusterrolebinding.yaml b/charts/rancher-istio/106.1.0+up1.23.2/templates/clusterrolebinding.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/templates/clusterrolebinding.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/templates/clusterrolebinding.yaml diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/templates/edit-role.yaml b/charts/rancher-istio/106.1.0+up1.23.2/templates/edit-role.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/templates/edit-role.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/templates/edit-role.yaml diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/templates/istio-cni-psp.yaml b/charts/rancher-istio/106.1.0+up1.23.2/templates/istio-cni-psp.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/templates/istio-cni-psp.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/templates/istio-cni-psp.yaml diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/templates/istio-install-job.yaml b/charts/rancher-istio/106.1.0+up1.23.2/templates/istio-install-job.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/templates/istio-install-job.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/templates/istio-install-job.yaml diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/templates/istio-install-psp.yaml b/charts/rancher-istio/106.1.0+up1.23.2/templates/istio-install-psp.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/templates/istio-install-psp.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/templates/istio-install-psp.yaml diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/templates/istio-psp.yaml b/charts/rancher-istio/106.1.0+up1.23.2/templates/istio-psp.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/templates/istio-psp.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/templates/istio-psp.yaml diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/templates/istio-uninstall-job.yaml b/charts/rancher-istio/106.1.0+up1.23.2/templates/istio-uninstall-job.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/templates/istio-uninstall-job.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/templates/istio-uninstall-job.yaml diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/templates/overlay-config-map.yaml b/charts/rancher-istio/106.1.0+up1.23.2/templates/overlay-config-map.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/templates/overlay-config-map.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/templates/overlay-config-map.yaml diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/templates/service-monitors.yaml b/charts/rancher-istio/106.1.0+up1.23.2/templates/service-monitors.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/templates/service-monitors.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/templates/service-monitors.yaml diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/templates/serviceaccount.yaml b/charts/rancher-istio/106.1.0+up1.23.2/templates/serviceaccount.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/templates/serviceaccount.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/templates/serviceaccount.yaml diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/templates/validate-psp-install.yaml b/charts/rancher-istio/106.1.0+up1.23.2/templates/validate-psp-install.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/templates/validate-psp-install.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/templates/validate-psp-install.yaml diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/templates/view-role.yaml b/charts/rancher-istio/106.1.0+up1.23.2/templates/view-role.yaml similarity index 100% rename from packages/rancher-istio/1.20/rancher-istio/charts/templates/view-role.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/templates/view-role.yaml diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/values.yaml b/charts/rancher-istio/106.1.0+up1.23.2/values.yaml similarity index 92% rename from packages/rancher-istio/1.21/rancher-istio/charts/values.yaml rename to charts/rancher-istio/106.1.0+up1.23.2/values.yaml index 8a9b3bc779..ad46defdb6 100644 --- a/packages/rancher-istio/1.21/rancher-istio/charts/values.yaml +++ b/charts/rancher-istio/106.1.0+up1.23.2/values.yaml @@ -1,11 +1,11 @@ overlayFile: "" -tag: 1.21.1 +tag: 1.23.2 ##Setting forceInstall: true will remove the check for istio version < 1.6.x and will not analyze your install cluster prior to install forceInstall: false installer: repository: rancher/istio-installer - tag: 1.21.1-rancher1 + tag: 1.23.2-rancher1 ##releaseMirror are configurations for istio upgrades. ##Setting releaseMirror.enabled: true will cause istio to use bundled in images from rancher/istio-installer to perfom an upgrade - this is ideal ##for airgap setups. Setting releaseMirror.enabled to false means istio will call externally to github to fetch the required assets. @@ -28,8 +28,8 @@ cni: repository: rancher/mirrored-istio-install-cni # If you wish to troubleshoot Istio, you can switch to regular images by uncommenting the following tag and deleting # the distroless tag: -# tag: 1.21.1 - tag: 1.21.1-distroless +# tag: 1.23.2 + tag: 1.23.2-distroless logLevel: info excludeNamespaces: - istio-system @@ -55,8 +55,8 @@ pilot: repository: rancher/mirrored-istio-pilot # If you wish to troubleshoot Istio, you can switch to regular images by uncommenting the following tag and deleting # the distroless tag: -# tag: 1.21.1 - tag: 1.21.1-distroless +# tag: 1.23.2 + tag: 1.23.2-distroless hpaSpec: {} podDisruptionBudget: {} @@ -74,14 +74,14 @@ global: repository: rancher/mirrored-istio-proxyv2 # If you wish to troubleshoot Istio, you can switch to regular images by uncommenting the following tag and deleting # the distroless tag: -# tag: 1.21.1 - tag: 1.21.1-distroless +# tag: 1.23.2 + tag: 1.23.2-distroless proxy_init: repository: rancher/mirrored-istio-proxyv2 # If you wish to troubleshoot Istio, you can switch to regular images by uncommenting the following tag and deleting # the distroless tag: -# tag: 1.21.1 - tag: 1.21.1-distroless +# tag: 1.23.2 + tag: 1.23.2-distroless defaultPodDisruptionBudget: enabled: true @@ -109,6 +109,8 @@ kiali: tracing: enabled: false contextPath: "/jaeger" + zipkinAddress: zipkin.istio-system.svc:9411 + ## Node labels for pod assignment ## Ref: https://kubernetes.io/docs/user-guide/node-selection/ diff --git a/charts/rancher-istio/106.2.0+up1.24.1/Chart.yaml b/charts/rancher-istio/106.2.0+up1.24.1/Chart.yaml new file mode 100644 index 0000000000..a4125796b8 --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/Chart.yaml @@ -0,0 +1,24 @@ +annotations: + catalog.cattle.io/certified: rancher + catalog.cattle.io/display-name: Istio + catalog.cattle.io/kube-version: '>= 1.28.0-0 < 1.32.0-0' + catalog.cattle.io/namespace: istio-system + catalog.cattle.io/os: linux + catalog.cattle.io/permits-os: linux,windows + catalog.cattle.io/rancher-version: '>= 2.11.0-0 < 2.12.0-0' + catalog.cattle.io/release-name: rancher-istio + catalog.cattle.io/requests-cpu: 710m + catalog.cattle.io/requests-memory: 2314Mi + catalog.cattle.io/type: cluster-tool + catalog.cattle.io/ui-component: istio + catalog.cattle.io/upstream-version: 1.23.2 +apiVersion: v1 +appVersion: 1.23.2 +description: A basic Istio setup that installs with the istioctl. Refer to https://istio.io/latest/ + for details. +icon: https://charts.rancher.io/assets/logos/istio.svg +keywords: +- networking +- infrastructure +name: rancher-istio +version: 106.2.0+up1.24.1 diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/README.md b/charts/rancher-istio/106.2.0+up1.24.1/README.md similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/README.md rename to charts/rancher-istio/106.2.0+up1.24.1/README.md diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/app-readme.md b/charts/rancher-istio/106.2.0+up1.24.1/app-readme.md similarity index 98% rename from packages/rancher-istio/1.20/rancher-istio/charts/app-readme.md rename to charts/rancher-istio/106.2.0+up1.24.1/app-readme.md index 3ef8193a72..5e2629648c 100644 --- a/packages/rancher-istio/1.20/rancher-istio/charts/app-readme.md +++ b/charts/rancher-istio/106.2.0+up1.24.1/app-readme.md @@ -38,7 +38,7 @@ To install istio with CNI enabled, e.g. when cluster has a default PSP set to "r See [this issue](https://github.com/rancher/rancher/issues/33291) for details. ## Installing istio with distroless-images. -Istio `104.2.0+up1.20.3` uses distroless images for `istio-proxyv2`, `istio-install-cni` and `istio-pilot`. Distroless images don't have the common debugging tools like `bash`, `curl`, etc. If you wish to troubleshoot Istio, you can switch to regular images by updating `values.yaml` file. +Istio `104.5.0+up1.24.1` uses distroless images for `istio-proxyv2`, `istio-install-cni` and `istio-pilot`. Distroless images don't have the common debugging tools like `bash`, `curl`, etc. If you wish to troubleshoot Istio, you can switch to regular images by updating `values.yaml` file. ## Deprecations diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/Chart.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/Chart.yaml new file mode 100644 index 0000000000..ea10fb720d --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/Chart.yaml @@ -0,0 +1,28 @@ +annotations: + catalog.cattle.io/hidden: "true" + catalog.cattle.io/os: linux + 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 +apiVersion: v2 +appVersion: v2.1.0 +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/current/assets/icons/logo.svg +keywords: +- istio +- kiali +- networking +- infrastructure +maintainers: +- email: kiali-users@googlegroups.com + name: Kiali + url: https://kiali.io +name: kiali +sources: +- https://github.com/kiali/kiali +- https://github.com/kiali/kiali-operator +- https://github.com/kiali/helm-charts +version: 2.1.0 diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/NOTES.txt b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/NOTES.txt new file mode 100644 index 0000000000..fac4e8d6c9 --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/NOTES.txt @@ -0,0 +1,20 @@ +Welcome to Kiali! For more details on Kiali, see: https://kiali.io + +The Kiali Server [{{ .Chart.AppVersion }}] has been installed in namespace [{{ .Release.Namespace }}]. It will be ready soon. + +{{- if not .Values.deployment.cluster_wide_access }} +=============== +!!! WARNING !!! +=============== +This Kiali Server Helm Chart does NOT support "deployment.cluster_wide_access" set to "false"! + +This feature, as well as others, is only available when using the Kiali Operator to install +the Kiali Server. It is for this reason this Kiali Server Helm Chart, while provided for +convenience, is not the recommended installation mechanism for installing the Kiali Server. +{{- end }} + +When installing with "deployment.cluster_wide_access=false" using this Kiali Server Helm Chart, +it is your responsibility to manually create the proper Roles and RoleBindings for the Kiali Server +to have the correct permissions to access the service mesh namespaces. + +(Helm: Chart=[{{ .Chart.Name }}], Release=[{{ .Release.Name }}], Version=[{{ .Chart.Version }}]) diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/_helpers.tpl b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/_helpers.tpl new file mode 100644 index 0000000000..1936d1bc2a --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/_helpers.tpl @@ -0,0 +1,221 @@ +{{/* vim: set filetype=mustache: */}} + +{{/* +Create a default fully qualified instance name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +To simulate the way the operator works, use deployment.instance_name. +*/}} +{{- define "kiali-server.fullname" -}} +{{- .Values.deployment.instance_name | trunc 63 }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "kiali-server.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Determine if on OpenShift (when debugging the chart for OpenShift use-cases, set "simulateOpenShift") +*/}} +{{- define "kiali-server.isOpenShift" -}} +{{- .Values.isOpenShift | default (.Capabilities.APIVersions.Has "operator.openshift.io/v1") -}} +{{- end }} + +{{/* +Identifies the log_level. +*/}} +{{- define "kiali-server.logLevel" -}} +{{- .Values.deployment.logger.log_level -}} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "kiali-server.labels" -}} +helm.sh/chart: {{ include "kiali-server.chart" . }} +app: kiali +{{ include "kiali-server.selectorLabels" . }} +version: {{ .Values.deployment.version_label | default .Chart.AppVersion | quote }} +app.kubernetes.io/version: {{ .Values.deployment.version_label | default .Chart.AppVersion | quote }} +app.kubernetes.io/part-of: "kiali" +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "kiali-server.selectorLabels" -}} +{{- $releaseName := .Release.Name -}} +{{- $fullName := include "kiali-server.fullname" . -}} +{{- $deployment := (lookup "apps/v1" "Deployment" .Release.Namespace $fullName) -}} +app.kubernetes.io/name: kiali +{{- if (and .Release.IsUpgrade $deployment)}} +app.kubernetes.io/instance: {{ (get (($deployment).metadata.labels) "app.kubernetes.io/instance") | default $fullName }} +{{- else }} +app.kubernetes.io/instance: {{ $fullName }} +{{- end }} +{{- end }} + +{{/* +Determine the default login token signing key. +*/}} +{{- define "kiali-server.login_token.signing_key" -}} +{{- if .Values.login_token.signing_key }} + {{- .Values.login_token.signing_key }} +{{- else }} + {{- randAlphaNum 16 }} +{{- end }} +{{- end }} + +{{/* +Determine the default web root. +*/}} +{{- define "kiali-server.server.web_root" -}} +{{- if .Values.server.web_root }} + {{- if (eq .Values.server.web_root "/") }} + {{- .Values.server.web_root }} + {{- else }} + {{- .Values.server.web_root | trimSuffix "/" }} + {{- end }} +{{- else }} + {{- if eq "true" (include "kiali-server.isOpenShift" .) }} + {{- "/" }} + {{- else }} + {{- "/kiali" }} + {{- end }} +{{- end }} +{{- end }} + +{{/* +Determine the default identity cert file. There is no default if on k8s; only on OpenShift. +*/}} +{{- define "kiali-server.identity.cert_file" -}} +{{- if hasKey .Values.identity "cert_file" }} + {{- .Values.identity.cert_file }} +{{- else }} + {{- if eq "true" (include "kiali-server.isOpenShift" .) }} + {{- "/kiali-cert/tls.crt" }} + {{- else }} + {{- "" }} + {{- end }} +{{- end }} +{{- end }} + +{{/* +Determine the default identity private key file. There is no default if on k8s; only on OpenShift. +*/}} +{{- define "kiali-server.identity.private_key_file" -}} +{{- if hasKey .Values.identity "private_key_file" }} + {{- .Values.identity.private_key_file }} +{{- else }} + {{- if eq "true" (include "kiali-server.isOpenShift" .) }} + {{- "/kiali-cert/tls.key" }} + {{- else }} + {{- "" }} + {{- end }} +{{- end }} +{{- end }} + +{{/* +Determine the default deployment.ingress.enabled. Disable it on k8s; enable it on OpenShift. +*/}} +{{- define "kiali-server.deployment.ingress.enabled" -}} +{{- if hasKey .Values.deployment.ingress "enabled" }} + {{- .Values.deployment.ingress.enabled }} +{{- else }} + {{- if eq "true" (include "kiali-server.isOpenShift" .) }} + {{- true }} + {{- else }} + {{- false }} + {{- end }} +{{- end }} +{{- end }} + +{{/* +Determine the istio namespace - default is where Kiali is installed. +*/}} +{{- define "kiali-server.istio_namespace" -}} +{{- if .Values.istio_namespace }} + {{- .Values.istio_namespace }} +{{- else }} + {{- .Release.Namespace }} +{{- end }} +{{- end }} + +{{/* +Determine the auth strategy to use - default is "token" on Kubernetes and "openshift" on OpenShift. +*/}} +{{- define "kiali-server.auth.strategy" -}} +{{- if .Values.auth.strategy }} + {{- if (and ((and (eq .Values.auth.strategy "openshift") (not .Values.kiali_route_url))) (not .Values.auth.openshift.redirect_uris)) }} + {{- fail "You did not define what the Kiali Route URL will be (--set kiali_route_url=...). Without this set, the openshift auth strategy will not work. Either (a) set that, (b) explicitly define redirect URIs via --set auth.openshift.redirect_uris, or (c) use a different auth strategy via the --set auth.strategy=... option." }} + {{- end }} + {{- .Values.auth.strategy }} +{{- else }} + {{- if eq "true" (include "kiali-server.isOpenShift" .) }} + {{- if (and (not .Values.kiali_route_url) (not .Values.auth.openshift.redirect_uris)) }} + {{- fail "You did not define what the Kiali Route URL will be (--set kiali_route_url=...). Without this set, the openshift auth strategy will not work. Either (a) set that, (b) explicitly define redirect URIs via --set auth.openshift.redirect_uris, or (c) use a different auth strategy via the --set auth.strategy=... option." }} + {{- end }} + {{- "openshift" }} + {{- else }} + {{- "token" }} + {{- end }} +{{- end }} +{{- end }} + +{{/* +Determine the root namespace - default is where Kiali is installed. +*/}} +{{- define "kiali-server.external_services.istio.root_namespace" -}} +{{- if .Values.external_services.istio.root_namespace }} + {{- .Values.external_services.istio.root_namespace }} +{{- else }} + {{- .Release.Namespace }} +{{- end }} +{{- end }} +{{- define "system_default_registry" -}} +{{- if .Values.global.cattle.systemDefaultRegistry -}} +{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}} +{{- else -}} +{{- "" -}} +{{- end -}} +{{- 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" -}} +kubernetes.io/os: linux +{{- end -}} + +{{/* +Autodetect remote cluster secrets if enabled - looks for secrets in the same namespace where Kiali is installed. +Returns a JSON dict whose keys are the cluster names and values are the cluster secret data. +*/}} +{{- define "kiali-server.remote-cluster-secrets" -}} +{{- $theDict := dict }} +{{- if .Values.clustering.autodetect_secrets.enabled }} + {{- $secretLabelToLookFor := (regexSplit "=" .Values.clustering.autodetect_secrets.label 2) }} + {{- $secretLabelNameToLookFor := first $secretLabelToLookFor }} + {{- $secretLabelValueToLookFor := last $secretLabelToLookFor }} + {{- range $i, $secret := (lookup "v1" "Secret" .Release.Namespace "").items }} + {{- if (and (and (hasKey $secret.metadata "labels") (hasKey $secret.metadata.labels $secretLabelNameToLookFor)) (eq (get $secret.metadata.labels $secretLabelNameToLookFor) ($secretLabelValueToLookFor))) }} + {{- $clusterName := $secret.metadata.name }} + {{- if (and (hasKey $secret.metadata "annotations") (hasKey $secret.metadata.annotations "kiali.io/cluster")) }} + {{- $clusterName = get $secret.metadata.annotations "kiali.io/cluster" }} + {{- end }} + {{- $theDict = set $theDict $clusterName $secret.metadata.name }} + {{- end }} + {{- end }} +{{- end }} +{{- $theDict | toJson }} +{{- end }} diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/cabundle.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/cabundle.yaml new file mode 100644 index 0000000000..e0bc1f2c2f --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/cabundle.yaml @@ -0,0 +1,15 @@ +{{- if not .Values.deployment.remote_cluster_resources_only }} +{{- if eq "true" (include "kiali-server.isOpenShift" .) }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "kiali-server.fullname" . }}-cabundle + namespace: "{{ .Release.Namespace }}" + labels: + {{- include "kiali-server.labels" . | nindent 4 }} + annotations: + service.beta.openshift.io/inject-cabundle: "true" +... +{{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/configmap.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/configmap.yaml new file mode 100644 index 0000000000..45b571ec16 --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/configmap.yaml @@ -0,0 +1,30 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: "{{ .Release.Namespace }}" + labels: + {{- include "kiali-server.labels" . | nindent 4 }} + {{- if .Values.deployment.configmap_annotations }} + annotations: + {{- toYaml .Values.deployment.configmap_annotations | nindent 4 }} + {{- end }} +data: + config.yaml: | + {{- /* Most of .Values is simply the ConfigMap - strip out the keys that are not part of the ConfigMap */}} + {{- $cm := omit .Values "kiali_route_url" }} + {{- /* The helm chart defines namespace for us, but pass it to the ConfigMap in case the server needs it */}} + {{- $_ := set $cm.deployment "namespace" .Release.Namespace }} + {{- /* Some values of the ConfigMap are generated, but might not be identical, from .Values */}} + {{- $_ := set $cm "istio_namespace" (include "kiali-server.istio_namespace" .) }} + {{- $_ := set $cm.auth "strategy" (include "kiali-server.auth.strategy" .) }} + {{- $_ := set $cm.auth.openshift "client_id_prefix" (include "kiali-server.fullname" .) }} + {{- $_ := set $cm.deployment "instance_name" (include "kiali-server.fullname" .) }} + {{- $_ := set $cm.identity "cert_file" (include "kiali-server.identity.cert_file" .) }} + {{- $_ := set $cm.identity "private_key_file" (include "kiali-server.identity.private_key_file" .) }} + {{- $_ := set $cm.login_token "signing_key" (include "kiali-server.login_token.signing_key" .) }} + {{- $_ := set $cm.external_services.istio "root_namespace" (include "kiali-server.external_services.istio.root_namespace" .) }} + {{- $_ := set $cm.server "web_root" (include "kiali-server.server.web_root" .) }} + {{- toYaml $cm | nindent 4 }} +... diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/deployment.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/deployment.yaml new file mode 100644 index 0000000000..e5d38b1163 --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/deployment.yaml @@ -0,0 +1,243 @@ +{{- if not .Values.deployment.remote_cluster_resources_only }} +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: "{{ .Release.Namespace }}" + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +spec: +{{- if not .Values.deployment.hpa.spec }} + replicas: {{ .Values.deployment.replicas }} +{{- end }} + selector: + matchLabels: + {{- include "kiali-server.selectorLabels" . | nindent 6 }} + strategy: + rollingUpdate: + maxSurge: 1 + maxUnavailable: 1 + type: RollingUpdate + template: + metadata: + name: {{ include "kiali-server.fullname" . }} + labels: + {{- include "kiali-server.labels" . | nindent 8 }} + {{- if .Values.deployment.pod_labels }} + {{- toYaml .Values.deployment.pod_labels | nindent 8 }} + {{- end }} + annotations: + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- if .Values.server.observability.metrics.enabled }} + prometheus.io/scrape: "true" + prometheus.io/port: {{ .Values.server.observability.metrics.port | quote }} + {{- else }} + prometheus.io/scrape: "false" + prometheus.io/port: "" + {{- end }} + kiali.io/dashboards: go,kiali + {{- if .Values.deployment.pod_annotations }} + {{- toYaml .Values.deployment.pod_annotations | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ include "kiali-server.fullname" . }} + {{- if .Values.deployment.priority_class_name }} + priorityClassName: {{ .Values.deployment.priority_class_name | quote }} + {{- end }} + {{- if .Values.deployment.image_pull_secrets }} + imagePullSecrets: + {{- range .Values.deployment.image_pull_secrets }} + - name: {{ . }} + {{- end }} + {{- end }} + {{- if .Values.deployment.host_aliases }} + hostAliases: + {{- toYaml .Values.deployment.host_aliases | nindent 6 }} + {{- end }} + {{- if .Values.deployment.dns }} + {{- if .Values.deployment.dns.policy }} + dnsPolicy: "{{ .Values.deployment.dns.policy }}" + {{- end }} + {{- if .Values.deployment.dns.config }} + dnsConfig: + {{- toYaml .Values.deployment.dns.config | nindent 8 }} + {{- end }} + {{- end }} + containers: + - 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: + - "/opt/kiali/kiali" + - "-config" + - "/kiali-configuration/config.yaml" + securityContext: + {{- if .Values.deployment.security_context}} + {{- toYaml .Values.deployment.security_context | nindent 10 }} + {{- else }} + allowPrivilegeEscalation: false + privileged: false + readOnlyRootFilesystem: true + runAsNonRoot: true + capabilities: + drop: + - ALL + {{- end }} + ports: + - name: api-port + containerPort: {{ .Values.server.port | default 20001 }} + {{- if .Values.server.observability.metrics.enabled }} + - name: http-metrics + containerPort: {{ .Values.server.observability.metrics.port | default 9090 }} + {{- end }} + readinessProbe: + httpGet: + path: {{ include "kiali-server.server.web_root" . | trimSuffix "/" }}/healthz + port: api-port + {{- if (include "kiali-server.identity.cert_file" .) }} + scheme: HTTPS + {{- else }} + scheme: HTTP + {{- end }} + initialDelaySeconds: 5 + periodSeconds: 30 + livenessProbe: + httpGet: + path: {{ include "kiali-server.server.web_root" . | trimSuffix "/" }}/healthz + port: api-port + {{- if (include "kiali-server.identity.cert_file" .) }} + scheme: HTTPS + {{- else }} + scheme: HTTP + {{- end }} + initialDelaySeconds: 5 + periodSeconds: 30 + env: + - name: ACTIVE_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: LOG_LEVEL + value: "{{ include "kiali-server.logLevel" . }}" + - name: LOG_FORMAT + value: "{{ .Values.deployment.logger.log_format }}" + - name: LOG_TIME_FIELD_FORMAT + value: "{{ .Values.deployment.logger.time_field_format }}" + - name: LOG_SAMPLER_RATE + value: "{{ .Values.deployment.logger.sampler_rate }}" + {{- range .Values.deployment.custom_envs }} + - name: {{ .name | quote }} + value: {{ .value | quote }} + {{- end }} + volumeMounts: + {{- if .Values.web_root_override }} + - name: kiali-console + subPath: env.js + mountPath: /opt/kiali/console/env.js + {{- end }} + - name: {{ include "kiali-server.fullname" . }}-configuration + mountPath: "/kiali-configuration" + - name: {{ include "kiali-server.fullname" . }}-cert + mountPath: "/kiali-cert" + - name: {{ include "kiali-server.fullname" . }}-secret + mountPath: "/kiali-secret" + - name: {{ include "kiali-server.fullname" . }}-cabundle + mountPath: "/kiali-cabundle" + {{- range .Values.deployment.custom_secrets }} + - name: {{ .name }} + mountPath: "{{ .mount }}" + {{- end }} + {{- range $key, $val := (include "kiali-server.remote-cluster-secrets" .) | fromJson }} + - name: {{ $key }} + mountPath: "/kiali-remote-cluster-secrets/{{ $val }}" + {{- end }} + {{- range .Values.clustering.clusters }} + {{- if .secret_name }} + - name: {{ .name }} + mountPath: "/kiali-remote-cluster-secrets/{{ .secret_name }}" + {{- end }} + {{- end }} + {{- if .Values.deployment.resources }} + resources: + {{- toYaml .Values.deployment.resources | nindent 10 }} + {{- end }} + volumes: + {{- if .Values.web_root_override }} + - name: kiali-console + configMap: + name: kiali-console + items: + - key: env.js + path: env.js + {{- end }} + - name: {{ include "kiali-server.fullname" . }}-configuration + configMap: + name: {{ include "kiali-server.fullname" . }} + - name: {{ include "kiali-server.fullname" . }}-cert + secret: + {{- if eq "true" (include "kiali-server.isOpenShift" .) }} + secretName: {{ include "kiali-server.fullname" . }}-cert-secret + {{- else }} + secretName: istio.{{ include "kiali-server.fullname" . }}-service-account + {{- end }} + {{- if not (include "kiali-server.identity.cert_file" .) }} + optional: true + {{- end }} + - name: {{ include "kiali-server.fullname" . }}-secret + secret: + secretName: {{ .Values.deployment.secret_name }} + optional: true + - name: {{ include "kiali-server.fullname" . }}-cabundle + configMap: + name: {{ include "kiali-server.fullname" . }}-cabundle + {{- if not (eq "true" (include "kiali-server.isOpenShift" .)) }} + optional: true + {{- end }} + {{- range .Values.deployment.custom_secrets }} + - name: {{ .name }} + {{- if .csi}} + csi: {{ toYaml .csi | nindent 10 }} + {{- else }} + secret: + secretName: {{ .name }} + optional: {{ .optional | default false }} + {{- end }} + {{- end }} + {{- range $key, $val := (include "kiali-server.remote-cluster-secrets" .) | fromJson }} + - name: {{ $key }} + secret: + secretName: {{ $val }} + {{- end }} + {{- range .Values.clustering.clusters }} + {{- if .secret_name }} + - name: {{ .name }} + secret: + secretName: {{ .secret_name }} + {{- end }} + {{- end }} + {{- if or (.Values.deployment.affinity.node) (or (.Values.deployment.affinity.pod) (.Values.deployment.affinity.pod_anti)) }} + affinity: + {{- if .Values.deployment.affinity.node }} + nodeAffinity: + {{- toYaml .Values.deployment.affinity.node | nindent 10 }} + {{- end }} + {{- if .Values.deployment.affinity.pod }} + podAffinity: + {{- toYaml .Values.deployment.affinity.pod | nindent 10 }} + {{- end }} + {{- if .Values.deployment.affinity.pod_anti }} + podAntiAffinity: + {{- toYaml .Values.deployment.affinity.pod_anti | nindent 10 }} + {{- end }} + {{- end }} + tolerations: {{ include "linux-node-tolerations" . | nindent 8 }} +{{- if .Values.deployment.tolerations }} +{{ toYaml .Values.deployment.tolerations | indent 8 }} +{{- end }} + nodeSelector: {{ include "linux-node-selector" . | nindent 8 }} +{{- if .Values.deployment.node_selector }} +{{ toYaml .Values.deployment.node_selector | indent 8 }} +{{- end }} +... +{{- end }} \ No newline at end of file diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/hpa.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/hpa.yaml new file mode 100644 index 0000000000..d04cb0cda6 --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/hpa.yaml @@ -0,0 +1,19 @@ +{{- if not .Values.deployment.remote_cluster_resources_only }} +{{- if .Values.deployment.hpa.spec }} +--- +apiVersion: {{ .Values.deployment.hpa.api_version }} +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: "{{ .Release.Namespace }}" + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "kiali-server.fullname" . }} + {{- toYaml .Values.deployment.hpa.spec | nindent 2 }} +... +{{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/ingress.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/ingress.yaml new file mode 100644 index 0000000000..911b63c46c --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/ingress.yaml @@ -0,0 +1,64 @@ +{{- if not .Values.deployment.remote_cluster_resources_only }} +{{- if not (eq "true" (include "kiali-server.isOpenShift" .)) }} +{{- if eq "true" (include "kiali-server.deployment.ingress.enabled" .) }} +--- +{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} +apiVersion: networking.k8s.io/v1 +{{- else }} +apiVersion: networking.k8s.io/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: "{{ .Release.Namespace }}" + labels: + {{- if .Values.deployment.ingress.additional_labels }} + {{- toYaml .Values.deployment.ingress.additional_labels | nindent 4 }} + {{- end }} + {{- include "kiali-server.labels" . | nindent 4 }} + annotations: + {{- if .Values.deployment.ingress.override_yaml.metadata.annotations }} + {{- toYaml .Values.deployment.ingress.override_yaml.metadata.annotations | nindent 4 }} + {{- else }} + # For ingress-nginx versions older than 0.20.0 use secure-backends. + # (see: https://github.com/kubernetes/ingress-nginx/issues/3416#issuecomment-438247948) + # For ingress-nginx versions 0.20.0 and later use backend-protocol. + {{- if (include "kiali-server.identity.cert_file" .) }} + nginx.ingress.kubernetes.io/secure-backends: "true" + nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" + {{- else }} + nginx.ingress.kubernetes.io/secure-backends: "false" + nginx.ingress.kubernetes.io/backend-protocol: "HTTP" + {{- end }} + {{- end }} +spec: + {{- if hasKey .Values.deployment.ingress.override_yaml "spec" }} + {{- toYaml .Values.deployment.ingress.override_yaml.spec | nindent 2 }} + {{- else }} + {{- if .Values.deployment.ingress.class_name }} + ingressClassName: {{ .Values.deployment.ingress.class_name }} + {{- end }} + rules: + - http: + paths: + - path: {{ include "kiali-server.server.web_root" . }} + {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} + pathType: Prefix + backend: + service: + name: {{ include "kiali-server.fullname" . }} + port: + number: {{ .Values.server.port }} + {{- else }} + backend: + serviceName: {{ include "kiali-server.fullname" . }} + servicePort: {{ .Values.server.port }} + {{- end }} + {{- if not (empty .Values.server.web_fqdn) }} + host: {{ .Values.server.web_fqdn }} + {{- end }} + {{- end }} +... +{{- end }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/oauth.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/oauth.yaml new file mode 100644 index 0000000000..223b8cdc3b --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/oauth.yaml @@ -0,0 +1,31 @@ +{{- if eq "true" (include "kiali-server.isOpenShift" .) }} +{{- if (or (.Values.kiali_route_url) (.Values.auth.openshift.redirect_uris)) }} +--- +apiVersion: oauth.openshift.io/v1 +kind: OAuthClient +metadata: + name: {{ include "kiali-server.fullname" . }}-{{ .Release.Namespace }} + namespace: "{{ .Release.Namespace }}" + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +redirectURIs: +{{- if .Values.auth.openshift.redirect_uris }} +{{- range .Values.auth.openshift.redirect_uris }} +- {{ . }} +{{- end }} +{{- else }} +- {{ .Values.kiali_route_url }}/api/auth/callback +{{- if .Values.server.web_port }} +- {{ .Values.kiali_route_url }}:{{ .Values.server.web_port }}/api/auth/callback +{{- end }} +{{- end }} +grantMethod: auto +{{- if .Values.auth.openshift.token_inactivity_timeout }} +accessTokenInactivityTimeoutSeconds: {{ .Values.auth.openshift.token_inactivity_timeout }} +{{- end }} +{{- if .Values.auth.openshift.token_max_age }} +accessTokenMaxAgeSeconds: {{ .Values.auth.openshift.token_max_age }} +{{- end }} +... +{{- end }} +{{- end }} diff --git a/packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/overlay/templates/psp.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/psp.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/overlay/templates/psp.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/psp.yaml diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/role-viewer.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/role-viewer.yaml new file mode 100644 index 0000000000..cbe6d0d7fa --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/role-viewer.yaml @@ -0,0 +1,103 @@ +{{- if or (.Values.deployment.view_only_mode) (ne .Values.auth.strategy "anonymous") -}} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: {{ include "kiali-server.fullname" . }}-viewer + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +rules: +- apiGroups: [""] + resources: + - configmaps + - endpoints +{{- if not (has "logs-tab" .Values.kiali_feature_flags.disabled_features) }} + - pods/log +{{- end }} + verbs: + - get + - list + - watch +- apiGroups: [""] + resources: + - namespaces + - pods + - replicationcontrollers + - services + verbs: + - get + - list + - watch +- apiGroups: [""] + resources: + - pods/portforward + verbs: + - create + - post +- apiGroups: ["extensions", "apps"] + resources: + - daemonsets + - deployments + - replicasets + - statefulsets + verbs: + - get + - list + - watch +- apiGroups: ["batch"] + resources: + - cronjobs + - jobs + verbs: + - get + - list + - watch +- apiGroups: + - networking.istio.io + - security.istio.io + - extensions.istio.io + - telemetry.istio.io + - gateway.networking.k8s.io + resources: ["*"] + verbs: + - get + - list + - watch +- apiGroups: ["apps.openshift.io"] + resources: + - deploymentconfigs + verbs: + - get + - list + - watch +- apiGroups: ["project.openshift.io"] + resources: + - projects + verbs: + - get +- apiGroups: ["route.openshift.io"] + resources: + - routes + verbs: + - get +- apiGroups: ["authentication.k8s.io"] + resources: + - tokenreviews + verbs: + - create +- apiGroups: ["oauth.openshift.io"] + resources: + - oauthclients + resourceNames: + - {{ include "kiali-server.fullname" . }}-{{ .Release.Namespace }} + verbs: + - get +- apiGroups: ["admissionregistration.k8s.io"] + resources: + - mutatingwebhookconfigurations + verbs: + - get + - list + - watch +... +{{- end -}} diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/role.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/role.yaml new file mode 100644 index 0000000000..74c574d318 --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/role.yaml @@ -0,0 +1,110 @@ +{{- if not (or (.Values.deployment.view_only_mode) (ne .Values.auth.strategy "anonymous")) -}} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: {{ include "kiali-server.fullname" . }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +rules: +- apiGroups: [""] + resources: + - configmaps + - endpoints +{{- if not (has "logs-tab" .Values.kiali_feature_flags.disabled_features) }} + - pods/log +{{- end }} + verbs: + - get + - list + - watch +- apiGroups: [""] + resources: + - namespaces + - pods + - replicationcontrollers + - services + verbs: + - get + - list + - watch + - patch +- apiGroups: [""] + resources: + - pods/portforward + verbs: + - create + - post +- apiGroups: ["extensions", "apps"] + resources: + - daemonsets + - deployments + - replicasets + - statefulsets + verbs: + - get + - list + - watch + - patch +- apiGroups: ["batch"] + resources: + - cronjobs + - jobs + verbs: + - get + - list + - watch + - patch +- apiGroups: + - networking.istio.io + - security.istio.io + - extensions.istio.io + - telemetry.istio.io + - gateway.networking.k8s.io + resources: ["*"] + verbs: + - get + - list + - watch + - create + - delete + - patch +- apiGroups: ["apps.openshift.io"] + resources: + - deploymentconfigs + verbs: + - get + - list + - watch + - patch +- apiGroups: ["project.openshift.io"] + resources: + - projects + verbs: + - get +- apiGroups: ["route.openshift.io"] + resources: + - routes + verbs: + - get +- apiGroups: ["authentication.k8s.io"] + resources: + - tokenreviews + verbs: + - create +- apiGroups: ["oauth.openshift.io"] + resources: + - oauthclients + resourceNames: + - {{ include "kiali-server.fullname" . }}-{{ .Release.Namespace }} + verbs: + - get +- apiGroups: ["admissionregistration.k8s.io"] + resources: + - mutatingwebhookconfigurations + verbs: + - get + - list + - watch +... +{{- end -}} diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/rolebinding.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/rolebinding.yaml new file mode 100644 index 0000000000..dd0d585fb1 --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/rolebinding.yaml @@ -0,0 +1,24 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + {{- if or (.Values.deployment.view_only_mode) (ne .Values.auth.strategy "anonymous") }} + name: {{ include "kiali-server.fullname" . }}-viewer + {{- else }} + name: {{ include "kiali-server.fullname" . }} + {{- end }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + {{- if or (.Values.deployment.view_only_mode) (ne .Values.auth.strategy "anonymous") }} + name: {{ include "kiali-server.fullname" . }}-viewer + {{- else }} + name: {{ include "kiali-server.fullname" . }} + {{- end }} +subjects: +- kind: ServiceAccount + name: {{ include "kiali-server.fullname" . }} + namespace: "{{ .Release.Namespace }}" +... diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/route.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/route.yaml new file mode 100644 index 0000000000..77b2906bf2 --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/route.yaml @@ -0,0 +1,36 @@ +{{- if not .Values.deployment.remote_cluster_resources_only }} +{{- if eq "true" (include "kiali-server.isOpenShift" .) }} +{{- if eq "true" (include "kiali-server.deployment.ingress.enabled" .) }} +# As of OpenShift 4.5, need to use --disable-openapi-validation when installing via Helm +--- +apiVersion: route.openshift.io/v1 +kind: Route +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: "{{ .Release.Namespace }}" + labels: + {{- if .Values.deployment.ingress.additional_labels }} + {{- toYaml .Values.deployment.ingress.additional_labels | nindent 4 }} + {{- end }} + {{- include "kiali-server.labels" . | nindent 4 }} + {{- if .Values.deployment.ingress.override_yaml.metadata.annotations }} + annotations: + {{- toYaml .Values.deployment.ingress.override_yaml.metadata.annotations | nindent 4 }} + {{- end }} +spec: + {{- if hasKey .Values.deployment.ingress.override_yaml "spec" }} + {{- toYaml .Values.deployment.ingress.override_yaml.spec | nindent 2 }} + {{- else }} + tls: + termination: reencrypt + insecureEdgeTerminationPolicy: Redirect + to: + kind: Service + name: {{ include "kiali-server.fullname" . }} + port: + targetPort: {{ .Values.server.port }} + {{- end }} +... +{{- end }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/service.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/service.yaml new file mode 100644 index 0000000000..89b6860fbd --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/service.yaml @@ -0,0 +1,53 @@ +{{- if not .Values.deployment.remote_cluster_resources_only }} +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: "{{ .Release.Namespace }}" + labels: + {{- include "kiali-server.labels" . | nindent 4 }} + annotations: + {{- if eq "true" (include "kiali-server.isOpenShift" .) }} + service.beta.openshift.io/serving-cert-secret-name: {{ include "kiali-server.fullname" . }}-cert-secret + {{- end }} + {{- if and (not (empty .Values.server.web_fqdn)) (not (empty .Values.server.web_schema)) }} + {{- if empty .Values.server.web_port }} + kiali.io/external-url: {{ .Values.server.web_schema }}://{{ .Values.server.web_fqdn }}{{ include "kiali-server.server.web_root" . }} + {{- else }} + kiali.io/external-url: {{ .Values.server.web_schema }}://{{ .Values.server.web_fqdn }}:{{ .Values.server.web_port }}{{ include "kiali-server.server.web_root" . }} + {{- end }} + {{- end }} + {{- if .Values.deployment.service_annotations }} + {{- toYaml .Values.deployment.service_annotations | nindent 4 }} + {{- end }} +spec: + {{- if .Values.deployment.service_type }} + type: {{ .Values.deployment.service_type }} + {{- end }} + ports: + {{- if (include "kiali-server.identity.cert_file" .) }} + - name: tcp + appProtocol: https + {{- else }} + - name: http + appProtocol: http + {{- end }} + protocol: TCP + port: {{ .Values.server.port }} + {{- if and (not (empty .Values.server.node_port)) (eq .Values.deployment.service_type "NodePort") }} + nodePort: {{ .Values.server.node_port }} + {{- end }} + {{- if .Values.server.observability.metrics.enabled }} + - name: http-metrics + appProtocol: http + protocol: TCP + port: {{ .Values.server.observability.metrics.port }} + {{- end }} + selector: + {{- include "kiali-server.selectorLabels" . | nindent 4 }} + {{- if .Values.deployment.additional_service_yaml }} + {{- toYaml .Values.deployment.additional_service_yaml | nindent 2 }} + {{- end }} +... +{{- end }} \ No newline at end of file diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/serviceaccount.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/serviceaccount.yaml new file mode 100644 index 0000000000..995d580465 --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/serviceaccount.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: "{{ .Release.Namespace }}" + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +... diff --git a/packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/overlay/templates/validate-psp-install.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/validate-psp-install.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/overlay/templates/validate-psp-install.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/validate-psp-install.yaml diff --git a/packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/overlay/templates/web-root-configmap.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/web-root-configmap.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/overlay/templates/web-root-configmap.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/templates/web-root-configmap.yaml diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/values.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/values.yaml new file mode 100644 index 0000000000..067edb6f7d --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/kiali/values.yaml @@ -0,0 +1,126 @@ +# This is required for "openshift" auth strategy. +# You have to know ahead of time what your Route URL will be because +# right now the helm chart can't figure this out at runtime (it would +# need to wait for the Kiali Route to be deployed and for OpenShift +# to start it up). If someone knows how to update this helm chart to +# do this, a PR would be welcome. +kiali_route_url: "" + +# rancher specific override that allows proxy access to kiali url +web_root_override: true +# +# 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. +# + +additional_display_details: +- annotation: kiali.io/api-spec + icon_annotation: kiali.io/api-type + title: API Documentation + +istio_namespace: "" # default is where Kiali is installed + +auth: + openid: {} + openshift: {} + strategy: "" + +clustering: + autodetect_secrets: + enabled: true + label: "kiali.io/multiCluster=true" + clusters: [] + +deployment: + additional_service_yaml: {} + affinity: + node: {} + pod: {} + pod_anti: {} + # The Kiali server helm chart only supports cluster-wide access; setting cluster_wide_access to false is not supported. + # For more control over what the Kial Service Account can see, use the Kiali Operator. + cluster_wide_access: true + configmap_annotations: {} + custom_envs: [] + custom_secrets: [] + dns: + config: {} + policy: "" + host_aliases: [] + hpa: + api_version: "autoscaling/v2" + spec: {} + image_digest: "" # use "sha256" if image_version is a sha256 hash (do NOT prefix this value with a "@") + repository: rancher/mirrored-kiali-kiali + image_pull_policy: "Always" + image_pull_secrets: [] + tag: v2.1.0 # version like "v1.39" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash + ingress: + additional_labels: {} + class_name: "nginx" + #enabled: + override_yaml: + metadata: {} + instance_name: "kiali" + logger: + log_format: "text" + log_level: "info" + time_field_format: "2006-01-02T15:04:05Z07:00" + sampler_rate: "1" + node_selector: {} + pod_annotations: {} + pod_labels: {} + priority_class_name: "" + remote_cluster_resources_only: false + # if deployment.hpa is defined, this replicas setting will be ignored + replicas: 1 + resources: + requests: + cpu: "10m" + memory: "64Mi" + limits: + memory: "1Gi" + secret_name: "kiali" + security_context: {} + service_annotations: {} + service_type: "" + tolerations: [] + version_label: v2.1.0 # v1.39 # v1.39.0 # see: https://quay.io/repository/kiali/kiali?tab=tags + view_only_mode: false + +external_services: + custom_dashboards: + enabled: true + istio: + root_namespace: "" + +identity: {} + #cert_file: + #private_key_file: + +kiali_feature_flags: + disabled_features: [] + validations: + ignore: ["KIA1301"] + +login_token: + signing_key: "" + +server: + port: 20001 + #node_port: + observability: + metrics: + enabled: true + port: 9090 + web_root: "" + +# Common settings used among istio subcharts. +global: + # Specify rancher clusterId of external tracing config + # https://github.com/istio/istio.io/issues/4146#issuecomment-493543032 + cattle: + systemDefaultRegistry: "" + clusterId: + psp: + enabled: false \ No newline at end of file diff --git a/packages/rancher-istio/1.21/rancher-tracing/charts/.helmignore b/charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/.helmignore similarity index 100% rename from packages/rancher-istio/1.21/rancher-tracing/charts/.helmignore rename to charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/.helmignore diff --git a/charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/Chart.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/Chart.yaml new file mode 100644 index 0000000000..a96d6e2043 --- /dev/null +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/Chart.yaml @@ -0,0 +1,12 @@ +annotations: + catalog.cattle.io/hidden: "true" + catalog.cattle.io/os: linux + catalog.rancher.io/certified: rancher + catalog.rancher.io/namespace: istio-system + catalog.rancher.io/release-name: rancher-tracing +apiVersion: v1 +appVersion: 1.63.0 +description: A quick start Jaeger Tracing installation using the all-in-one demo. + This is not production qualified. Refer to https://www.jaegertracing.io/ for details. +name: tracing +version: 1.63.0 diff --git a/packages/rancher-istio/1.21/rancher-tracing/charts/README.md b/charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/README.md similarity index 100% rename from packages/rancher-istio/1.21/rancher-tracing/charts/README.md rename to charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/README.md diff --git a/packages/rancher-istio/1.21/rancher-tracing/charts/templates/_affinity.tpl b/charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/_affinity.tpl similarity index 100% rename from packages/rancher-istio/1.21/rancher-tracing/charts/templates/_affinity.tpl rename to charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/_affinity.tpl diff --git a/packages/rancher-istio/1.21/rancher-tracing/charts/templates/_helpers.tpl b/charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/_helpers.tpl similarity index 100% rename from packages/rancher-istio/1.21/rancher-tracing/charts/templates/_helpers.tpl rename to charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/_helpers.tpl diff --git a/packages/rancher-istio/1.21/rancher-tracing/charts/templates/deployment.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/deployment.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-tracing/charts/templates/deployment.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/deployment.yaml diff --git a/packages/rancher-istio/1.21/rancher-tracing/charts/templates/psp.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/psp.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-tracing/charts/templates/psp.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/psp.yaml diff --git a/packages/rancher-istio/1.21/rancher-tracing/charts/templates/pvc.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/pvc.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-tracing/charts/templates/pvc.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/pvc.yaml diff --git a/packages/rancher-istio/1.19/rancher-tracing/charts/templates/service.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/service.yaml similarity index 92% rename from packages/rancher-istio/1.19/rancher-tracing/charts/templates/service.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/service.yaml index 4210a9b5fc..3ee5a54247 100644 --- a/packages/rancher-istio/1.19/rancher-tracing/charts/templates/service.yaml +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/service.yaml @@ -59,5 +59,12 @@ spec: port: 14250 targetPort: 14250 protocol: TCP + - port: 9411 + targetPort: 9411 + name: http-zipkin + - port: 4317 + name: grpc-otel + - port: 4318 + name: http-otel selector: app: {{ .Values.provider }} diff --git a/packages/rancher-istio/1.21/rancher-tracing/charts/templates/serviceaccount.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/serviceaccount.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-tracing/charts/templates/serviceaccount.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/serviceaccount.yaml diff --git a/packages/rancher-istio/1.21/rancher-tracing/charts/templates/validate-psp-install.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/validate-psp-install.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-tracing/charts/templates/validate-psp-install.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/templates/validate-psp-install.yaml diff --git a/packages/rancher-istio/1.19/rancher-tracing/charts/values.yaml b/charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/values.yaml similarity index 98% rename from packages/rancher-istio/1.19/rancher-tracing/charts/values.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/values.yaml index 52e7deaa8c..4929fb82a4 100644 --- a/packages/rancher-istio/1.19/rancher-tracing/charts/values.yaml +++ b/charts/rancher-istio/106.2.0+up1.24.1/charts/tracing/values.yaml @@ -31,7 +31,7 @@ global: jaeger: repository: rancher/mirrored-jaegertracing-all-in-one - tag: 1.52.0 + tag: 1.63.0 # spanStorageType value can be "memory" and "badger" for all-in-one image spanStorageType: badger resources: diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/configs/istio-base.yaml b/charts/rancher-istio/106.2.0+up1.24.1/configs/istio-base.yaml similarity index 94% rename from packages/rancher-istio/1.19/rancher-istio/charts/configs/istio-base.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/configs/istio-base.yaml index 9d99112e36..a5067f8e74 100644 --- a/packages/rancher-istio/1.19/rancher-istio/charts/configs/istio-base.yaml +++ b/charts/rancher-istio/106.2.0+up1.24.1/configs/istio-base.yaml @@ -93,9 +93,16 @@ spec: hub: {{ .Values.systemDefaultRegistry | default "docker.io" }} profile: default tag: {{ .Values.tag }} +{{- if .Values.tolerations }} revision: {{ .Values.revision }} +{{- end }} meshConfig: defaultConfig: + {{- if .Values.tracing.enabled }} + tracing: + zipkin: + address: {{ .Values.tracing.zipkinAddress }} + {{- end }} proxyMetadata: {{- if .Values.dns.enabled }} ISTIO_META_DNS_CAPTURE: "true" @@ -118,6 +125,9 @@ spec: defaultPodDisruptionBudget: enabled: {{ .Values.global.defaultPodDisruptionBudget.enabled }} {{- end }} + logAsJson: {{ .Values.global.logAsJson }} + logging: + level: {{ .Values.global.logging.level }} {{- if .Values.pilot.enabled }} pilot: image: {{ template "system_default_registry" . }}{{ .Values.pilot.repository }}:{{ .Values.pilot.tag }} diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/requirements.yaml b/charts/rancher-istio/106.2.0+up1.24.1/requirements.yaml similarity index 82% rename from packages/rancher-istio/1.19/rancher-istio/charts/requirements.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/requirements.yaml index a2cf512739..a73e982184 100644 --- a/packages/rancher-istio/1.19/rancher-istio/charts/requirements.yaml +++ b/charts/rancher-istio/106.2.0+up1.24.1/requirements.yaml @@ -2,8 +2,8 @@ dependencies: - condition: kiali.enabled name: kiali repository: file://./charts/kiali - version: 1.75.0 + version: 2.1.0 - condition: tracing.enabled name: tracing repository: file://./charts/tracing - version: 1.52.0 + version: 1.63.0 diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/samples/overlay-example.yaml b/charts/rancher-istio/106.2.0+up1.24.1/samples/overlay-example.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/samples/overlay-example.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/samples/overlay-example.yaml diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/templates/_helpers.tpl b/charts/rancher-istio/106.2.0+up1.24.1/templates/_helpers.tpl similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/templates/_helpers.tpl rename to charts/rancher-istio/106.2.0+up1.24.1/templates/_helpers.tpl diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/templates/admin-role.yaml b/charts/rancher-istio/106.2.0+up1.24.1/templates/admin-role.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/templates/admin-role.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/templates/admin-role.yaml diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/templates/base-config-map.yaml b/charts/rancher-istio/106.2.0+up1.24.1/templates/base-config-map.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/templates/base-config-map.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/templates/base-config-map.yaml diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/templates/clusterrole.yaml b/charts/rancher-istio/106.2.0+up1.24.1/templates/clusterrole.yaml similarity index 95% rename from packages/rancher-istio/1.20/rancher-istio/charts/templates/clusterrole.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/templates/clusterrole.yaml index f8f229987d..31163f9325 100644 --- a/packages/rancher-istio/1.20/rancher-istio/charts/templates/clusterrole.yaml +++ b/charts/rancher-istio/106.2.0+up1.24.1/templates/clusterrole.yaml @@ -123,6 +123,14 @@ rules: - serviceaccounts verbs: - '*' +- apiGroups: + - "" + resources: + - nodes + verbs: + - 'get' + - 'list' + - 'watch' {{- if and .Values.global.cattle.psp.enabled }} - apiGroups: - policy diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/templates/clusterrolebinding.yaml b/charts/rancher-istio/106.2.0+up1.24.1/templates/clusterrolebinding.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/templates/clusterrolebinding.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/templates/clusterrolebinding.yaml diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/templates/edit-role.yaml b/charts/rancher-istio/106.2.0+up1.24.1/templates/edit-role.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/templates/edit-role.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/templates/edit-role.yaml diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/templates/istio-cni-psp.yaml b/charts/rancher-istio/106.2.0+up1.24.1/templates/istio-cni-psp.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/templates/istio-cni-psp.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/templates/istio-cni-psp.yaml diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/templates/istio-install-job.yaml b/charts/rancher-istio/106.2.0+up1.24.1/templates/istio-install-job.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/templates/istio-install-job.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/templates/istio-install-job.yaml diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/templates/istio-install-psp.yaml b/charts/rancher-istio/106.2.0+up1.24.1/templates/istio-install-psp.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/templates/istio-install-psp.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/templates/istio-install-psp.yaml diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/templates/istio-psp.yaml b/charts/rancher-istio/106.2.0+up1.24.1/templates/istio-psp.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/templates/istio-psp.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/templates/istio-psp.yaml diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/templates/istio-uninstall-job.yaml b/charts/rancher-istio/106.2.0+up1.24.1/templates/istio-uninstall-job.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/templates/istio-uninstall-job.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/templates/istio-uninstall-job.yaml diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/templates/overlay-config-map.yaml b/charts/rancher-istio/106.2.0+up1.24.1/templates/overlay-config-map.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/templates/overlay-config-map.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/templates/overlay-config-map.yaml diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/templates/service-monitors.yaml b/charts/rancher-istio/106.2.0+up1.24.1/templates/service-monitors.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/templates/service-monitors.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/templates/service-monitors.yaml diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/templates/serviceaccount.yaml b/charts/rancher-istio/106.2.0+up1.24.1/templates/serviceaccount.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/templates/serviceaccount.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/templates/serviceaccount.yaml diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/templates/validate-psp-install.yaml b/charts/rancher-istio/106.2.0+up1.24.1/templates/validate-psp-install.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/templates/validate-psp-install.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/templates/validate-psp-install.yaml diff --git a/packages/rancher-istio/1.21/rancher-istio/charts/templates/view-role.yaml b/charts/rancher-istio/106.2.0+up1.24.1/templates/view-role.yaml similarity index 100% rename from packages/rancher-istio/1.21/rancher-istio/charts/templates/view-role.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/templates/view-role.yaml diff --git a/packages/rancher-istio/1.20/rancher-istio/charts/values.yaml b/charts/rancher-istio/106.2.0+up1.24.1/values.yaml similarity index 81% rename from packages/rancher-istio/1.20/rancher-istio/charts/values.yaml rename to charts/rancher-istio/106.2.0+up1.24.1/values.yaml index bf9a7e7ee2..997cb20bb2 100644 --- a/packages/rancher-istio/1.20/rancher-istio/charts/values.yaml +++ b/charts/rancher-istio/106.2.0+up1.24.1/values.yaml @@ -1,11 +1,11 @@ overlayFile: "" -tag: 1.20.3 +tag: 1.24.1 ##Setting forceInstall: true will remove the check for istio version < 1.6.x and will not analyze your install cluster prior to install forceInstall: false installer: repository: rancher/istio-installer - tag: 1.20.3-rancher1 + tag: 1.24.1-rancher1 ##releaseMirror are configurations for istio upgrades. ##Setting releaseMirror.enabled: true will cause istio to use bundled in images from rancher/istio-installer to perfom an upgrade - this is ideal ##for airgap setups. Setting releaseMirror.enabled to false means istio will call externally to github to fetch the required assets. @@ -28,8 +28,8 @@ cni: repository: rancher/mirrored-istio-install-cni # If you wish to troubleshoot Istio, you can switch to regular images by uncommenting the following tag and deleting # the distroless tag: -# tag: 1.20.3 - tag: 1.20.3-distroless +# tag: 1.24.1 + tag: 1.24.1-distroless logLevel: info excludeNamespaces: - istio-system @@ -55,8 +55,8 @@ pilot: repository: rancher/mirrored-istio-pilot # If you wish to troubleshoot Istio, you can switch to regular images by uncommenting the following tag and deleting # the distroless tag: -# tag: 1.20.3 - tag: 1.20.3-distroless +# tag: 1.24.1 + tag: 1.24.1-distroless hpaSpec: {} podDisruptionBudget: {} @@ -74,16 +74,23 @@ global: repository: rancher/mirrored-istio-proxyv2 # If you wish to troubleshoot Istio, you can switch to regular images by uncommenting the following tag and deleting # the distroless tag: -# tag: 1.20.3 - tag: 1.20.3-distroless +# tag: 1.24.1 + tag: 1.24.1-distroless proxy_init: repository: rancher/mirrored-istio-proxyv2 # If you wish to troubleshoot Istio, you can switch to regular images by uncommenting the following tag and deleting # the distroless tag: -# tag: 1.20.3 - tag: 1.20.3-distroless +# tag: 1.24.1 + tag: 1.24.1-distroless defaultPodDisruptionBudget: enabled: true +# To output all istio components logs in json format by adding --log_as_json argument to each container argument + logAsJson: false +# Comma-separated minimum per-scope logging level of messages to output, in the form of :,: +# The control plane has different scopes depending on component, but can configure default log level across all components +# If empty, default scope and level will be used as configured in code + logging: + level: "default:info" # Kiali subchart from rancher-kiali-server kiali: @@ -109,6 +116,8 @@ kiali: tracing: enabled: false contextPath: "/jaeger" + zipkinAddress: zipkin.istio-system.svc:9411 + ## Node labels for pod assignment ## Ref: https://kubernetes.io/docs/user-guide/node-selection/ diff --git a/index.yaml b/index.yaml index bb89e16970..55a86861f1 100755 --- a/index.yaml +++ b/index.yaml @@ -14172,6 +14172,117 @@ entries: - assets/rancher-gke-operator-crd/rancher-gke-operator-crd-101.0.0+up1.1.5.tgz version: 101.0.0+up1.1.5 rancher-istio: + - annotations: + catalog.cattle.io/certified: rancher + catalog.cattle.io/display-name: Istio + catalog.cattle.io/kube-version: '>= 1.28.0-0 < 1.32.0-0' + catalog.cattle.io/namespace: istio-system + catalog.cattle.io/os: linux + catalog.cattle.io/permits-os: linux,windows + catalog.cattle.io/rancher-version: '>= 2.11.0-0 < 2.12.0-0' + catalog.cattle.io/release-name: rancher-istio + catalog.cattle.io/requests-cpu: 710m + catalog.cattle.io/requests-memory: 2314Mi + catalog.cattle.io/type: cluster-tool + catalog.cattle.io/ui-component: istio + catalog.cattle.io/upstream-version: 1.23.2 + apiVersion: v1 + appVersion: 1.23.2 + created: "2025-02-24T20:32:53.154458-03:00" + dependencies: + - condition: kiali.enabled + name: kiali + repository: file://./charts/kiali + version: 2.1.0 + - condition: tracing.enabled + name: tracing + repository: file://./charts/tracing + version: 1.63.0 + description: A basic Istio setup that installs with the istioctl. Refer to https://istio.io/latest/ + for details. + digest: 2ff328f2c68b0039311544f7d6c69ddee55bbd12632f557f46e10c09d5346bdd + icon: https://charts.rancher.io/assets/logos/istio.svg + keywords: + - networking + - infrastructure + name: rancher-istio + urls: + - assets/rancher-istio/rancher-istio-106.2.0+up1.24.1.tgz + version: 106.2.0+up1.24.1 + - annotations: + catalog.cattle.io/certified: rancher + catalog.cattle.io/display-name: Istio + catalog.cattle.io/kube-version: '>= 1.27.0-0 < 1.31.0-0' + catalog.cattle.io/namespace: istio-system + catalog.cattle.io/os: linux + catalog.cattle.io/permits-os: linux,windows + catalog.cattle.io/rancher-version: '>= 2.11.0-0 < 2.12.0-0' + catalog.cattle.io/release-name: rancher-istio + catalog.cattle.io/requests-cpu: 710m + catalog.cattle.io/requests-memory: 2314Mi + catalog.cattle.io/type: cluster-tool + catalog.cattle.io/ui-component: istio + catalog.cattle.io/upstream-version: 1.23.2 + apiVersion: v1 + appVersion: 1.23.2 + created: "2025-02-24T20:30:54.662061-03:00" + dependencies: + - condition: kiali.enabled + name: kiali + repository: file://./charts/kiali + version: 1.89.3 + - condition: tracing.enabled + name: tracing + repository: file://./charts/tracing + version: 1.60.0 + description: A basic Istio setup that installs with the istioctl. Refer to https://istio.io/latest/ + for details. + digest: 820d2137d9e5850da82bb7b7d7a2ad81fd2d4fcee62144cffba1a1bdd59e2b7e + icon: https://charts.rancher.io/assets/logos/istio.svg + keywords: + - networking + - infrastructure + name: rancher-istio + urls: + - assets/rancher-istio/rancher-istio-106.1.0+up1.23.2.tgz + version: 106.1.0+up1.23.2 + - annotations: + catalog.cattle.io/certified: rancher + catalog.cattle.io/display-name: Istio + catalog.cattle.io/kube-version: '>= 1.27.0-0 < 1.31.0-0' + catalog.cattle.io/namespace: istio-system + catalog.cattle.io/os: linux + catalog.cattle.io/permits-os: linux,windows + catalog.cattle.io/rancher-version: '>= 2.11.0-0 < 2.12.0-0' + catalog.cattle.io/release-name: rancher-istio + catalog.cattle.io/requests-cpu: 710m + catalog.cattle.io/requests-memory: 2314Mi + catalog.cattle.io/type: cluster-tool + catalog.cattle.io/ui-component: istio + catalog.cattle.io/upstream-version: 1.22.1 + apiVersion: v1 + appVersion: 1.22.1 + created: "2025-02-24T20:29:32.121726-03:00" + dependencies: + - condition: kiali.enabled + name: kiali + repository: file://./charts/kiali + version: 1.86.0 + - condition: tracing.enabled + name: tracing + repository: file://./charts/tracing + version: 1.57.0 + description: A basic Istio setup that installs with the istioctl. Refer to https://istio.io/latest/ + for details. + digest: 491cb9920850597521e14c078bb66e408fab4171d2e0c4835a938119ca9e4192 + icon: https://charts.rancher.io/assets/logos/istio.svg + keywords: + - networking + - infrastructure + name: rancher-istio + urls: + - assets/rancher-istio/rancher-istio-106.0.0+up1.22.1.tgz + version: 106.0.0+up1.22.1 - annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/display-name: Istio diff --git a/packages/rancher-istio/1.19/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml b/packages/rancher-istio/1.19/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml deleted file mode 100644 index d03d38966f..0000000000 --- a/packages/rancher-istio/1.19/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml +++ /dev/null @@ -1,2 +0,0 @@ -workingDir: "" -url: packages/rancher-istio/1.19/rancher-kiali-server diff --git a/packages/rancher-istio/1.19/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml b/packages/rancher-istio/1.19/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml deleted file mode 100644 index d3eec34317..0000000000 --- a/packages/rancher-istio/1.19/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml +++ /dev/null @@ -1,2 +0,0 @@ -workingDir: "" -url: packages/rancher-istio/1.19/rancher-tracing diff --git a/packages/rancher-istio/1.19/rancher-istio/package.yaml b/packages/rancher-istio/1.19/rancher-istio/package.yaml deleted file mode 100644 index 1bc83cd34d..0000000000 --- a/packages/rancher-istio/1.19/rancher-istio/package.yaml +++ /dev/null @@ -1,2 +0,0 @@ -url: local -version: 105.0.0+up1.19.6 diff --git a/packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch b/packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch deleted file mode 100644 index 1a787d4bce..0000000000 --- a/packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- charts-original/templates/deployment.yaml -+++ charts/templates/deployment.yaml -@@ -6,6 +6,9 @@ - namespace: {{ .Release.Namespace }} - labels: - {{- include "kiali-server.labels" . | nindent 4 }} -+ annotations: -+ "helm.sh/hook": post-install, post-upgrade -+ "helm.sh/hook-weight": "-4" - spec: - replicas: {{ .Values.deployment.replicas }} - selector: -@@ -53,7 +56,7 @@ - {{- toYaml .Values.deployment.host_aliases | nindent 6 }} - {{- end }} - containers: -- - 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: -@@ -115,6 +118,11 @@ - - name: LOG_SAMPLER_RATE - value: "{{ .Values.deployment.logger.sampler_rate }}" - volumeMounts: -+ {{- if .Values.web_root_override }} -+ - name: kiali-console -+ subPath: env.js -+ mountPath: /opt/kiali/console/env.js -+ {{- end }} - - name: {{ include "kiali-server.fullname" . }}-configuration - mountPath: "/kiali-configuration" - - name: {{ include "kiali-server.fullname" . }}-cert -@@ -140,6 +148,14 @@ - {{- toYaml .Values.deployment.resources | nindent 10 }} - {{- end }} - volumes: -+ {{- if .Values.web_root_override }} -+ - name: kiali-console -+ configMap: -+ name: kiali-console -+ items: -+ - key: env.js -+ path: env.js -+ {{- end }} - - name: {{ include "kiali-server.fullname" . }}-configuration - configMap: - name: {{ include "kiali-server.fullname" . }} -@@ -194,12 +210,12 @@ - {{- toYaml .Values.deployment.affinity.pod_anti | nindent 10 }} - {{- end }} - {{- end }} -- {{- if .Values.deployment.tolerations }} -- tolerations: -- {{- toYaml .Values.deployment.tolerations | nindent 8 }} -- {{- end }} -- {{- if .Values.deployment.node_selector }} -- nodeSelector: -- {{- toYaml .Values.deployment.node_selector | nindent 8 }} -- {{- end }} -+ tolerations: {{ include "linux-node-tolerations" . | nindent 8 }} -+{{- if .Values.deployment.tolerations }} -+{{ toYaml .Values.deployment.tolerations | indent 8 }} -+{{- end }} -+ nodeSelector: {{ include "linux-node-selector" . | nindent 8 }} -+{{- if .Values.deployment.node_selector }} -+{{ toYaml .Values.deployment.node_selector | indent 8 }} -+{{- end }} - ... diff --git a/packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/patch/values.yaml.patch b/packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/patch/values.yaml.patch deleted file mode 100644 index 36cb4b50d2..0000000000 --- a/packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/patch/values.yaml.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- charts-original/values.yaml -+++ charts/values.yaml -@@ -13,6 +13,8 @@ - # do this, a PR would be welcome. - kiali_route_url: "" - -+# rancher specific override that allows proxy access to kiali url -+web_root_override: true - # - # 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 +44,10 @@ - api_version: "autoscaling/v2" - 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.75.0 # version like "v1.39" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash -+ tag: v1.75.0 # version like "v1.75" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash - ingress: - additional_labels: {} - class_name: "nginx" -@@ -110,3 +112,13 @@ - metrics_enabled: true - metrics_port: 9090 - web_root: "" -+ -+# Common settings used among istio subcharts. -+global: -+ # Specify rancher clusterId of external tracing config -+ # https://github.com/istio/istio.io/issues/4146#issuecomment-493543032 -+ cattle: -+ systemDefaultRegistry: "" -+ clusterId: -+ psp: -+ enabled: false -\ No newline at end of file diff --git a/packages/rancher-istio/1.19/rancher-kiali-server/package.yaml b/packages/rancher-istio/1.19/rancher-kiali-server/package.yaml deleted file mode 100644 index 223bfb97d3..0000000000 --- a/packages/rancher-istio/1.19/rancher-kiali-server/package.yaml +++ /dev/null @@ -1,3 +0,0 @@ -url: https://kiali.org/helm-charts/kiali-server-1.75.0.tgz -version: 104.1.0 -doNotRelease: true \ No newline at end of file diff --git a/packages/rancher-istio/1.19/rancher-tracing/package.yaml b/packages/rancher-istio/1.19/rancher-tracing/package.yaml deleted file mode 100644 index 0c468f5382..0000000000 --- a/packages/rancher-istio/1.19/rancher-tracing/package.yaml +++ /dev/null @@ -1,3 +0,0 @@ -url: local -version: 104.1.0 -doNotRelease: true \ No newline at end of file diff --git a/packages/rancher-istio/1.20/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml b/packages/rancher-istio/1.20/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml deleted file mode 100644 index b70451d1f6..0000000000 --- a/packages/rancher-istio/1.20/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml +++ /dev/null @@ -1,2 +0,0 @@ -workingDir: "" -url: packages/rancher-istio/1.20/rancher-kiali-server diff --git a/packages/rancher-istio/1.20/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml b/packages/rancher-istio/1.20/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml deleted file mode 100644 index 9dfe602279..0000000000 --- a/packages/rancher-istio/1.20/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml +++ /dev/null @@ -1,2 +0,0 @@ -workingDir: "" -url: packages/rancher-istio/1.20/rancher-tracing diff --git a/packages/rancher-istio/1.20/rancher-istio/package.yaml b/packages/rancher-istio/1.20/rancher-istio/package.yaml deleted file mode 100644 index 84ac4aff48..0000000000 --- a/packages/rancher-istio/1.20/rancher-istio/package.yaml +++ /dev/null @@ -1,2 +0,0 @@ -url: local -version: 105.1.0+up1.20.3 diff --git a/packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch b/packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch deleted file mode 100644 index be9cca276f..0000000000 --- a/packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- charts-original/Chart.yaml -+++ charts/Chart.yaml -@@ -1,17 +1,26 @@ -+annotations: -+ catalog.cattle.io/hidden: "true" -+ catalog.cattle.io/os: linux -+ 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 - apiVersion: v2 - appVersion: v1.78.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 -+ values in Rancher's Istio. - home: https://github.com/kiali/kiali - icon: https://raw.githubusercontent.com/kiali/kiali.io/current/assets/icons/logo.svg - keywords: - - istio - - kiali -+- networking -+- infrastructure - maintainers: - - email: kiali-users@googlegroups.com - name: Kiali - url: https://kiali.io --name: kiali-server -+name: rancher-kiali-server - sources: - - https://github.com/kiali/kiali - - https://github.com/kiali/kiali-operator diff --git a/packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch b/packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch deleted file mode 100644 index cd8d4397cc..0000000000 --- a/packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- charts-original/templates/_helpers.tpl -+++ charts/templates/_helpers.tpl -@@ -50,8 +50,15 @@ - Selector labels - */}} - {{- define "kiali-server.selectorLabels" -}} -+{{- $releaseName := .Release.Name -}} -+{{- $fullName := include "kiali-server.fullname" . -}} -+{{- $deployment := (lookup "apps/v1" "Deployment" .Release.Namespace $fullName) -}} - app.kubernetes.io/name: kiali --app.kubernetes.io/instance: {{ include "kiali-server.fullname" . }} -+{{- if (and .Release.IsUpgrade $deployment)}} -+app.kubernetes.io/instance: {{ (get (($deployment).metadata.labels) "app.kubernetes.io/instance") | default $fullName }} -+{{- else }} -+app.kubernetes.io/instance: {{ $fullName }} -+{{- end }} - {{- end }} - - {{/* -@@ -172,6 +179,29 @@ - {{- end }} - {{- end }} - -+{{- define "system_default_registry" -}} -+{{- if .Values.global.cattle.systemDefaultRegistry -}} -+{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}} -+{{- else -}} -+{{- "" -}} -+{{- end -}} -+{{- 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" -}} -+kubernetes.io/os: linux -+{{- end -}} -+ - {{/* - Autodetect remote cluster secrets if enabled - looks for secrets in the same namespace where Kiali is installed. - Returns a JSON dict whose keys are the cluster names and values are the cluster secret data. diff --git a/packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch b/packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch deleted file mode 100644 index 1a787d4bce..0000000000 --- a/packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- charts-original/templates/deployment.yaml -+++ charts/templates/deployment.yaml -@@ -6,6 +6,9 @@ - namespace: {{ .Release.Namespace }} - labels: - {{- include "kiali-server.labels" . | nindent 4 }} -+ annotations: -+ "helm.sh/hook": post-install, post-upgrade -+ "helm.sh/hook-weight": "-4" - spec: - replicas: {{ .Values.deployment.replicas }} - selector: -@@ -53,7 +56,7 @@ - {{- toYaml .Values.deployment.host_aliases | nindent 6 }} - {{- end }} - containers: -- - 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: -@@ -115,6 +118,11 @@ - - name: LOG_SAMPLER_RATE - value: "{{ .Values.deployment.logger.sampler_rate }}" - volumeMounts: -+ {{- if .Values.web_root_override }} -+ - name: kiali-console -+ subPath: env.js -+ mountPath: /opt/kiali/console/env.js -+ {{- end }} - - name: {{ include "kiali-server.fullname" . }}-configuration - mountPath: "/kiali-configuration" - - name: {{ include "kiali-server.fullname" . }}-cert -@@ -140,6 +148,14 @@ - {{- toYaml .Values.deployment.resources | nindent 10 }} - {{- end }} - volumes: -+ {{- if .Values.web_root_override }} -+ - name: kiali-console -+ configMap: -+ name: kiali-console -+ items: -+ - key: env.js -+ path: env.js -+ {{- end }} - - name: {{ include "kiali-server.fullname" . }}-configuration - configMap: - name: {{ include "kiali-server.fullname" . }} -@@ -194,12 +210,12 @@ - {{- toYaml .Values.deployment.affinity.pod_anti | nindent 10 }} - {{- end }} - {{- end }} -- {{- if .Values.deployment.tolerations }} -- tolerations: -- {{- toYaml .Values.deployment.tolerations | nindent 8 }} -- {{- end }} -- {{- if .Values.deployment.node_selector }} -- nodeSelector: -- {{- toYaml .Values.deployment.node_selector | nindent 8 }} -- {{- end }} -+ tolerations: {{ include "linux-node-tolerations" . | nindent 8 }} -+{{- if .Values.deployment.tolerations }} -+{{ toYaml .Values.deployment.tolerations | indent 8 }} -+{{- end }} -+ nodeSelector: {{ include "linux-node-selector" . | nindent 8 }} -+{{- if .Values.deployment.node_selector }} -+{{ toYaml .Values.deployment.node_selector | indent 8 }} -+{{- end }} - ... diff --git a/packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/patch/values.yaml.patch b/packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/patch/values.yaml.patch deleted file mode 100644 index 8a75c30847..0000000000 --- a/packages/rancher-istio/1.20/rancher-kiali-server/generated-changes/patch/values.yaml.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- charts-original/values.yaml -+++ charts/values.yaml -@@ -13,6 +13,8 @@ - # do this, a PR would be welcome. - kiali_route_url: "" - -+# rancher specific override that allows proxy access to kiali url -+web_root_override: true - # - # 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. -@@ -47,10 +49,10 @@ - api_version: "autoscaling/v2" - 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.78.0 # version like "v1.39" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash -+ tag: v1.78.0 # version like "v1.78" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash - ingress: - additional_labels: {} - class_name: "nginx" -@@ -115,3 +117,13 @@ - metrics_enabled: true - metrics_port: 9090 - web_root: "" -+ -+# Common settings used among istio subcharts. -+global: -+ # Specify rancher clusterId of external tracing config -+ # https://github.com/istio/istio.io/issues/4146#issuecomment-493543032 -+ cattle: -+ systemDefaultRegistry: "" -+ clusterId: -+ psp: -+ enabled: false -\ No newline at end of file diff --git a/packages/rancher-istio/1.20/rancher-kiali-server/package.yaml b/packages/rancher-istio/1.20/rancher-kiali-server/package.yaml deleted file mode 100644 index c735fe8813..0000000000 --- a/packages/rancher-istio/1.20/rancher-kiali-server/package.yaml +++ /dev/null @@ -1,3 +0,0 @@ -url: https://kiali.org/helm-charts/kiali-server-1.78.0.tgz -version: 104.2.0 -doNotRelease: true \ No newline at end of file diff --git a/packages/rancher-istio/1.20/rancher-tracing/package.yaml b/packages/rancher-istio/1.20/rancher-tracing/package.yaml deleted file mode 100644 index b99625032e..0000000000 --- a/packages/rancher-istio/1.20/rancher-tracing/package.yaml +++ /dev/null @@ -1,3 +0,0 @@ -url: local -version: 104.2.0 -doNotRelease: true \ No newline at end of file diff --git a/packages/rancher-istio/1.21/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml b/packages/rancher-istio/1.21/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml deleted file mode 100644 index 7aad944a2e..0000000000 --- a/packages/rancher-istio/1.21/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml +++ /dev/null @@ -1,2 +0,0 @@ -workingDir: "" -url: packages/rancher-istio/1.21/rancher-kiali-server diff --git a/packages/rancher-istio/1.21/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml b/packages/rancher-istio/1.21/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml deleted file mode 100644 index 8da47fc1a2..0000000000 --- a/packages/rancher-istio/1.21/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml +++ /dev/null @@ -1,2 +0,0 @@ -workingDir: "" -url: packages/rancher-istio/1.21/rancher-tracing diff --git a/packages/rancher-istio/1.21/rancher-istio/package.yaml b/packages/rancher-istio/1.21/rancher-istio/package.yaml deleted file mode 100644 index 764b75a051..0000000000 --- a/packages/rancher-istio/1.21/rancher-istio/package.yaml +++ /dev/null @@ -1,2 +0,0 @@ -url: local -version: 105.2.0+up1.21.1 diff --git a/packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch b/packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch deleted file mode 100644 index cbf2875381..0000000000 --- a/packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- charts-original/Chart.yaml -+++ charts/Chart.yaml -@@ -1,17 +1,26 @@ -+annotations: -+ catalog.cattle.io/hidden: "true" -+ catalog.cattle.io/os: linux -+ 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 - apiVersion: v2 - appVersion: v1.79.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 -+ values in Rancher's Istio. - home: https://github.com/kiali/kiali - icon: https://raw.githubusercontent.com/kiali/kiali.io/current/assets/icons/logo.svg - keywords: - - istio - - kiali -+- networking -+- infrastructure - maintainers: - - email: kiali-users@googlegroups.com - name: Kiali - url: https://kiali.io --name: kiali-server -+name: rancher-kiali-server - sources: - - https://github.com/kiali/kiali - - https://github.com/kiali/kiali-operator diff --git a/packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch b/packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch deleted file mode 100644 index cd8d4397cc..0000000000 --- a/packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- charts-original/templates/_helpers.tpl -+++ charts/templates/_helpers.tpl -@@ -50,8 +50,15 @@ - Selector labels - */}} - {{- define "kiali-server.selectorLabels" -}} -+{{- $releaseName := .Release.Name -}} -+{{- $fullName := include "kiali-server.fullname" . -}} -+{{- $deployment := (lookup "apps/v1" "Deployment" .Release.Namespace $fullName) -}} - app.kubernetes.io/name: kiali --app.kubernetes.io/instance: {{ include "kiali-server.fullname" . }} -+{{- if (and .Release.IsUpgrade $deployment)}} -+app.kubernetes.io/instance: {{ (get (($deployment).metadata.labels) "app.kubernetes.io/instance") | default $fullName }} -+{{- else }} -+app.kubernetes.io/instance: {{ $fullName }} -+{{- end }} - {{- end }} - - {{/* -@@ -172,6 +179,29 @@ - {{- end }} - {{- end }} - -+{{- define "system_default_registry" -}} -+{{- if .Values.global.cattle.systemDefaultRegistry -}} -+{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}} -+{{- else -}} -+{{- "" -}} -+{{- end -}} -+{{- 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" -}} -+kubernetes.io/os: linux -+{{- end -}} -+ - {{/* - Autodetect remote cluster secrets if enabled - looks for secrets in the same namespace where Kiali is installed. - Returns a JSON dict whose keys are the cluster names and values are the cluster secret data. diff --git a/packages/rancher-istio/1.21/rancher-kiali-server/package.yaml b/packages/rancher-istio/1.21/rancher-kiali-server/package.yaml deleted file mode 100644 index 7069f34c31..0000000000 --- a/packages/rancher-istio/1.21/rancher-kiali-server/package.yaml +++ /dev/null @@ -1,3 +0,0 @@ -url: https://kiali.org/helm-charts/kiali-server-1.79.0.tgz -version: 104.3.0 -doNotRelease: true \ No newline at end of file diff --git a/packages/rancher-istio/1.22/rancher-istio/charts/Chart.yaml b/packages/rancher-istio/1.22/rancher-istio/charts/Chart.yaml index f7e9bfdce3..7fe0c3aec8 100644 --- a/packages/rancher-istio/1.22/rancher-istio/charts/Chart.yaml +++ b/packages/rancher-istio/1.22/rancher-istio/charts/Chart.yaml @@ -5,7 +5,7 @@ annotations: catalog.cattle.io/namespace: istio-system catalog.cattle.io/os: linux catalog.cattle.io/permits-os: linux,windows - catalog.cattle.io/rancher-version: '>= 2.10.0-0 < 2.11.0-0' + catalog.cattle.io/rancher-version: '>= 2.11.0-0 < 2.12.0-0' catalog.cattle.io/release-name: rancher-istio catalog.cattle.io/requests-cpu: 710m catalog.cattle.io/requests-memory: 2314Mi diff --git a/packages/rancher-istio/1.22/rancher-istio/package.yaml b/packages/rancher-istio/1.22/rancher-istio/package.yaml index a7f66fc3ec..70caa23398 100644 --- a/packages/rancher-istio/1.22/rancher-istio/package.yaml +++ b/packages/rancher-istio/1.22/rancher-istio/package.yaml @@ -1,2 +1,2 @@ url: local -version: 105.3.0+up1.22.1 +version: 106.0.0+up1.22.1 diff --git a/packages/rancher-istio/1.23/rancher-istio/charts/Chart.yaml b/packages/rancher-istio/1.23/rancher-istio/charts/Chart.yaml index c7337bd268..9e3ad4b78a 100644 --- a/packages/rancher-istio/1.23/rancher-istio/charts/Chart.yaml +++ b/packages/rancher-istio/1.23/rancher-istio/charts/Chart.yaml @@ -5,7 +5,7 @@ annotations: catalog.cattle.io/namespace: istio-system catalog.cattle.io/os: linux catalog.cattle.io/permits-os: linux,windows - catalog.cattle.io/rancher-version: '>= 2.10.0-0 < 2.11.0-0' + catalog.cattle.io/rancher-version: '>= 2.11.0-0 < 2.12.0-0' catalog.cattle.io/release-name: rancher-istio catalog.cattle.io/requests-cpu: 710m catalog.cattle.io/requests-memory: 2314Mi diff --git a/packages/rancher-istio/1.23/rancher-istio/package.yaml b/packages/rancher-istio/1.23/rancher-istio/package.yaml index 8f552eac43..b7494a3eb0 100644 --- a/packages/rancher-istio/1.23/rancher-istio/package.yaml +++ b/packages/rancher-istio/1.23/rancher-istio/package.yaml @@ -1,2 +1,2 @@ url: local -version: 105.4.0+up1.23.2 +version: 106.1.0+up1.23.2 diff --git a/packages/rancher-istio/1.19/rancher-istio/charts/Chart.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/Chart.yaml similarity index 76% rename from packages/rancher-istio/1.19/rancher-istio/charts/Chart.yaml rename to packages/rancher-istio/1.24/rancher-istio/charts/Chart.yaml index 932c5e2a93..d1b828d9d0 100644 --- a/packages/rancher-istio/1.19/rancher-istio/charts/Chart.yaml +++ b/packages/rancher-istio/1.24/rancher-istio/charts/Chart.yaml @@ -1,19 +1,19 @@ annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/display-name: Istio - catalog.cattle.io/kube-version: '>= 1.25.0-0 < 1.29.0-0' + catalog.cattle.io/kube-version: '>= 1.28.0-0 < 1.32.0-0' catalog.cattle.io/namespace: istio-system catalog.cattle.io/os: linux catalog.cattle.io/permits-os: linux,windows - catalog.cattle.io/rancher-version: '>= 2.10.0-0 < 2.11.0-0' + catalog.cattle.io/rancher-version: '>= 2.11.0-0 < 2.12.0-0' catalog.cattle.io/release-name: rancher-istio catalog.cattle.io/requests-cpu: 710m catalog.cattle.io/requests-memory: 2314Mi catalog.cattle.io/type: cluster-tool catalog.cattle.io/ui-component: istio - catalog.cattle.io/upstream-version: 1.19.6 + catalog.cattle.io/upstream-version: 1.23.2 apiVersion: v1 -appVersion: 1.19.6 +appVersion: 1.23.2 description: A basic Istio setup that installs with the istioctl. Refer to https://istio.io/latest/ for details. icon: https://charts.rancher.io/assets/logos/istio.svg @@ -21,4 +21,4 @@ keywords: - networking - infrastructure name: rancher-istio -version: 1.19.6 +version: 1.23.2 diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/README.md b/packages/rancher-istio/1.24/rancher-istio/charts/README.md new file mode 100644 index 0000000000..2230c61859 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/README.md @@ -0,0 +1,79 @@ +# Rancher-Istio Chart + +Our [Istio](https://istio.io/) installer wraps the istioctl binary commands in a handy helm chart, including an overlay file option to allow complex customization. + +See the app-readme for known issues and deprecations. + +## Installation Requirements + +#### Chart Dependencies +- rancher-monitoring chart or other Prometheus installation + +#### Install +To install the rancher-istio chart with helm, use the following command: +``` +helm install rancher-istio --create-namespace -n istio-system +``` + +#### Uninstall +To ensure rancher-istio uninstalls correctly, you must uninstall rancher-istio prior to uninstalling chart dependencies (see chart dependencies for list of dependencies). This is because all definitions need to be available in order to properly build the rancher-istio objects for removal. + +**If you remove dependent CRD charts prior to removing rancher-istio, you may encounter the following error:** +`Error: uninstallation completed with 1 error(s): unable to build kubernetes objects for delete: unable to recognize "": no matches for kind "MonitoringDashboard" in version "monitoring.kiali.io/v1alpha1"` + +## Addons +The addons that are included with rancher-istio are: + +- Kiali +- Jaeger + +Each addon has additional customization and dependencies required for them to work as expected. Use the values.yaml to customize or to enable/disable each addon. +### Kiali Addon + +Kiali allows you to view and manage your istio-based service mesh through an easy to use dashboard. + +#### Kiali Dependencies +##### rancher-monitoring chart or other Prometheus installation + +This dependecy installs the required CRDs for installing Kiali. Since Kiali is bundled in with Istio in this chart, if you do not have these dependencies installed, your Istio installation will fail. If you do not plan on using Kiali, set `kiali.enabled=false` when installing Istio for a succesful installation. + +#### Prometheus Configuration for Kiali +> **Note:** The following configuration options assume you have installed the dependecies for Kiali. Please ensure you have Promtheus in your cluster before proceeding. + +The Rancher Monitoring app sets `prometheus.prometheusSpec.ignoreNamespaceSelectors=false` which means all namespaces will be scraped by Prometheus by default. This ensures you can view traffic, metrics and graphs for resources deployed in other namespaces. + +To limit scraping to specific namespaces, set `prometheus.prometheusSpec.ignoreNamespaceSelectors=true` and add one of the following configurations to ensure you can continue to view traffic, metrics and graphs for your deployed resources. + +1. Add a Service Monitor or Pod Monitor in the namespace with the targets you want to scrape. +1. Add an additionalScrapeConfig to your rancher-monitoring instance to scrape all targets in all namespaces. + +#### Kiali External Services + +The external services that can be configured in Kiali are: Prometheus, Grafana and Tracing. + +##### Prometheus +The `kiali.external_services.prometheus` url is set in the values.yaml: +``` +http://{{ .Values.nameOverride }}-prometheus.{{ .Values.namespaceOverride }}.svc:{{ prometheus.service.port }} +``` +The url depends on the default values for `nameOverride`, `namespaceOverride`, and `prometheus.service.port` being set in your rancher-monitoring or other monitoring instance. + +##### Grafana +The `kiali.external_services.grafana` url is set in the values.yaml: +``` +http://{{ .Values.nameOverride }}-grafana.{{ .Values.namespaceOverride }}.svc:{{ grafana.service.port }} +``` +The url depends on the default values for `nameOverride`, `namespaceOverride`, and `grafana.service.port` being set in your rancher-monitoring or other monitoring instance. + +##### Tracing +The `kiali.external_services.tracing` url and `.Values.tracing.contextPath` is set in the rancher-istio values.yaml: +``` +http://tracing.{{ .Values.namespaceOverride }}.svc:{{ .Values.service.externalPort }}/{{ .Values.tracing.contextPath }} +``` +The url depends on the default values for `namespaceOverride`, and `.Values.service.externalPort` being set in your rancher-tracing or other tracing instance. + +## Jaeger Addon + +Jaeger allows you to trace and monitor distributed microservices. + +> **Note:** This addon is using the all-in-one Jaeger installation which is not qualified for production. Use the [Jaeger Tracing](https://www.jaegertracing.io/docs/1.21/getting-started/) documentation to determine which installation you will need for your production needs. diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/app-readme.md b/packages/rancher-istio/1.24/rancher-istio/charts/app-readme.md new file mode 100644 index 0000000000..5e2629648c --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/app-readme.md @@ -0,0 +1,65 @@ +# Rancher Istio + +Our [Istio](https://istio.io/) installer wraps the istioctl binary commands in a handy helm chart, including an overlay file option to allow complex customization. It also includes: +* **[Kiali](https://kiali.io/)**: Used for graphing traffic flow throughout the mesh +* **[Jaeger](https://www.jaegertracing.io/)**: A quick start, all-in-one installation used for tracing distributed system. This is not production qualified, please refer to jaeger documentation to determine which installation you may need instead. + +For more information on how to use the feature, refer to our [docs](https://rancher.com/docs/rancher/v2.x/en/istio/v2.5/). + +## Upgrading to Kubernetes v1.25+ + +Starting in Kubernetes v1.25, [Pod Security Policies](https://kubernetes.io/docs/concepts/security/pod-security-policy/) have been removed from the Kubernetes API. + +As a result, **before upgrading to Kubernetes v1.25** (or on a fresh install in a Kubernetes v1.25+ cluster), users are expected to perform an in-place upgrade of this chart with `global.cattle.psp.enabled` set to `false` if it has been previously set to `true`. + +> **Note:** +> In this chart release, any previous field that was associated with any PSP resources have been removed in favor of a single global field: `global.cattle.psp.enabled`. + +> **Note:** +> If you upgrade your cluster to Kubernetes v1.25+ before removing PSPs via a `helm upgrade` (even if you manually clean up resources), **it will leave the Helm release in a broken state within the cluster such that further Helm operations will not work (`helm uninstall`, `helm upgrade`, etc.).** +> +> If your charts get stuck in this state, please consult the Rancher docs on how to clean up your Helm release secrets. + +Upon setting `global.cattle.psp.enabled` to false, the chart will remove any PSP resources deployed on its behalf from the cluster. This is the default setting for this chart. + +As a replacement for PSPs, [Pod Security Admission](https://kubernetes.io/docs/concepts/security/pod-security-admission/) should be used. Please consult the Rancher docs for more details on how to configure your chart release namespaces to work with the new Pod Security Admission and apply Pod Security Standards. + +## Warnings +- Upgrading across more than two minor versions (e.g., 1.6.x to 1.9.x) in one step is not officially tested or recommended. See [Istio upgrade docs](https://istio.io/latest/docs/setup/upgrade/) for more details. + +## Known Issues + +#### Airgapped Environments +**A temporary fix has been added to this chart to allow upgrades to succeed in an airgapped environment. See [this issue](https://github.com/rancher/rancher/issues/30842) for details.** We are still advocating for an upstream fix in Istio to formally resolve this issue. The root cause is the Istio Operator upgrade command reaches out to an external repo on upgrades and the external repo is not configurable. We are tracking the fix for this issue [here](https://github.com/rancher/rancher/issues/33402) + +#### Installing Istio with CNI component enabled on RHEL 8.4 SElinux enabled cluster. +To install istio with CNI enabled, e.g. when cluster has a default PSP set to "restricted", on a cluster using nodes with RHEL 8.4 SElinux enabled, run the following command on each cluster node before creating a cluster. +`mkdir -p /var/run/istio-cni && semanage fcontext -a -t container_file_t /var/run/istio-cni && restorecon -v /var/run/istio-cni` +See [this issue](https://github.com/rancher/rancher/issues/33291) for details. + +## Installing istio with distroless-images. +Istio `104.5.0+up1.24.1` uses distroless images for `istio-proxyv2`, `istio-install-cni` and `istio-pilot`. Distroless images don't have the common debugging tools like `bash`, `curl`, etc. If you wish to troubleshoot Istio, you can switch to regular images by updating `values.yaml` file. + +## Deprecations + +#### v1alpha1 security policies +As of 1.6, Istio removed support for `v1alpha1` security policies resource and replaced the API with `v1beta1` authorization policies. https://istio.io/latest/docs/reference/config/security/authorization-policy/ + +If you are currently running rancher-istio <= 1.7.x, you need to migrate any existing `v1alpha1` security policies to `v1beta1` authorization policies prior to upgrading to the next minor version. + +> **Note:** If you attempt to upgrade prior to migrating your policy resources, you might see errors similar to: +``` +Error: found 6 CRD of unsupported v1alpha1 security policy +``` +``` + Error: found 1 unsupported v1alpha1 security policy + ``` + ``` + Control Plane - policy pod - istio-policy - version: x.x.x does not match the target version x.x.x + ``` + Continue with the migration steps below before retrying the upgrade process. + +#### Migrating Resources: +Migration steps can be found in this [istio blog post](https://istio.io/latest/blog/2021/migrate-alpha-policy/ "istio blog post"). + +You can also use these [quick steps](https://github.com/rancher/rancher/issues/34699#issuecomment-921995917 "quick steps") to determine if you need to follow the more extensive migration steps. diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/configs/istio-base.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/configs/istio-base.yaml new file mode 100644 index 0000000000..a5067f8e74 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/configs/istio-base.yaml @@ -0,0 +1,145 @@ +apiVersion: install.istio.io/v1alpha1 +kind: IstioOperator +spec: + components: + base: + enabled: {{ .Values.base.enabled }} + cni: + enabled: {{ .Values.cni.enabled }} + k8s: + nodeSelector: {{ include "linux-node-selector" . | nindent 12 }} +{{- if .Values.nodeSelector }} +{{- toYaml .Values.nodeSelector | nindent 12 }} +{{- end }} + tolerations: {{ include "linux-node-tolerations" . | nindent 12 }} +{{- if .Values.tolerations }} +{{- toYaml .Values.tolerations | nindent 12 }} +{{- end }} + egressGateways: + - enabled: {{ .Values.egressGateways.enabled }} + name: istio-egressgateway + k8s: + {{- if .Values.egressGateways.hpaSpec }} + hpaSpec: {{ toYaml .Values.egressGateways.hpaSpec | nindent 12 }} + {{- end }} + {{- if .Values.egressGateways.podDisruptionBudget }} + podDisruptionBudget: {{ toYaml .Values.egressGateways.podDisruptionBudget | nindent 12 }} + {{- end }} + nodeSelector: {{ include "linux-node-selector" . | nindent 12 }} +{{- if .Values.nodeSelector }} +{{- toYaml .Values.nodeSelector | nindent 12 }} +{{- end }} + tolerations: {{ include "linux-node-tolerations" . | nindent 12 }} +{{- if .Values.tolerations }} +{{- toYaml .Values.tolerations | nindent 12 }} +{{- end }} + ingressGateways: + - enabled: {{ .Values.ingressGateways.enabled }} + name: istio-ingressgateway + k8s: + {{- if .Values.ingressGateways.hpaSpec }} + hpaSpec: {{ toYaml .Values.ingressGateways.hpaSpec | nindent 12 }} + {{- end }} + {{- if .Values.ingressGateways.podDisruptionBudget }} + podDisruptionBudget: {{ toYaml .Values.ingressGateways.podDisruptionBudget | nindent 12 }} + {{- end }} + nodeSelector: {{ include "linux-node-selector" . | nindent 12 }} +{{- if .Values.nodeSelector }} +{{- toYaml .Values.nodeSelector | nindent 12 }} +{{- end }} + tolerations: {{ include "linux-node-tolerations" . | nindent 12 }} +{{- if .Values.tolerations }} +{{- toYaml .Values.tolerations | nindent 12 }} +{{- end }} + service: + ports: + - name: status-port + port: 15021 + targetPort: 15021 + - name: http2 + port: 80 + targetPort: 8080 + nodePort: 31380 + - name: https + port: 443 + targetPort: 8443 + nodePort: 31390 + - name: tcp + port: 31400 + targetPort: 31400 + nodePort: 31400 + - name: tls + port: 15443 + targetPort: 15443 + istiodRemote: + enabled: {{ .Values.istiodRemote.enabled }} + pilot: + enabled: {{ .Values.pilot.enabled }} + k8s: + {{- if .Values.pilot.hpaSpec }} + hpaSpec: {{ toYaml .Values.pilot.hpaSpec | nindent 12 }} + {{- end }} + {{- if .Values.pilot.podDisruptionBudget }} + podDisruptionBudget: {{ toYaml .Values.pilot.podDisruptionBudget | nindent 12 }} + {{- end }} + nodeSelector: {{ include "linux-node-selector" . | nindent 12 }} +{{- if .Values.nodeSelector }} +{{- toYaml .Values.nodeSelector | nindent 12 }} +{{- end }} + tolerations: {{ include "linux-node-tolerations" . | nindent 12 }} +{{- if .Values.tolerations }} +{{- toYaml .Values.tolerations | nindent 12 }} +{{- end }} + hub: {{ .Values.systemDefaultRegistry | default "docker.io" }} + profile: default + tag: {{ .Values.tag }} +{{- if .Values.tolerations }} + revision: {{ .Values.revision }} +{{- end }} + meshConfig: + defaultConfig: + {{- if .Values.tracing.enabled }} + tracing: + zipkin: + address: {{ .Values.tracing.zipkinAddress }} + {{- end }} + proxyMetadata: + {{- if .Values.dns.enabled }} + ISTIO_META_DNS_CAPTURE: "true" + {{- end }} + values: + gateways: + istio-egressgateway: + name: istio-egressgateway + type: {{ .Values.egressGateways.type }} + istio-ingressgateway: + name: istio-ingressgateway + type: {{ .Values.ingressGateways.type }} + global: + istioNamespace: {{ template "istio.namespace" . }} + proxy: + image: {{ template "system_default_registry" . }}{{ .Values.global.proxy.repository }}:{{ .Values.global.proxy.tag }} + proxy_init: + image: {{ template "system_default_registry" . }}{{ .Values.global.proxy_init.repository }}:{{ .Values.global.proxy_init.tag }} + {{- if .Values.global.defaultPodDisruptionBudget.enabled }} + defaultPodDisruptionBudget: + enabled: {{ .Values.global.defaultPodDisruptionBudget.enabled }} + {{- end }} + logAsJson: {{ .Values.global.logAsJson }} + logging: + level: {{ .Values.global.logging.level }} + {{- if .Values.pilot.enabled }} + pilot: + image: {{ template "system_default_registry" . }}{{ .Values.pilot.repository }}:{{ .Values.pilot.tag }} + {{- end }} + telemetry: + enabled: {{ .Values.telemetry.enabled }} + v2: + enabled: {{ .Values.telemetry.v2.enabled }} + {{- if .Values.cni.enabled }} + cni: + image: {{ template "system_default_registry" . }}{{ .Values.cni.repository }}:{{ .Values.cni.tag }} + excludeNamespaces: + {{- toYaml .Values.cni.excludeNamespaces | nindent 8 }} + logLevel: {{ .Values.cni.logLevel }} + {{- end }} diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/requirements.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/requirements.yaml new file mode 100644 index 0000000000..a73e982184 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/requirements.yaml @@ -0,0 +1,9 @@ +dependencies: +- condition: kiali.enabled + name: kiali + repository: file://./charts/kiali + version: 2.1.0 +- condition: tracing.enabled + name: tracing + repository: file://./charts/tracing + version: 1.63.0 diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/samples/overlay-example.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/samples/overlay-example.yaml new file mode 100644 index 0000000000..5cf3cf3b0b --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/samples/overlay-example.yaml @@ -0,0 +1,37 @@ +apiVersion: install.istio.io/v1alpha1 +kind: IstioOperator +spec: + components: + ingressGateways: + - enabled: true + name: ilb-gateway + namespace: user-ingressgateway-ns + k8s: + resources: + requests: + cpu: 200m + service: + ports: + - name: tcp-citadel-grpc-tls + port: 8060 + targetPort: 8060 + - name: tcp-dns + port: 5353 + serviceAnnotations: + cloud.google.com/load-balancer-type: internal + - enabled: true + name: other-gateway + namespace: cattle-istio-system + k8s: + resources: + requests: + cpu: 200m + service: + ports: + - name: tcp-citadel-grpc-tls + port: 8060 + targetPort: 8060 + - name: tcp-dns + port: 5353 + serviceAnnotations: + cloud.google.com/load-balancer-type: internal diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/templates/_helpers.tpl b/packages/rancher-istio/1.24/rancher-istio/charts/templates/_helpers.tpl new file mode 100644 index 0000000000..30b429a800 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/templates/_helpers.tpl @@ -0,0 +1,27 @@ +{{/* Ensure namespace is set the same everywhere */}} +{{- define "istio.namespace" -}} + {{- .Release.Namespace | default "istio-system" -}} +{{- end -}} + +{{- define "system_default_registry" -}} +{{- if .Values.global.cattle.systemDefaultRegistry -}} +{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}} +{{- else -}} +{{- "" -}} +{{- end -}} +{{- 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" -}} +kubernetes.io/os: linux +{{- end -}} \ No newline at end of file diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/templates/admin-role.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/templates/admin-role.yaml new file mode 100644 index 0000000000..ad1313c4f1 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/templates/admin-role.yaml @@ -0,0 +1,43 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: + rbac.authorization.k8s.io/aggregate-to-admin: "true" + name: istio-admin + namespace: {{ template "istio.namespace" . }} +rules: + - apiGroups: + - config.istio.io + resources: + - adapters + - attributemanifests + - handlers + - httpapispecbindings + - httpapispecs + - instances + - quotaspecbindings + - quotaspecs + - rules + - templates + verbs: ["get", "watch", "list"] + - apiGroups: + - networking.istio.io + resources: + - destinationrules + - envoyfilters + - gateways + - serviceentries + - sidecars + - virtualservices + - workloadentries + verbs: + - '*' + - apiGroups: + - security.istio.io + resources: + - authorizationpolicies + - peerauthentications + - requestauthentications + verbs: + - '*' diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/templates/base-config-map.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/templates/base-config-map.yaml new file mode 100644 index 0000000000..5323917bc3 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/templates/base-config-map.yaml @@ -0,0 +1,7 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: istio-installer-base + namespace: {{ template "istio.namespace" . }} +data: +{{ tpl (.Files.Glob "configs/*").AsConfig . | indent 2 }} diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/templates/clusterrole.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/templates/clusterrole.yaml new file mode 100644 index 0000000000..31163f9325 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/templates/clusterrole.yaml @@ -0,0 +1,143 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: istio-installer +rules: +# istio groups +- apiGroups: + - extensions.istio.io + resources: + - '*' + verbs: + - '*' +- apiGroups: + - authentication.istio.io + resources: + - '*' + verbs: + - '*' +- apiGroups: + - config.istio.io + resources: + - '*' + verbs: + - '*' +- apiGroups: + - install.istio.io + resources: + - '*' + verbs: + - '*' +- apiGroups: + - networking.istio.io + resources: + - '*' + verbs: + - '*' +- apiGroups: + - rbac.istio.io + resources: + - '*' + verbs: + - '*' +- apiGroups: + - security.istio.io + resources: + - '*' + verbs: + - '*' +- apiGroups: + - telemetry.istio.io + resources: + - '*' + verbs: + - '*' +# k8s groups +- apiGroups: + - admissionregistration.k8s.io + resources: + - mutatingwebhookconfigurations + - validatingwebhookconfigurations + verbs: + - '*' +- apiGroups: + - apiextensions.k8s.io + resources: + - customresourcedefinitions.apiextensions.k8s.io + - customresourcedefinitions + verbs: + - '*' +- apiGroups: + - apps + - extensions + resources: + - daemonsets + - deployments + - deployments/finalizers + - ingresses + - replicasets + - statefulsets + verbs: + - '*' +- apiGroups: + - autoscaling + resources: + - horizontalpodautoscalers + verbs: + - '*' +- apiGroups: + - monitoring.coreos.com + resources: + - servicemonitors + verbs: + - get + - create +- apiGroups: + - policy + resources: + - poddisruptionbudgets + verbs: + - '*' +- apiGroups: + - rbac.authorization.k8s.io + resources: + - clusterrolebindings + - clusterroles + - roles + - rolebindings + verbs: + - '*' +- apiGroups: + - "" + resources: + - configmaps + - endpoints + - events + - namespaces + - pods + - pods/exec + - pods/portforward + - persistentvolumeclaims + - secrets + - services + - serviceaccounts + verbs: + - '*' +- apiGroups: + - "" + resources: + - nodes + verbs: + - 'get' + - 'list' + - 'watch' +{{- if and .Values.global.cattle.psp.enabled }} +- apiGroups: + - policy + resourceNames: + - istio-installer + resources: + - podsecuritypolicies + verbs: + - use +{{- end }} diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/templates/clusterrolebinding.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/templates/clusterrolebinding.yaml new file mode 100644 index 0000000000..9d74a04345 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/templates/clusterrolebinding.yaml @@ -0,0 +1,12 @@ +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: istio-installer +subjects: +- kind: ServiceAccount + name: istio-installer + namespace: {{ template "istio.namespace" . }} +roleRef: + kind: ClusterRole + name: istio-installer + apiGroup: rbac.authorization.k8s.io diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/templates/edit-role.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/templates/edit-role.yaml new file mode 100644 index 0000000000..d1059d58d7 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/templates/edit-role.yaml @@ -0,0 +1,43 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: + rbac.authorization.k8s.io/aggregate-to-edit: "true" + namespace: {{ template "istio.namespace" . }} + name: istio-edit +rules: + - apiGroups: + - config.istio.io + resources: + - adapters + - attributemanifests + - handlers + - httpapispecbindings + - httpapispecs + - instances + - quotaspecbindings + - quotaspecs + - rules + - templates + verbs: ["get", "watch", "list"] + - apiGroups: + - networking.istio.io + resources: + - destinationrules + - envoyfilters + - gateways + - serviceentries + - sidecars + - virtualservices + - workloadentries + verbs: + - '*' + - apiGroups: + - security.istio.io + resources: + - authorizationpolicies + - peerauthentications + - requestauthentications + verbs: + - '*' diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/templates/istio-cni-psp.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/templates/istio-cni-psp.yaml new file mode 100644 index 0000000000..a71561e676 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/templates/istio-cni-psp.yaml @@ -0,0 +1,51 @@ +{{- if .Values.global.cattle.psp.enabled }} +apiVersion: policy/v1beta1 +kind: PodSecurityPolicy +metadata: + name: psp-istio-cni + namespace: {{ template "istio.namespace" . }} +spec: + allowPrivilegeEscalation: true + fsGroup: + rule: RunAsAny + hostNetwork: true + runAsUser: + rule: RunAsAny + seLinux: + rule: RunAsAny + supplementalGroups: + rule: RunAsAny + volumes: + - secret + - configMap + - emptyDir + - hostPath +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: psp-istio-cni + namespace: {{ template "istio.namespace" . }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: psp-istio-cni +subjects: + - kind: ServiceAccount + name: istio-cni +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: psp-istio-cni + namespace: {{ template "istio.namespace" . }} +rules: +- apiGroups: + - policy + resourceNames: + - psp-istio-cni + resources: + - podsecuritypolicies + verbs: + - use +{{- end }} diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/templates/istio-install-job.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/templates/istio-install-job.yaml new file mode 100644 index 0000000000..c2e362e684 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/templates/istio-install-job.yaml @@ -0,0 +1,66 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: istioctl-installer + namespace: {{ template "istio.namespace" . }} + annotations: + "helm.sh/hook": post-install,post-upgrade + "helm.sh/hook-weight": "-5" + "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded +spec: + backoffLimit: 1 + template: + spec: + {{- if .Values.installer.releaseMirror.enabled }} + hostAliases: + - ip: "127.0.0.1" + hostnames: + - "github.com" + {{- end }} + containers: + - name: istioctl-installer + image: {{ template "system_default_registry" . }}{{ .Values.installer.repository }}:{{ .Values.installer.tag }} + env: + - name: RELEASE_NAME + value: {{ .Release.Name }} + - name: ISTIO_NAMESPACE + value: {{ template "istio.namespace" . }} + - name: FORCE_INSTALL + value: {{ .Values.forceInstall | default "false" | quote }} + - name: RELEASE_MIRROR_ENABLED + value: {{ .Values.installer.releaseMirror.enabled | quote }} + - name: SECONDS_SLEEP + value: {{ .Values.installer.debug.secondsSleep | quote}} + command: ["/bin/sh","-c"] + args: ["/usr/local/app/scripts/run.sh"] + volumeMounts: + - name: config-volume + mountPath: /app/istio-base.yaml + subPath: istio-base.yaml + {{- if .Values.overlayFile }} + - name: overlay-volume + mountPath: /app/overlay-config.yaml + subPath: overlay-config.yaml + {{- end }} + volumes: + - name: config-volume + configMap: + name: istio-installer-base + {{- if .Values.overlayFile }} + - name: overlay-volume + configMap: + name: istio-installer-overlay + {{- end }} + serviceAccountName: istio-installer + nodeSelector: {{ include "linux-node-selector" . | nindent 8 }} +{{- if .Values.nodeSelector }} +{{ toYaml .Values.nodeSelector | indent 8 }} +{{- end }} + tolerations: {{ include "linux-node-tolerations" . | nindent 8 }} +{{- if .Values.tolerations }} +{{ toYaml .Values.tolerations | indent 8 }} +{{- end }} + securityContext: + runAsUser: 499 + runAsGroup: 487 + restartPolicy: Never diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/templates/istio-install-psp.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/templates/istio-install-psp.yaml new file mode 100644 index 0000000000..9da3391d40 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/templates/istio-install-psp.yaml @@ -0,0 +1,30 @@ +{{- if .Values.global.cattle.psp.enabled }} +apiVersion: policy/v1beta1 +kind: PodSecurityPolicy +metadata: + name: istio-installer + namespace: {{ template "istio.namespace" . }} +spec: + privileged: false + hostNetwork: false + hostIPC: false + hostPID: false + runAsUser: + rule: 'MustRunAsNonRoot' + seLinux: + rule: 'RunAsAny' + supplementalGroups: + rule: 'MustRunAs' + ranges: + - min: 1 + max: 65535 + fsGroup: + rule: 'MustRunAs' + ranges: + - min: 1 + max: 65535 + readOnlyRootFilesystem: false + volumes: + - 'configMap' + - 'secret' +{{- end }} diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/templates/istio-psp.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/templates/istio-psp.yaml new file mode 100644 index 0000000000..cfada1bf7f --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/templates/istio-psp.yaml @@ -0,0 +1,81 @@ +{{- if .Values.global.cattle.psp.enabled }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: istio-psp + namespace: {{ template "istio.namespace" . }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: istio-psp +subjects: + - kind: ServiceAccount + name: istio-egressgateway-service-account + - kind: ServiceAccount + name: istio-ingressgateway-service-account + - kind: ServiceAccount + name: istio-mixer-service-account + - kind: ServiceAccount + name: istio-operator-authproxy + - kind: ServiceAccount + name: istiod-service-account + - kind: ServiceAccount + name: istio-sidecar-injector-service-account + - kind: ServiceAccount + name: istiocoredns-service-account + - kind: ServiceAccount + name: default +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: istio-psp + namespace: {{ template "istio.namespace" . }} +rules: +- apiGroups: + - policy + resourceNames: + - istio-psp + resources: + - podsecuritypolicies + verbs: + - use +--- +apiVersion: policy/v1beta1 +kind: PodSecurityPolicy +metadata: + name: istio-psp + namespace: {{ template "istio.namespace" . }} +spec: + allowPrivilegeEscalation: false + forbiddenSysctls: + - '*' + fsGroup: + ranges: + - max: 65535 + min: 1 + rule: MustRunAs + requiredDropCapabilities: + - ALL + runAsUser: + rule: MustRunAsNonRoot + runAsGroup: + rule: MustRunAs + ranges: + - min: 1 + max: 65535 + seLinux: + rule: RunAsAny + supplementalGroups: + ranges: + - max: 65535 + min: 1 + rule: MustRunAs + volumes: + - configMap + - emptyDir + - projected + - secret + - downwardAPI + - persistentVolumeClaim +{{- end }} diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/templates/istio-uninstall-job.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/templates/istio-uninstall-job.yaml new file mode 100644 index 0000000000..0091d0c176 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/templates/istio-uninstall-job.yaml @@ -0,0 +1,53 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: istioctl-uninstaller + namespace: {{ template "istio.namespace" . }} + annotations: + "helm.sh/hook": pre-delete + "helm.sh/hook-weight": "-5" + "helm.sh/hook-delete-policy": hook-succeeded +spec: + template: + spec: + containers: + - name: istioctl-uninstaller + image: {{ template "system_default_registry" . }}{{ .Values.installer.repository }}:{{ .Values.installer.tag }} + env: + - name: RELEASE_NAME + value: {{ .Release.Name }} + - name: ISTIO_NAMESPACE + value: {{ template "istio.namespace" . }} + command: ["/bin/sh","-c"] + args: ["/usr/local/app/scripts/uninstall_istio_system.sh"] + volumeMounts: + - name: config-volume + mountPath: /app/istio-base.yaml + subPath: istio-base.yaml + {{- if .Values.overlayFile }} + - name: overlay-volume + mountPath: /app/overlay-config.yaml + subPath: overlay-config.yaml + {{ end }} + volumes: + - name: config-volume + configMap: + name: istio-installer-base + {{- if .Values.overlayFile }} + - name: overlay-volume + configMap: + name: istio-installer-overlay + {{ end }} + serviceAccountName: istio-installer + nodeSelector: {{ include "linux-node-selector" . | nindent 8 }} +{{- if .Values.nodeSelector }} +{{ toYaml .Values.nodeSelector | indent 8 }} +{{- end }} + tolerations: {{ include "linux-node-tolerations" . | nindent 8 }} +{{- if .Values.tolerations }} +{{ toYaml .Values.tolerations | indent 8 }} +{{- end }} + securityContext: + runAsUser: 101 + runAsGroup: 101 + restartPolicy: OnFailure diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/templates/overlay-config-map.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/templates/overlay-config-map.yaml new file mode 100644 index 0000000000..287d26b2c3 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/templates/overlay-config-map.yaml @@ -0,0 +1,9 @@ +{{- if .Values.overlayFile }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: istio-installer-overlay + namespace: {{ template "istio.namespace" . }} +data: + overlay-config.yaml: {{ toYaml .Values.overlayFile | indent 2 }} +{{- end }} diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/templates/service-monitors.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/templates/service-monitors.yaml new file mode 100644 index 0000000000..c3d60c4fce --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/templates/service-monitors.yaml @@ -0,0 +1,51 @@ +{{- if .Values.kiali.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: envoy-stats-monitor + namespace: {{ template "istio.namespace" . }} + labels: + monitoring: istio-proxies +spec: + selector: + matchExpressions: + - {key: istio-prometheus-ignore, operator: DoesNotExist} + namespaceSelector: + any: true + jobLabel: envoy-stats + endpoints: + - path: /stats/prometheus + targetPort: 15090 + interval: 15s + relabelings: + - sourceLabels: [__meta_kubernetes_pod_container_port_name] + action: keep + regex: '.*-envoy-prom' + - action: labeldrop + regex: "__meta_kubernetes_pod_label_(.+)" + - sourceLabels: [__meta_kubernetes_namespace] + action: replace + targetLabel: namespace + - sourceLabels: [__meta_kubernetes_pod_name] + action: replace + targetLabel: pod_name +--- +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: istio-component-monitor + namespace: {{ template "istio.namespace" . }} + labels: + monitoring: istio-components +spec: + jobLabel: istio + targetLabels: [app] + selector: + matchExpressions: + - {key: istio, operator: In, values: [pilot]} + namespaceSelector: + any: true + endpoints: + - port: http-monitoring + interval: 15s +{{- end -}} diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/templates/serviceaccount.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/templates/serviceaccount.yaml new file mode 100644 index 0000000000..82b6cbb7e6 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/templates/serviceaccount.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: istio-installer + namespace: {{ template "istio.namespace" . }} diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/templates/validate-psp-install.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/templates/validate-psp-install.yaml new file mode 100644 index 0000000000..4b0e5cfb65 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/templates/validate-psp-install.yaml @@ -0,0 +1,7 @@ +#{{- if gt (len (lookup "rbac.authorization.k8s.io/v1" "ClusterRole" "" "")) 0 -}} +#{{- if .Values.global.cattle.psp.enabled }} +#{{- if not (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }} +#{{- fail "The target cluster does not have the PodSecurityPolicy API resource. Please disable PSPs in this chart before proceeding." -}} +#{{- end }} +#{{- end }} +#{{- end }} \ No newline at end of file diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/templates/view-role.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/templates/view-role.yaml new file mode 100644 index 0000000000..5947d3eba9 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/templates/view-role.yaml @@ -0,0 +1,41 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: + rbac.authorization.k8s.io/aggregate-to-view: "true" + namespace: {{ template "istio.namespace" . }} + name: istio-view +rules: + - apiGroups: + - config.istio.io + resources: + - adapters + - attributemanifests + - handlers + - httpapispecbindings + - httpapispecs + - instances + - quotaspecbindings + - quotaspecs + - rules + - templates + verbs: ["get", "watch", "list"] + - apiGroups: + - networking.istio.io + resources: + - destinationrules + - envoyfilters + - gateways + - serviceentries + - sidecars + - virtualservices + - workloadentries + verbs: ["get", "watch", "list"] + - apiGroups: + - security.istio.io + resources: + - authorizationpolicies + - peerauthentications + - requestauthentications + verbs: ["get", "watch", "list"] diff --git a/packages/rancher-istio/1.24/rancher-istio/charts/values.yaml b/packages/rancher-istio/1.24/rancher-istio/charts/values.yaml new file mode 100644 index 0000000000..997cb20bb2 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/charts/values.yaml @@ -0,0 +1,128 @@ +overlayFile: "" +tag: 1.24.1 +##Setting forceInstall: true will remove the check for istio version < 1.6.x and will not analyze your install cluster prior to install +forceInstall: false + +installer: + repository: rancher/istio-installer + tag: 1.24.1-rancher1 + ##releaseMirror are configurations for istio upgrades. + ##Setting releaseMirror.enabled: true will cause istio to use bundled in images from rancher/istio-installer to perfom an upgrade - this is ideal + ##for airgap setups. Setting releaseMirror.enabled to false means istio will call externally to github to fetch the required assets. + releaseMirror: + enabled: false + + ##Set the secondsSleep to run a sleep command `sleep s` to allow time to exec into istio-installer pod for debugging + debug: + secondsSleep: 0 + +##Native support for dns added in 1.8 +dns: + enabled: false + +base: + enabled: true + +cni: + enabled: false + repository: rancher/mirrored-istio-install-cni +# If you wish to troubleshoot Istio, you can switch to regular images by uncommenting the following tag and deleting +# the distroless tag: +# tag: 1.24.1 + tag: 1.24.1-distroless + logLevel: info + excludeNamespaces: + - istio-system + - kube-system + +egressGateways: + enabled: false + type: NodePort + hpaSpec: {} + podDisruptionBudget: {} + +ingressGateways: + enabled: true + type: NodePort + hpaSpec: {} + podDisruptionBudget: {} + +istiodRemote: + enabled: false + +pilot: + enabled: true + repository: rancher/mirrored-istio-pilot +# If you wish to troubleshoot Istio, you can switch to regular images by uncommenting the following tag and deleting +# the distroless tag: +# tag: 1.24.1 + tag: 1.24.1-distroless + hpaSpec: {} + podDisruptionBudget: {} + +telemetry: + enabled: true + v2: + enabled: true + +global: + cattle: + systemDefaultRegistry: "" + psp: + enabled: false + proxy: + repository: rancher/mirrored-istio-proxyv2 +# If you wish to troubleshoot Istio, you can switch to regular images by uncommenting the following tag and deleting +# the distroless tag: +# tag: 1.24.1 + tag: 1.24.1-distroless + proxy_init: + repository: rancher/mirrored-istio-proxyv2 +# If you wish to troubleshoot Istio, you can switch to regular images by uncommenting the following tag and deleting +# the distroless tag: +# tag: 1.24.1 + tag: 1.24.1-distroless + defaultPodDisruptionBudget: + enabled: true +# To output all istio components logs in json format by adding --log_as_json argument to each container argument + logAsJson: false +# Comma-separated minimum per-scope logging level of messages to output, in the form of :,: +# The control plane has different scopes depending on component, but can configure default log level across all components +# If empty, default scope and level will be used as configured in code + logging: + level: "default:info" + +# Kiali subchart from rancher-kiali-server +kiali: + enabled: true + # If you wish to change the authentication you can check the options in the Kiali documentation https://kiali.io/docs/configuration/authentication/ + auth: + strategy: token + server: + web_root: / + deployment: + ingress_enabled: false + external_services: + prometheus: + custom_metrics_url: "http://rancher-monitoring-prometheus.cattle-monitoring-system.svc:9090" + url: "http://rancher-monitoring-prometheus.cattle-monitoring-system.svc:9090" + tracing: + in_cluster_url: "http://tracing.istio-system.svc:16686/jaeger" + use_grpc: false + grafana: + in_cluster_url: "http://rancher-monitoring-grafana.cattle-monitoring-system.svc:80" + url: "http://rancher-monitoring-grafana.cattle-monitoring-system.svc:80" + +tracing: + enabled: false + contextPath: "/jaeger" + zipkinAddress: zipkin.istio-system.svc:9411 + + +## Node labels for pod assignment +## Ref: https://kubernetes.io/docs/user-guide/node-selection/ +## +nodeSelector: {} + +## List of node taints to tolerate (requires Kubernetes >= 1.6) +tolerations: [] diff --git a/packages/rancher-istio/1.24/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml b/packages/rancher-istio/1.24/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml new file mode 100644 index 0000000000..4f796a73a1 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml @@ -0,0 +1,2 @@ +workingDir: "" +url: packages/rancher-istio/1.24/rancher-kiali-server diff --git a/packages/rancher-istio/1.24/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml b/packages/rancher-istio/1.24/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml new file mode 100644 index 0000000000..f59bcaa7b2 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml @@ -0,0 +1,2 @@ +workingDir: "" +url: packages/rancher-istio/1.24/rancher-tracing diff --git a/packages/rancher-istio/1.24/rancher-istio/package.yaml b/packages/rancher-istio/1.24/rancher-istio/package.yaml new file mode 100644 index 0000000000..c60790ebd0 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-istio/package.yaml @@ -0,0 +1,2 @@ +url: local +version: 106.2.0+up1.24.1 diff --git a/packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/overlay/templates/psp.yaml b/packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/overlay/templates/psp.yaml new file mode 100644 index 0000000000..e31d706d4b --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/overlay/templates/psp.yaml @@ -0,0 +1,67 @@ +{{- if .Values.global.cattle.psp.enabled }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: {{ include "kiali-server.fullname" . }}-psp + namespace: {{ .Release.Namespace }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: {{ include "kiali-server.fullname" . }}-psp +subjects: + - kind: ServiceAccount + name: kiali +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: {{ include "kiali-server.fullname" . }}-psp + namespace: {{ .Release.Namespace }} +rules: +- apiGroups: + - policy + resourceNames: + - {{ include "kiali-server.fullname" . }}-psp + resources: + - podsecuritypolicies + verbs: + - use +--- +apiVersion: policy/v1beta1 +kind: PodSecurityPolicy +metadata: + name: {{ include "kiali-server.fullname" . }}-psp + namespace: {{ .Release.Namespace }} +spec: + allowPrivilegeEscalation: false + forbiddenSysctls: + - '*' + fsGroup: + ranges: + - max: 65535 + min: 1 + rule: MustRunAs + requiredDropCapabilities: + - ALL + runAsUser: + rule: MustRunAsNonRoot + runAsGroup: + rule: MustRunAs + ranges: + - min: 1 + max: 65535 + seLinux: + rule: RunAsAny + supplementalGroups: + ranges: + - max: 65535 + min: 1 + rule: MustRunAs + volumes: + - configMap + - emptyDir + - projected + - secret + - downwardAPI + - persistentVolumeClaim +{{- end }} diff --git a/packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/overlay/templates/validate-psp-install.yaml b/packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/overlay/templates/validate-psp-install.yaml new file mode 100644 index 0000000000..a30c59d3b7 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/overlay/templates/validate-psp-install.yaml @@ -0,0 +1,7 @@ +#{{- if gt (len (lookup "rbac.authorization.k8s.io/v1" "ClusterRole" "" "")) 0 -}} +#{{- if .Values.global.cattle.psp.enabled }} +#{{- if not (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }} +#{{- fail "The target cluster does not have the PodSecurityPolicy API resource. Please disable PSPs in this chart before proceeding." -}} +#{{- end }} +#{{- end }} +#{{- end }} diff --git a/packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/overlay/templates/web-root-configmap.yaml b/packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/overlay/templates/web-root-configmap.yaml new file mode 100644 index 0000000000..970d4e4f5d --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/overlay/templates/web-root-configmap.yaml @@ -0,0 +1,12 @@ +{{- if .Values.web_root_override }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: kiali-console + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 4 }} +data: + env.js: | + window.WEB_ROOT='/k8s/clusters/{{ .Values.global.cattle.clusterId }}/api/v1/namespaces/{{ .Release.Namespace }}/services/http:kiali:20001/proxy/kiali'; +{{- end }} diff --git a/packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch b/packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch similarity index 97% rename from packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch rename to packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch index 2c841da3a7..2052836ad7 100644 --- a/packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-istio/1.24/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.75.0 + appVersion: v2.1.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.19/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch b/packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch similarity index 91% rename from packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch rename to packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch index cd8d4397cc..b4fe577065 100644 --- a/packages/rancher-istio/1.19/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch +++ b/packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch @@ -1,6 +1,6 @@ --- charts-original/templates/_helpers.tpl +++ charts/templates/_helpers.tpl -@@ -50,8 +50,15 @@ +@@ -46,8 +46,15 @@ Selector labels */}} {{- define "kiali-server.selectorLabels" -}} @@ -17,10 +17,10 @@ {{- end }} {{/* -@@ -172,6 +179,29 @@ +@@ -167,6 +174,28 @@ + {{- .Release.Namespace }} {{- end }} {{- end }} - +{{- define "system_default_registry" -}} +{{- if .Values.global.cattle.systemDefaultRegistry -}} +{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}} @@ -43,7 +43,6 @@ +{{- define "linux-node-selector" -}} +kubernetes.io/os: linux +{{- end -}} -+ + {{/* Autodetect remote cluster secrets if enabled - looks for secrets in the same namespace where Kiali is installed. - Returns a JSON dict whose keys are the cluster names and values are the cluster secret data. diff --git a/packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch b/packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch similarity index 81% rename from packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch rename to packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch index 1a787d4bce..bc58c3d723 100644 --- a/packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch +++ b/packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch @@ -1,17 +1,7 @@ --- charts-original/templates/deployment.yaml +++ charts/templates/deployment.yaml -@@ -6,6 +6,9 @@ - namespace: {{ .Release.Namespace }} - labels: - {{- include "kiali-server.labels" . | nindent 4 }} -+ annotations: -+ "helm.sh/hook": post-install, post-upgrade -+ "helm.sh/hook-weight": "-4" - spec: - replicas: {{ .Values.deployment.replicas }} - selector: -@@ -53,7 +56,7 @@ - {{- toYaml .Values.deployment.host_aliases | nindent 6 }} +@@ -65,7 +65,7 @@ + {{- end }} {{- end }} containers: - - image: "{{ .Values.deployment.image_name }}{{ if .Values.deployment.image_digest }}@{{ .Values.deployment.image_digest }}{{ end }}:{{ .Values.deployment.image_version }}" @@ -19,9 +9,9 @@ imagePullPolicy: {{ .Values.deployment.image_pull_policy | default "Always" }} name: {{ include "kiali-server.fullname" . }} command: -@@ -115,6 +118,11 @@ - - name: LOG_SAMPLER_RATE - value: "{{ .Values.deployment.logger.sampler_rate }}" +@@ -131,6 +131,11 @@ + value: {{ .value | quote }} + {{- end }} volumeMounts: + {{- if .Values.web_root_override }} + - name: kiali-console @@ -31,7 +21,7 @@ - name: {{ include "kiali-server.fullname" . }}-configuration mountPath: "/kiali-configuration" - name: {{ include "kiali-server.fullname" . }}-cert -@@ -140,6 +148,14 @@ +@@ -158,6 +163,14 @@ {{- toYaml .Values.deployment.resources | nindent 10 }} {{- end }} volumes: @@ -46,7 +36,7 @@ - name: {{ include "kiali-server.fullname" . }}-configuration configMap: name: {{ include "kiali-server.fullname" . }} -@@ -194,12 +210,12 @@ +@@ -218,13 +231,13 @@ {{- toYaml .Values.deployment.affinity.pod_anti | nindent 10 }} {{- end }} {{- end }} @@ -67,3 +57,5 @@ +{{ toYaml .Values.deployment.node_selector | indent 8 }} +{{- end }} ... + {{- end }} +\ No newline at end of file diff --git a/packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/patch/values.yaml.patch b/packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/patch/values.yaml.patch similarity index 78% rename from packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/patch/values.yaml.patch rename to packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/patch/values.yaml.patch index a6ef900b06..961de338d1 100644 --- a/packages/rancher-istio/1.21/rancher-kiali-server/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-istio/1.24/rancher-kiali-server/generated-changes/patch/values.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/values.yaml +++ charts/values.yaml -@@ -13,6 +13,8 @@ +@@ -6,6 +6,8 @@ # do this, a PR would be welcome. kiali_route_url: "" @@ -9,7 +9,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. -@@ -53,10 +55,10 @@ +@@ -49,10 +51,10 @@ api_version: "autoscaling/v2" spec: {} image_digest: "" # use "sha256" if image_version is a sha256 hash (do NOT prefix this value with a "@") @@ -17,12 +17,12 @@ + repository: rancher/mirrored-kiali-kiali image_pull_policy: "Always" image_pull_secrets: [] -- image_version: v1.79.0 # version like "v1.39" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash -+ tag: v1.79.0 # version like "v1.79" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash +- image_version: v2.1.0 # version like "v1.39" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash ++ tag: v2.1.0 # version like "v1.39" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash ingress: additional_labels: {} class_name: "nginx" -@@ -118,3 +120,13 @@ +@@ -112,3 +114,13 @@ enabled: true port: 9090 web_root: "" diff --git a/packages/rancher-istio/1.24/rancher-kiali-server/package.yaml b/packages/rancher-istio/1.24/rancher-kiali-server/package.yaml new file mode 100644 index 0000000000..88936168db --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-kiali-server/package.yaml @@ -0,0 +1,2 @@ +url: https://kiali.org/helm-charts/kiali-server-2.1.0.tgz +doNotRelease: true \ No newline at end of file diff --git a/packages/rancher-istio/1.24/rancher-tracing/charts/.helmignore b/packages/rancher-istio/1.24/rancher-tracing/charts/.helmignore new file mode 100644 index 0000000000..0e8a0eb36f --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-tracing/charts/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/packages/rancher-istio/1.21/rancher-tracing/charts/Chart.yaml b/packages/rancher-istio/1.24/rancher-tracing/charts/Chart.yaml similarity index 92% rename from packages/rancher-istio/1.21/rancher-tracing/charts/Chart.yaml rename to packages/rancher-istio/1.24/rancher-tracing/charts/Chart.yaml index aab32623c4..94b067974d 100644 --- a/packages/rancher-istio/1.21/rancher-tracing/charts/Chart.yaml +++ b/packages/rancher-istio/1.24/rancher-tracing/charts/Chart.yaml @@ -5,8 +5,8 @@ annotations: catalog.rancher.io/namespace: istio-system catalog.rancher.io/release-name: rancher-tracing apiVersion: v1 -appVersion: 1.56.0 +appVersion: 1.63.0 description: A quick start Jaeger Tracing installation using the all-in-one demo. This is not production qualified. Refer to https://www.jaegertracing.io/ for details. name: rancher-tracing -version: 1.56.0 +version: 1.63.0 diff --git a/packages/rancher-istio/1.24/rancher-tracing/charts/README.md b/packages/rancher-istio/1.24/rancher-tracing/charts/README.md new file mode 100644 index 0000000000..25534c6288 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-tracing/charts/README.md @@ -0,0 +1,5 @@ +# Jaeger + +A Rancher chart based on the Jaeger all-in-one quick installation option. This chart will allow you to trace and monitor distributed microservices. + +> **Note:** The basic all-in-one Jaeger installation which is not qualified for production. Use the [Jaeger Tracing](https://www.jaegertracing.io) documentation to determine which installation you will need for your production needs. diff --git a/packages/rancher-istio/1.24/rancher-tracing/charts/templates/_affinity.tpl b/packages/rancher-istio/1.24/rancher-tracing/charts/templates/_affinity.tpl new file mode 100644 index 0000000000..bf6a9aee5c --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-tracing/charts/templates/_affinity.tpl @@ -0,0 +1,92 @@ +{{/* affinity - https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ */}} +{{- define "nodeAffinity" }} + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + {{- include "nodeAffinityRequiredDuringScheduling" . }} + preferredDuringSchedulingIgnoredDuringExecution: + {{- include "nodeAffinityPreferredDuringScheduling" . }} +{{- end }} + +{{- define "nodeAffinityRequiredDuringScheduling" }} + nodeSelectorTerms: + - matchExpressions: + - key: beta.kubernetes.io/arch + operator: In + values: + {{- range $key, $val := .Values.global.arch }} + {{- if gt ($val | int) 0 }} + - {{ $key | quote }} + {{- end }} + {{- end }} + {{- $nodeSelector := default .Values.global.defaultNodeSelector .Values.nodeSelector -}} + {{- range $key, $val := $nodeSelector }} + - key: {{ $key }} + operator: In + values: + - {{ $val | quote }} + {{- end }} +{{- end }} + +{{- define "nodeAffinityPreferredDuringScheduling" }} + {{- range $key, $val := .Values.global.arch }} + {{- if gt ($val | int) 0 }} + - weight: {{ $val | int }} + preference: + matchExpressions: + - key: beta.kubernetes.io/arch + operator: In + values: + - {{ $key | quote }} + {{- end }} + {{- end }} +{{- end }} + +{{- define "podAntiAffinity" }} +{{- if or .Values.podAntiAffinityLabelSelector .Values.podAntiAffinityTermLabelSelector}} + podAntiAffinity: + {{- if .Values.podAntiAffinityLabelSelector }} + requiredDuringSchedulingIgnoredDuringExecution: + {{- include "podAntiAffinityRequiredDuringScheduling" . }} + {{- end }} + {{- if or .Values.podAntiAffinityTermLabelSelector}} + preferredDuringSchedulingIgnoredDuringExecution: + {{- include "podAntiAffinityPreferredDuringScheduling" . }} + {{- end }} +{{- end }} +{{- end }} + +{{- define "podAntiAffinityRequiredDuringScheduling" }} + {{- range $index, $item := .Values.podAntiAffinityLabelSelector }} + - labelSelector: + matchExpressions: + - key: {{ $item.key }} + operator: {{ $item.operator }} + {{- if $item.values }} + values: + {{- $vals := split "," $item.values }} + {{- range $i, $v := $vals }} + - {{ $v | quote }} + {{- end }} + {{- end }} + topologyKey: {{ $item.topologyKey }} + {{- end }} +{{- end }} + +{{- define "podAntiAffinityPreferredDuringScheduling" }} + {{- range $index, $item := .Values.podAntiAffinityTermLabelSelector }} + - podAffinityTerm: + labelSelector: + matchExpressions: + - key: {{ $item.key }} + operator: {{ $item.operator }} + {{- if $item.values }} + values: + {{- $vals := split "," $item.values }} + {{- range $i, $v := $vals }} + - {{ $v | quote }} + {{- end }} + {{- end }} + topologyKey: {{ $item.topologyKey }} + weight: 100 + {{- end }} +{{- end }} diff --git a/packages/rancher-istio/1.24/rancher-tracing/charts/templates/_helpers.tpl b/packages/rancher-istio/1.24/rancher-tracing/charts/templates/_helpers.tpl new file mode 100644 index 0000000000..09c6b05467 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-tracing/charts/templates/_helpers.tpl @@ -0,0 +1,47 @@ +{{- define "system_default_registry" -}} +{{- if .Values.global.cattle.systemDefaultRegistry -}} +{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}} +{{- else -}} +{{- "" -}} +{{- end -}} +{{- end -}} + +{{/* +Expand the name of the chart. +*/}} +{{- define "tracing.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "tracing.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- 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" -}} +kubernetes.io/os: linux +{{- end -}} \ No newline at end of file diff --git a/packages/rancher-istio/1.24/rancher-tracing/charts/templates/deployment.yaml b/packages/rancher-istio/1.24/rancher-tracing/charts/templates/deployment.yaml new file mode 100644 index 0000000000..f8a6828085 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-tracing/charts/templates/deployment.yaml @@ -0,0 +1,94 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "tracing.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + app: {{ .Values.provider }} + heritage: {{ .Release.Service }} + release: {{ .Release.Name }} +spec: + selector: + matchLabels: + app: {{ .Values.provider }} + template: + metadata: + labels: + app: {{ .Values.provider }} + heritage: {{ .Release.Service }} + release: {{ .Release.Name }} + annotations: + sidecar.istio.io/inject: "false" + prometheus.io/scrape: "true" + prometheus.io/port: "14269" +{{- if .Values.jaeger.podAnnotations }} +{{ toYaml .Values.jaeger.podAnnotations | indent 8 }} +{{- end }} + spec: + containers: + - name: jaeger + image: "{{ template "system_default_registry" . }}{{ .Values.jaeger.repository }}:{{ .Values.jaeger.tag }}" + imagePullPolicy: {{ .Values.global.imagePullPolicy }} + env: + {{- if eq .Values.jaeger.spanStorageType "badger" }} + - name: BADGER_EPHEMERAL + value: "false" + - name: SPAN_STORAGE_TYPE + value: "badger" + - name: BADGER_DIRECTORY_VALUE + value: "/badger/data" + - name: BADGER_DIRECTORY_KEY + value: "/badger/key" + {{- end }} + - name: COLLECTOR_ZIPKIN_HOST_PORT + value: "9411" + - name: MEMORY_MAX_TRACES + value: "{{ .Values.jaeger.memory.max_traces }}" + - name: QUERY_BASE_PATH + value: {{ if .Values.contextPath }} {{ .Values.contextPath }} {{ else }} /{{ .Values.provider }} {{ end }} + livenessProbe: + httpGet: + path: / + port: 14269 + readinessProbe: + httpGet: + path: / + port: 14269 +{{- if eq .Values.jaeger.spanStorageType "badger" }} + volumeMounts: + - name: data + mountPath: /badger +{{- end }} + resources: +{{- if .Values.jaeger.resources }} +{{ toYaml .Values.jaeger.resources | indent 12 }} +{{- else }} +{{ toYaml .Values.global.defaultResources | indent 12 }} +{{- end }} + affinity: + {{- include "nodeAffinity" . | indent 6 }} + {{- include "podAntiAffinity" . | indent 6 }} + {{- if .Values.global.cattle.psp.enabled }} + securityContext: + runAsNonRoot: true + runAsUser: 1000 + {{- end }} + serviceAccountName: {{ include "tracing.fullname" . }} + nodeSelector: {{ include "linux-node-selector" . | nindent 8 }} +{{- if .Values.nodeSelector }} +{{ toYaml .Values.nodeSelector | indent 8 }} +{{- end }} + tolerations: {{ include "linux-node-tolerations" . | nindent 8 }} +{{- if .Values.tolerations }} +{{ toYaml .Values.tolerations | indent 8 }} +{{- end }} +{{- if eq .Values.jaeger.spanStorageType "badger" }} + volumes: + - name: data +{{- if .Values.jaeger.persistentVolumeClaim.enabled }} + persistentVolumeClaim: + claimName: istio-jaeger-pvc +{{- else }} + emptyDir: {} +{{- end }} +{{- end }} diff --git a/packages/rancher-istio/1.24/rancher-tracing/charts/templates/psp.yaml b/packages/rancher-istio/1.24/rancher-tracing/charts/templates/psp.yaml new file mode 100644 index 0000000000..4d5c271e1b --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-tracing/charts/templates/psp.yaml @@ -0,0 +1,76 @@ +{{- if .Values.global.cattle.psp.enabled }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: {{ include "tracing.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + app: {{ .Values.provider }} + heritage: {{ .Release.Service }} + release: {{ .Release.Name }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: {{ include "tracing.fullname" . }} +subjects: + - kind: ServiceAccount + name: {{ include "tracing.fullname" . }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: {{ include "tracing.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + app: {{ .Values.provider }} + heritage: {{ .Release.Service }} + release: {{ .Release.Name }} +rules: +- apiGroups: + - policy + resourceNames: + - {{ include "tracing.fullname" . }} + resources: + - podsecuritypolicies + verbs: + - use +--- +apiVersion: policy/v1beta1 +kind: PodSecurityPolicy +metadata: + name: {{ include "tracing.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + app: {{ .Values.provider }} + heritage: {{ .Release.Service }} + release: {{ .Release.Name }} +spec: + allowPrivilegeEscalation: false + forbiddenSysctls: + - '*' + fsGroup: + ranges: + - max: 65535 + min: 1 + rule: MustRunAs + requiredDropCapabilities: + - ALL + runAsUser: + rule: MustRunAsNonRoot + runAsGroup: + rule: MustRunAs + ranges: + - min: 1 + max: 65535 + seLinux: + rule: RunAsAny + supplementalGroups: + ranges: + - max: 65535 + min: 1 + rule: MustRunAs + volumes: + - emptyDir + - secret + - persistentVolumeClaim +{{- end }} diff --git a/packages/rancher-istio/1.24/rancher-tracing/charts/templates/pvc.yaml b/packages/rancher-istio/1.24/rancher-tracing/charts/templates/pvc.yaml new file mode 100644 index 0000000000..9b4c55e4fb --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-tracing/charts/templates/pvc.yaml @@ -0,0 +1,16 @@ +{{- if .Values.jaeger.persistentVolumeClaim.enabled }} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: istio-jaeger-pvc + namespace: {{ .Release.Namespace }} + labels: + app: {{ .Values.provider }} +spec: + storageClassName: {{ .Values.jaeger.storageClassName }} + accessModes: + - {{ .Values.jaeger.accessMode }} + resources: + requests: + storage: {{.Values.jaeger.persistentVolumeClaim.storage }} +{{- end }} diff --git a/packages/rancher-istio/1.24/rancher-tracing/charts/templates/service.yaml b/packages/rancher-istio/1.24/rancher-tracing/charts/templates/service.yaml new file mode 100644 index 0000000000..3ee5a54247 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-tracing/charts/templates/service.yaml @@ -0,0 +1,70 @@ +apiVersion: v1 +kind: Service +metadata: + name: tracing + namespace: {{ .Release.Namespace }} + annotations: + {{- range $key, $val := .Values.service.annotations }} + {{ $key }}: {{ $val | quote }} + {{- end }} + labels: + app: {{ .Values.provider }} + heritage: {{ .Release.Service }} + release: {{ .Release.Name }} +spec: + type: {{ .Values.service.type }} + ports: + - name: {{ .Values.service.name }} + port: {{ .Values.service.externalPort }} + protocol: TCP + targetPort: 16686 + selector: + app: {{ .Values.provider }} +--- +# Jaeger implements the Zipkin API. To support swapping out the tracing backend, we use a Service named Zipkin. +apiVersion: v1 +kind: Service +metadata: + name: zipkin + namespace: {{ .Release.Namespace }} + labels: + name: zipkin + heritage: {{ .Release.Service }} + release: {{ .Release.Name }} +spec: + ports: + - name: {{ .Values.service.name }} + port: {{ .Values.zipkin.queryPort }} + targetPort: {{ .Values.zipkin.queryPort }} + selector: + app: {{ .Values.provider }} +--- +apiVersion: v1 +kind: Service +metadata: + name: jaeger-collector + namespace: {{ .Release.Namespace }} + labels: + app: {{ .Values.provider }} + heritage: {{ .Release.Service }} + release: {{ .Release.Name }} +spec: + type: ClusterIP + ports: + - name: jaeger-collector-http + port: 14268 + targetPort: 14268 + protocol: TCP + - name: jaeger-collector-grpc + port: 14250 + targetPort: 14250 + protocol: TCP + - port: 9411 + targetPort: 9411 + name: http-zipkin + - port: 4317 + name: grpc-otel + - port: 4318 + name: http-otel + selector: + app: {{ .Values.provider }} diff --git a/packages/rancher-istio/1.24/rancher-tracing/charts/templates/serviceaccount.yaml b/packages/rancher-istio/1.24/rancher-tracing/charts/templates/serviceaccount.yaml new file mode 100644 index 0000000000..1bff77ff66 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-tracing/charts/templates/serviceaccount.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "tracing.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + app: {{ .Values.provider }} + heritage: {{ .Release.Service }} + release: {{ .Release.Name }} \ No newline at end of file diff --git a/packages/rancher-istio/1.24/rancher-tracing/charts/templates/validate-psp-install.yaml b/packages/rancher-istio/1.24/rancher-tracing/charts/templates/validate-psp-install.yaml new file mode 100644 index 0000000000..a30c59d3b7 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-tracing/charts/templates/validate-psp-install.yaml @@ -0,0 +1,7 @@ +#{{- if gt (len (lookup "rbac.authorization.k8s.io/v1" "ClusterRole" "" "")) 0 -}} +#{{- if .Values.global.cattle.psp.enabled }} +#{{- if not (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }} +#{{- fail "The target cluster does not have the PodSecurityPolicy API resource. Please disable PSPs in this chart before proceeding." -}} +#{{- end }} +#{{- end }} +#{{- end }} diff --git a/packages/rancher-istio/1.24/rancher-tracing/charts/values.yaml b/packages/rancher-istio/1.24/rancher-tracing/charts/values.yaml new file mode 100644 index 0000000000..4929fb82a4 --- /dev/null +++ b/packages/rancher-istio/1.24/rancher-tracing/charts/values.yaml @@ -0,0 +1,53 @@ +provider: jaeger +contextPath: "" +## Node labels for pod assignment +## Ref: https://kubernetes.io/docs/user-guide/node-selection/ +## +nodeSelector: {} +## List of node taints to tolerate (requires Kubernetes >= 1.6) +tolerations: [] +podAntiAffinityLabelSelector: [] +podAntiAffinityTermLabelSelector: [] +nameOverride: "" +fullnameOverride: "" + +global: + cattle: + systemDefaultRegistry: "" + psp: + enabled: false + defaultResources: {} + imagePullPolicy: IfNotPresent + imagePullSecrets: [] + arch: + arm64: 2 + amd64: 2 + s390x: 2 + ppc64le: 2 + defaultNodeSelector: + kubernetes.io/os: linux + rbac: + pspEnabled: false + +jaeger: + repository: rancher/mirrored-jaegertracing-all-in-one + tag: 1.63.0 + # spanStorageType value can be "memory" and "badger" for all-in-one image + spanStorageType: badger + resources: + requests: + cpu: 10m + persistentVolumeClaim: + enabled: false + storage: 5Gi + storageClassName: "" + accessMode: ReadWriteMany + memory: + max_traces: 50000 +zipkin: + queryPort: 9411 +service: + annotations: {} + name: http-query + type: ClusterIP + externalPort: 16686 diff --git a/packages/rancher-istio/1.21/rancher-tracing/package.yaml b/packages/rancher-istio/1.24/rancher-tracing/package.yaml similarity index 63% rename from packages/rancher-istio/1.21/rancher-tracing/package.yaml rename to packages/rancher-istio/1.24/rancher-tracing/package.yaml index b99625032e..27691a8e3f 100644 --- a/packages/rancher-istio/1.21/rancher-tracing/package.yaml +++ b/packages/rancher-istio/1.24/rancher-tracing/package.yaml @@ -1,3 +1,2 @@ url: local -version: 104.2.0 doNotRelease: true \ No newline at end of file diff --git a/release.yaml b/release.yaml index d0bcd3eb97..3caac7f625 100644 --- a/release.yaml +++ b/release.yaml @@ -64,6 +64,10 @@ rancher-gke-operator: - 106.0.0+up1.11.0-rc.1 rancher-gke-operator-crd: - 106.0.0+up1.11.0-rc.1 +rancher-istio: + - 106.0.0+up1.22.1 + - 106.1.0+up1.23.2 + - 106.2.0+up1.24.1 rancher-logging: - 106.0.0-rc.1+up4.10.0-rancher.1 rancher-logging-crd: