From 47db2fcf4dc4f6ef8c1f9b6b7bd1c5e82974ba3b Mon Sep 17 00:00:00 2001 From: nicholasSUSE Date: Wed, 12 Apr 2023 16:48:48 -0300 Subject: [PATCH 1/6] created Istio 1.17 directory --- .../1.17/rancher-istio/charts/Chart.yaml | 24 ++++ .../1.17/rancher-istio/charts/README.md | 79 ++++++++++ .../1.17/rancher-istio/charts/app-readme.md | 65 +++++++++ .../charts/configs/istio-base.yaml | 135 ++++++++++++++++++ .../rancher-istio/charts/requirements.yaml | 7 + .../charts/samples/overlay-example.yaml | 37 +++++ .../charts/templates/_helpers.tpl | 27 ++++ .../charts/templates/admin-role.yaml | 43 ++++++ .../charts/templates/base-config-map.yaml | 7 + .../charts/templates/clusterrole.yaml | 134 +++++++++++++++++ .../charts/templates/clusterrolebinding.yaml | 12 ++ .../charts/templates/edit-role.yaml | 43 ++++++ .../charts/templates/istio-cni-psp.yaml | 51 +++++++ .../charts/templates/istio-install-job.yaml | 66 +++++++++ .../charts/templates/istio-install-psp.yaml | 30 ++++ .../charts/templates/istio-psp.yaml | 81 +++++++++++ .../charts/templates/istio-uninstall-job.yaml | 53 +++++++ .../charts/templates/overlay-config-map.yaml | 9 ++ .../charts/templates/service-monitors.yaml | 51 +++++++ .../charts/templates/serviceaccount.yaml | 5 + .../templates/validate-psp-install.yaml | 7 + .../charts/templates/view-role.yaml | 41 ++++++ .../1.17/rancher-istio/charts/values.yaml | 116 +++++++++++++++ .../dependencies/kiali/dependency.yaml | 2 + .../dependencies/tracing/dependency.yaml | 2 + .../1.17/rancher-istio/package.yaml | 2 + .../overlay/templates/psp.yaml | 67 +++++++++ .../templates/validate-psp-install.yaml | 7 + .../overlay/templates/web-root-configmap.yaml | 12 ++ .../generated-changes/patch/Chart.yaml.patch | 31 ++++ .../patch/templates/_helpers.tpl.patch | 49 +++++++ .../patch/templates/deployment.yaml.patch | 59 ++++++++ .../generated-changes/patch/values.yaml.patch | 39 +++++ .../1.17/rancher-kiali-server/package.yaml | 3 + .../1.17/rancher-tracing/charts/.helmignore | 23 +++ .../1.17/rancher-tracing/charts/Chart.yaml | 12 ++ .../1.17/rancher-tracing/charts/README.md | 5 + .../charts/templates/_affinity.tpl | 92 ++++++++++++ .../charts/templates/_helpers.tpl | 47 ++++++ .../charts/templates/deployment.yaml | 94 ++++++++++++ .../rancher-tracing/charts/templates/psp.yaml | 76 ++++++++++ .../rancher-tracing/charts/templates/pvc.yaml | 16 +++ .../charts/templates/service.yaml | 63 ++++++++ .../charts/templates/serviceaccount.yaml | 9 ++ .../templates/validate-psp-install.yaml | 7 + .../1.17/rancher-tracing/charts/values.yaml | 52 +++++++ .../1.17/rancher-tracing/package.yaml | 3 + 47 files changed, 1895 insertions(+) create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/Chart.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/README.md create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/app-readme.md create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/configs/istio-base.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/requirements.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/samples/overlay-example.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/templates/_helpers.tpl create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/templates/admin-role.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/templates/base-config-map.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/templates/clusterrole.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/templates/clusterrolebinding.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/templates/edit-role.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/templates/istio-cni-psp.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/templates/istio-install-job.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/templates/istio-install-psp.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/templates/istio-psp.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/templates/istio-uninstall-job.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/templates/overlay-config-map.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/templates/service-monitors.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/templates/serviceaccount.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/templates/validate-psp-install.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/templates/view-role.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/charts/values.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml create mode 100644 packages/rancher-istio/1.17/rancher-istio/package.yaml create mode 100644 packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/overlay/templates/psp.yaml create mode 100644 packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/overlay/templates/validate-psp-install.yaml create mode 100644 packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/overlay/templates/web-root-configmap.yaml create mode 100644 packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch create mode 100644 packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch create mode 100644 packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch create mode 100644 packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/values.yaml.patch create mode 100644 packages/rancher-istio/1.17/rancher-kiali-server/package.yaml create mode 100644 packages/rancher-istio/1.17/rancher-tracing/charts/.helmignore create mode 100644 packages/rancher-istio/1.17/rancher-tracing/charts/Chart.yaml create mode 100644 packages/rancher-istio/1.17/rancher-tracing/charts/README.md create mode 100644 packages/rancher-istio/1.17/rancher-tracing/charts/templates/_affinity.tpl create mode 100644 packages/rancher-istio/1.17/rancher-tracing/charts/templates/_helpers.tpl create mode 100644 packages/rancher-istio/1.17/rancher-tracing/charts/templates/deployment.yaml create mode 100644 packages/rancher-istio/1.17/rancher-tracing/charts/templates/psp.yaml create mode 100644 packages/rancher-istio/1.17/rancher-tracing/charts/templates/pvc.yaml create mode 100644 packages/rancher-istio/1.17/rancher-tracing/charts/templates/service.yaml create mode 100644 packages/rancher-istio/1.17/rancher-tracing/charts/templates/serviceaccount.yaml create mode 100644 packages/rancher-istio/1.17/rancher-tracing/charts/templates/validate-psp-install.yaml create mode 100644 packages/rancher-istio/1.17/rancher-tracing/charts/values.yaml create mode 100644 packages/rancher-istio/1.17/rancher-tracing/package.yaml diff --git a/packages/rancher-istio/1.17/rancher-istio/charts/Chart.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/Chart.yaml new file mode 100644 index 000000000..d4d75b0f6 --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-istio/charts/Chart.yaml @@ -0,0 +1,24 @@ +annotations: + catalog.cattle.io/certified: rancher + catalog.cattle.io/display-name: Istio + catalog.cattle.io/kube-version: '>= 1.22.0-0 < 1.26.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.7.0-0 < 2.8.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.16.3 +apiVersion: v1 +appVersion: 1.16.3 +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: 1.16.3 diff --git a/packages/rancher-istio/1.17/rancher-istio/charts/README.md b/packages/rancher-istio/1.17/rancher-istio/charts/README.md new file mode 100644 index 000000000..2230c6185 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/app-readme.md b/packages/rancher-istio/1.17/rancher-istio/charts/app-readme.md new file mode 100644 index 000000000..9c034c972 --- /dev/null +++ b/packages/rancher-istio/1.17/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 `102.1.0+up1.16.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. + +## 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.17/rancher-istio/charts/configs/istio-base.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/configs/istio-base.yaml new file mode 100644 index 000000000..9d99112e3 --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-istio/charts/configs/istio-base.yaml @@ -0,0 +1,135 @@ +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 }} + revision: {{ .Values.revision }} + meshConfig: + defaultConfig: + 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 }} + {{- 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.17/rancher-istio/charts/requirements.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/requirements.yaml new file mode 100644 index 000000000..943a08326 --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-istio/charts/requirements.yaml @@ -0,0 +1,7 @@ +dependencies: +- condition: kiali.enabled + name: kiali + repository: file://./charts/kiali +- condition: tracing.enabled + name: tracing + repository: file://./charts/tracing diff --git a/packages/rancher-istio/1.17/rancher-istio/charts/samples/overlay-example.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/samples/overlay-example.yaml new file mode 100644 index 000000000..5cf3cf3b0 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/templates/_helpers.tpl b/packages/rancher-istio/1.17/rancher-istio/charts/templates/_helpers.tpl new file mode 100644 index 000000000..30b429a80 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/templates/admin-role.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/templates/admin-role.yaml new file mode 100644 index 000000000..ad1313c4f --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/templates/base-config-map.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/templates/base-config-map.yaml new file mode 100644 index 000000000..5323917bc --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/templates/clusterrole.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/templates/clusterrole.yaml new file mode 100644 index 000000000..d6721cc45 --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-istio/charts/templates/clusterrole.yaml @@ -0,0 +1,134 @@ +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 + - persistentvolumeclaims + - secrets + - services + - serviceaccounts + verbs: + - '*' +{{- if and .Values.global.cattle.psp.enabled }} +- apiGroups: + - policy + resourceNames: + - istio-installer + resources: + - podsecuritypolicies + verbs: + - use +{{- end }} diff --git a/packages/rancher-istio/1.17/rancher-istio/charts/templates/clusterrolebinding.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/templates/clusterrolebinding.yaml new file mode 100644 index 000000000..9d74a0434 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/templates/edit-role.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/templates/edit-role.yaml new file mode 100644 index 000000000..d1059d58d --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/templates/istio-cni-psp.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/templates/istio-cni-psp.yaml new file mode 100644 index 000000000..a71561e67 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/templates/istio-install-job.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/templates/istio-install-job.yaml new file mode 100644 index 000000000..c2e362e68 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/templates/istio-install-psp.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/templates/istio-install-psp.yaml new file mode 100644 index 000000000..9da3391d4 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/templates/istio-psp.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/templates/istio-psp.yaml new file mode 100644 index 000000000..cfada1bf7 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/templates/istio-uninstall-job.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/templates/istio-uninstall-job.yaml new file mode 100644 index 000000000..0091d0c17 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/templates/overlay-config-map.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/templates/overlay-config-map.yaml new file mode 100644 index 000000000..287d26b2c --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/templates/service-monitors.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/templates/service-monitors.yaml new file mode 100644 index 000000000..c3d60c4fc --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/templates/serviceaccount.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/templates/serviceaccount.yaml new file mode 100644 index 000000000..82b6cbb7e --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/templates/validate-psp-install.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/templates/validate-psp-install.yaml new file mode 100644 index 000000000..4b0e5cfb6 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/templates/view-role.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/templates/view-role.yaml new file mode 100644 index 000000000..5947d3eba --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-istio/charts/values.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/values.yaml new file mode 100644 index 000000000..325d779d7 --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-istio/charts/values.yaml @@ -0,0 +1,116 @@ +overlayFile: "" +tag: 1.16.3 +##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.16.3-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.16.3 + tag: 1.16.3-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.16.3 + tag: 1.16.3-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.16.3 + tag: 1.16.3-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.16.3 + tag: 1.16.3-distroless + defaultPodDisruptionBudget: + enabled: true + +# Kiali subchart from rancher-kiali-server +kiali: + enabled: true + auth: + strategy: anonymous + 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" + +## 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.17/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml b/packages/rancher-istio/1.17/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml new file mode 100644 index 000000000..1516d9fcb --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml @@ -0,0 +1,2 @@ +workingDir: "" +url: packages/rancher-istio/1.16/rancher-kiali-server diff --git a/packages/rancher-istio/1.17/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml b/packages/rancher-istio/1.17/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml new file mode 100644 index 000000000..1390d9bb9 --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml @@ -0,0 +1,2 @@ +workingDir: "" +url: packages/rancher-istio/1.16/rancher-tracing diff --git a/packages/rancher-istio/1.17/rancher-istio/package.yaml b/packages/rancher-istio/1.17/rancher-istio/package.yaml new file mode 100644 index 000000000..a90d93d21 --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-istio/package.yaml @@ -0,0 +1,2 @@ +url: local +version: 102.1.0+up1.16.3 diff --git a/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/overlay/templates/psp.yaml b/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/overlay/templates/psp.yaml new file mode 100644 index 000000000..e31d706d4 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-kiali-server/generated-changes/overlay/templates/validate-psp-install.yaml b/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/overlay/templates/validate-psp-install.yaml new file mode 100644 index 000000000..a30c59d3b --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-kiali-server/generated-changes/overlay/templates/web-root-configmap.yaml b/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/overlay/templates/web-root-configmap.yaml new file mode 100644 index 000000000..970d4e4f5 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch b/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch new file mode 100644 index 000000000..9f5844468 --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch @@ -0,0 +1,31 @@ +--- 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.63.2 + 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/master/themes/kiali/static/img/kiali_logo_masthead.png + 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.17/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch b/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch new file mode 100644 index 000000000..cd8d4397c --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/templates/_helpers.tpl.patch @@ -0,0 +1,49 @@ +--- 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.17/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch b/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch new file mode 100644 index 000000000..322744f99 --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/templates/deployment.yaml.patch @@ -0,0 +1,59 @@ +--- charts-original/templates/deployment.yaml ++++ charts/templates/deployment.yaml +@@ -53,7 +53,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 +115,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 +145,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 +207,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.17/rancher-kiali-server/generated-changes/patch/values.yaml.patch b/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/values.yaml.patch new file mode 100644 index 000000000..61a586e8a --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/values.yaml.patch @@ -0,0 +1,39 @@ +--- charts-original/values.yaml ++++ charts/values.yaml +@@ -13,6 +13,9 @@ + # 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 +45,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.63.2 # version like "v1.39" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash ++ tag: v1.63.2 # version like "v1.63" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash + ingress: + additional_labels: {} + class_name: "nginx" +@@ -110,3 +113,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 diff --git a/packages/rancher-istio/1.17/rancher-kiali-server/package.yaml b/packages/rancher-istio/1.17/rancher-kiali-server/package.yaml new file mode 100644 index 000000000..c26af0dba --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-kiali-server/package.yaml @@ -0,0 +1,3 @@ +url: https://kiali.org/helm-charts/kiali-server-1.63.2.tgz +version: 102.1.0 +doNotRelease: true \ No newline at end of file diff --git a/packages/rancher-istio/1.17/rancher-tracing/charts/.helmignore b/packages/rancher-istio/1.17/rancher-tracing/charts/.helmignore new file mode 100644 index 000000000..0e8a0eb36 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-tracing/charts/Chart.yaml b/packages/rancher-istio/1.17/rancher-tracing/charts/Chart.yaml new file mode 100644 index 000000000..8f78cf85f --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-tracing/charts/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.42.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.42.0 diff --git a/packages/rancher-istio/1.17/rancher-tracing/charts/README.md b/packages/rancher-istio/1.17/rancher-tracing/charts/README.md new file mode 100644 index 000000000..25534c628 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-tracing/charts/templates/_affinity.tpl b/packages/rancher-istio/1.17/rancher-tracing/charts/templates/_affinity.tpl new file mode 100644 index 000000000..bf6a9aee5 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-tracing/charts/templates/_helpers.tpl b/packages/rancher-istio/1.17/rancher-tracing/charts/templates/_helpers.tpl new file mode 100644 index 000000000..09c6b0546 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-tracing/charts/templates/deployment.yaml b/packages/rancher-istio/1.17/rancher-tracing/charts/templates/deployment.yaml new file mode 100644 index 000000000..f8a682808 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-tracing/charts/templates/psp.yaml b/packages/rancher-istio/1.17/rancher-tracing/charts/templates/psp.yaml new file mode 100644 index 000000000..4d5c271e1 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-tracing/charts/templates/pvc.yaml b/packages/rancher-istio/1.17/rancher-tracing/charts/templates/pvc.yaml new file mode 100644 index 000000000..9b4c55e4f --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-tracing/charts/templates/service.yaml b/packages/rancher-istio/1.17/rancher-tracing/charts/templates/service.yaml new file mode 100644 index 000000000..4210a9b5f --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-tracing/charts/templates/service.yaml @@ -0,0 +1,63 @@ +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 + selector: + app: {{ .Values.provider }} diff --git a/packages/rancher-istio/1.17/rancher-tracing/charts/templates/serviceaccount.yaml b/packages/rancher-istio/1.17/rancher-tracing/charts/templates/serviceaccount.yaml new file mode 100644 index 000000000..1bff77ff6 --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-tracing/charts/templates/validate-psp-install.yaml b/packages/rancher-istio/1.17/rancher-tracing/charts/templates/validate-psp-install.yaml new file mode 100644 index 000000000..a30c59d3b --- /dev/null +++ b/packages/rancher-istio/1.17/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.17/rancher-tracing/charts/values.yaml b/packages/rancher-istio/1.17/rancher-tracing/charts/values.yaml new file mode 100644 index 000000000..0d9ba6248 --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-tracing/charts/values.yaml @@ -0,0 +1,52 @@ +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: + amd64: 2 + s390x: 2 + ppc64le: 2 + defaultNodeSelector: + kubernetes.io/os: linux + rbac: + pspEnabled: false + +jaeger: + repository: rancher/mirrored-jaegertracing-all-in-one + tag: 1.42.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.17/rancher-tracing/package.yaml b/packages/rancher-istio/1.17/rancher-tracing/package.yaml new file mode 100644 index 000000000..6863eb543 --- /dev/null +++ b/packages/rancher-istio/1.17/rancher-tracing/package.yaml @@ -0,0 +1,3 @@ +url: local +version: 102.1.0 +doNotRelease: true \ No newline at end of file From d33ea554188445e382a7d0a3056d0533920954d7 Mon Sep 17 00:00:00 2001 From: nicholasSUSE Date: Wed, 12 Apr 2023 16:50:31 -0300 Subject: [PATCH 2/6] add jaegertracing-all-in-one 1.43.0 --- packages/rancher-istio/1.17/rancher-tracing/charts/Chart.yaml | 4 ++-- .../rancher-istio/1.17/rancher-tracing/charts/values.yaml | 2 +- packages/rancher-istio/1.17/rancher-tracing/package.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/rancher-istio/1.17/rancher-tracing/charts/Chart.yaml b/packages/rancher-istio/1.17/rancher-tracing/charts/Chart.yaml index 8f78cf85f..57a83a09c 100644 --- a/packages/rancher-istio/1.17/rancher-tracing/charts/Chart.yaml +++ b/packages/rancher-istio/1.17/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.42.0 +appVersion: 1.43.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.42.0 +version: 1.43.0 diff --git a/packages/rancher-istio/1.17/rancher-tracing/charts/values.yaml b/packages/rancher-istio/1.17/rancher-tracing/charts/values.yaml index 0d9ba6248..4dd095827 100644 --- a/packages/rancher-istio/1.17/rancher-tracing/charts/values.yaml +++ b/packages/rancher-istio/1.17/rancher-tracing/charts/values.yaml @@ -30,7 +30,7 @@ global: jaeger: repository: rancher/mirrored-jaegertracing-all-in-one - tag: 1.42.0 + tag: 1.43.0 # spanStorageType value can be "memory" and "badger" for all-in-one image spanStorageType: badger resources: diff --git a/packages/rancher-istio/1.17/rancher-tracing/package.yaml b/packages/rancher-istio/1.17/rancher-tracing/package.yaml index 6863eb543..00b0daf62 100644 --- a/packages/rancher-istio/1.17/rancher-tracing/package.yaml +++ b/packages/rancher-istio/1.17/rancher-tracing/package.yaml @@ -1,3 +1,3 @@ url: local -version: 102.1.0 +version: 102.2.0 doNotRelease: true \ No newline at end of file From e8fddae21600fccdf4fd508d909b156bb3e95a78 Mon Sep 17 00:00:00 2001 From: nicholasSUSE Date: Wed, 12 Apr 2023 17:08:32 -0300 Subject: [PATCH 3/6] update kiali server to version 1.66.0 --- .../generated-changes/patch/Chart.yaml.patch | 2 +- .../generated-changes/patch/values.yaml.patch | 5 +++-- .../rancher-istio/1.17/rancher-kiali-server/package.yaml | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch b/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch index 9f5844468..760b074ce 100644 --- a/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-istio/1.17/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.63.2 + appVersion: v1.66.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.17/rancher-kiali-server/generated-changes/patch/values.yaml.patch b/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/values.yaml.patch index 61a586e8a..735437dda 100644 --- a/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-istio/1.17/rancher-kiali-server/generated-changes/patch/values.yaml.patch @@ -18,8 +18,8 @@ + repository: rancher/mirrored-kiali-kiali image_pull_policy: "Always" image_pull_secrets: [] -- image_version: v1.63.2 # version like "v1.39" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash -+ tag: v1.63.2 # version like "v1.63" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash +- image_version: v1.66.0 # version like "v1.39" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash ++ tag: v1.66.0 # version like "v1.66" (see: https://quay.io/repository/kiali/kiali?tab=tags) or a digest hash ingress: additional_labels: {} class_name: "nginx" @@ -37,3 +37,4 @@ + clusterId: + psp: + enabled: false +\ No newline at end of file diff --git a/packages/rancher-istio/1.17/rancher-kiali-server/package.yaml b/packages/rancher-istio/1.17/rancher-kiali-server/package.yaml index c26af0dba..021c0f194 100644 --- a/packages/rancher-istio/1.17/rancher-kiali-server/package.yaml +++ b/packages/rancher-istio/1.17/rancher-kiali-server/package.yaml @@ -1,3 +1,3 @@ -url: https://kiali.org/helm-charts/kiali-server-1.63.2.tgz -version: 102.1.0 +url: https://kiali.org/helm-charts/kiali-server-1.66.0.tgz +version: 102.2.0 doNotRelease: true \ No newline at end of file From a366f3d6a63293adfcccdf3cd41e342f4e6e573f Mon Sep 17 00:00:00 2001 From: nicholasSUSE Date: Wed, 12 Apr 2023 17:16:07 -0300 Subject: [PATCH 4/6] add istio 1.17.2 --- .../1.17/rancher-istio/charts/Chart.yaml | 8 ++++---- .../1.17/rancher-istio/charts/app-readme.md | 2 +- .../1.17/rancher-istio/charts/values.yaml | 20 +++++++++---------- .../dependencies/kiali/dependency.yaml | 2 +- .../dependencies/tracing/dependency.yaml | 2 +- .../1.17/rancher-istio/package.yaml | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/rancher-istio/1.17/rancher-istio/charts/Chart.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/Chart.yaml index d4d75b0f6..fd13ef527 100644 --- a/packages/rancher-istio/1.17/rancher-istio/charts/Chart.yaml +++ b/packages/rancher-istio/1.17/rancher-istio/charts/Chart.yaml @@ -1,7 +1,7 @@ annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/display-name: Istio - catalog.cattle.io/kube-version: '>= 1.22.0-0 < 1.26.0-0' + catalog.cattle.io/kube-version: '>= 1.23.0-0 < 1.27.0-0' catalog.cattle.io/namespace: istio-system catalog.cattle.io/os: linux catalog.cattle.io/permits-os: linux,windows @@ -11,9 +11,9 @@ annotations: catalog.cattle.io/requests-memory: 2314Mi catalog.cattle.io/type: cluster-tool catalog.cattle.io/ui-component: istio - catalog.cattle.io/upstream-version: 1.16.3 + catalog.cattle.io/upstream-version: 1.17.2 apiVersion: v1 -appVersion: 1.16.3 +appVersion: 1.17.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.16.3 +version: 1.17.2 diff --git a/packages/rancher-istio/1.17/rancher-istio/charts/app-readme.md b/packages/rancher-istio/1.17/rancher-istio/charts/app-readme.md index 9c034c972..6f083ad56 100644 --- a/packages/rancher-istio/1.17/rancher-istio/charts/app-readme.md +++ b/packages/rancher-istio/1.17/rancher-istio/charts/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 `102.1.0+up1.16.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 `102.2.0+up1.17.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/packages/rancher-istio/1.17/rancher-istio/charts/values.yaml b/packages/rancher-istio/1.17/rancher-istio/charts/values.yaml index 325d779d7..be791fbd3 100644 --- a/packages/rancher-istio/1.17/rancher-istio/charts/values.yaml +++ b/packages/rancher-istio/1.17/rancher-istio/charts/values.yaml @@ -1,11 +1,11 @@ overlayFile: "" -tag: 1.16.3 +tag: 1.17.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.16.3-rancher1 + tag: 1.17.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.16.3 - tag: 1.16.3-distroless +# tag: 1.17.2 + tag: 1.17.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.16.3 - tag: 1.16.3-distroless +# tag: 1.17.2 + tag: 1.17.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.16.3 - tag: 1.16.3-distroless +# tag: 1.17.2 + tag: 1.17.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.16.3 - tag: 1.16.3-distroless +# tag: 1.17.2 + tag: 1.17.2-distroless defaultPodDisruptionBudget: enabled: true diff --git a/packages/rancher-istio/1.17/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml b/packages/rancher-istio/1.17/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml index 1516d9fcb..453df0086 100644 --- a/packages/rancher-istio/1.17/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml +++ b/packages/rancher-istio/1.17/rancher-istio/generated-changes/dependencies/kiali/dependency.yaml @@ -1,2 +1,2 @@ workingDir: "" -url: packages/rancher-istio/1.16/rancher-kiali-server +url: packages/rancher-istio/1.17/rancher-kiali-server diff --git a/packages/rancher-istio/1.17/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml b/packages/rancher-istio/1.17/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml index 1390d9bb9..6d14d9808 100644 --- a/packages/rancher-istio/1.17/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml +++ b/packages/rancher-istio/1.17/rancher-istio/generated-changes/dependencies/tracing/dependency.yaml @@ -1,2 +1,2 @@ workingDir: "" -url: packages/rancher-istio/1.16/rancher-tracing +url: packages/rancher-istio/1.17/rancher-tracing diff --git a/packages/rancher-istio/1.17/rancher-istio/package.yaml b/packages/rancher-istio/1.17/rancher-istio/package.yaml index a90d93d21..56dd0a489 100644 --- a/packages/rancher-istio/1.17/rancher-istio/package.yaml +++ b/packages/rancher-istio/1.17/rancher-istio/package.yaml @@ -1,2 +1,2 @@ url: local -version: 102.1.0+up1.16.3 +version: 102.2.0+up1.17.2 From 836b7f7cde0e9c14ddcde80ef9acb82d55c9a556 Mon Sep 17 00:00:00 2001 From: nicholasSUSE Date: Wed, 12 Apr 2023 17:22:01 -0300 Subject: [PATCH 5/6] make charts --- .../rancher-istio-102.2.0+up1.17.2.tgz | Bin 0 -> 20310 bytes .../rancher-istio/102.2.0+up1.17.2/Chart.yaml | 24 ++ .../rancher-istio/102.2.0+up1.17.2/README.md | 79 ++++++ .../102.2.0+up1.17.2/app-readme.md | 65 +++++ .../102.2.0+up1.17.2/charts/kiali/Chart.yaml | 28 +++ .../charts/kiali/templates/NOTES.txt | 5 + .../charts/kiali/templates/_helpers.tpl | 226 ++++++++++++++++++ .../charts/kiali/templates/cabundle.yaml | 13 + .../charts/kiali/templates/configmap.yaml | 30 +++ .../charts/kiali/templates/deployment.yaml | 218 +++++++++++++++++ .../charts/kiali/templates/hpa.yaml | 17 ++ .../charts/kiali/templates/ingress.yaml | 62 +++++ .../charts/kiali/templates/oauth.yaml | 22 ++ .../charts/kiali/templates/psp.yaml | 67 ++++++ .../kiali/templates/role-controlplane.yaml | 23 ++ .../charts/kiali/templates/role-viewer.yaml | 87 +++++++ .../charts/kiali/templates/role.yaml | 94 ++++++++ .../templates/rolebinding-controlplane.yaml | 17 ++ .../charts/kiali/templates/rolebinding.yaml | 20 ++ .../charts/kiali/templates/route.yaml | 34 +++ .../charts/kiali/templates/service.yaml | 48 ++++ .../kiali/templates/serviceaccount.yaml | 9 + .../kiali/templates/validate-psp-install.yaml | 7 + .../kiali/templates/web-root-configmap.yaml | 12 + .../102.2.0+up1.17.2/charts/kiali/values.yaml | 125 ++++++++++ .../charts/tracing/.helmignore | 23 ++ .../charts/tracing/Chart.yaml | 12 + .../102.2.0+up1.17.2/charts/tracing/README.md | 5 + .../charts/tracing/templates/_affinity.tpl | 92 +++++++ .../charts/tracing/templates/_helpers.tpl | 47 ++++ .../charts/tracing/templates/deployment.yaml | 94 ++++++++ .../charts/tracing/templates/psp.yaml | 76 ++++++ .../charts/tracing/templates/pvc.yaml | 16 ++ .../charts/tracing/templates/service.yaml | 63 +++++ .../tracing/templates/serviceaccount.yaml | 9 + .../templates/validate-psp-install.yaml | 7 + .../charts/tracing/values.yaml | 52 ++++ .../102.2.0+up1.17.2/configs/istio-base.yaml | 135 +++++++++++ .../102.2.0+up1.17.2/requirements.yaml | 7 + .../samples/overlay-example.yaml | 37 +++ .../102.2.0+up1.17.2/templates/_helpers.tpl | 27 +++ .../templates/admin-role.yaml | 43 ++++ .../templates/base-config-map.yaml | 7 + .../templates/clusterrole.yaml | 134 +++++++++++ .../templates/clusterrolebinding.yaml | 12 + .../102.2.0+up1.17.2/templates/edit-role.yaml | 43 ++++ .../templates/istio-cni-psp.yaml | 51 ++++ .../templates/istio-install-job.yaml | 66 +++++ .../templates/istio-install-psp.yaml | 30 +++ .../102.2.0+up1.17.2/templates/istio-psp.yaml | 81 +++++++ .../templates/istio-uninstall-job.yaml | 53 ++++ .../templates/overlay-config-map.yaml | 9 + .../templates/service-monitors.yaml | 51 ++++ .../templates/serviceaccount.yaml | 5 + .../templates/validate-psp-install.yaml | 7 + .../102.2.0+up1.17.2/templates/view-role.yaml | 41 ++++ .../102.2.0+up1.17.2/values.yaml | 116 +++++++++ index.yaml | 35 +++ 58 files changed, 2818 insertions(+) create mode 100644 assets/rancher-istio/rancher-istio-102.2.0+up1.17.2.tgz create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/Chart.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/README.md create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/app-readme.md create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/Chart.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/NOTES.txt create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/_helpers.tpl create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/cabundle.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/configmap.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/deployment.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/hpa.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/ingress.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/oauth.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/psp.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/role-controlplane.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/role-viewer.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/role.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/rolebinding-controlplane.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/rolebinding.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/route.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/service.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/serviceaccount.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/validate-psp-install.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/web-root-configmap.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/values.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/.helmignore create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/Chart.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/README.md create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/_affinity.tpl create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/_helpers.tpl create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/deployment.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/psp.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/pvc.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/service.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/serviceaccount.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/validate-psp-install.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/values.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/configs/istio-base.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/requirements.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/samples/overlay-example.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/templates/_helpers.tpl create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/templates/admin-role.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/templates/base-config-map.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/templates/clusterrole.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/templates/clusterrolebinding.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/templates/edit-role.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/templates/istio-cni-psp.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/templates/istio-install-job.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/templates/istio-install-psp.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/templates/istio-psp.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/templates/istio-uninstall-job.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/templates/overlay-config-map.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/templates/service-monitors.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/templates/serviceaccount.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/templates/validate-psp-install.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/templates/view-role.yaml create mode 100644 charts/rancher-istio/102.2.0+up1.17.2/values.yaml diff --git a/assets/rancher-istio/rancher-istio-102.2.0+up1.17.2.tgz b/assets/rancher-istio/rancher-istio-102.2.0+up1.17.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..492071892d0d754d56584628cabb1b4506147f3f GIT binary patch literal 20310 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 literal 0 HcmV?d00001 diff --git a/charts/rancher-istio/102.2.0+up1.17.2/Chart.yaml b/charts/rancher-istio/102.2.0+up1.17.2/Chart.yaml new file mode 100644 index 000000000..fe0705edb --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/Chart.yaml @@ -0,0 +1,24 @@ +annotations: + catalog.cattle.io/certified: rancher + catalog.cattle.io/display-name: Istio + catalog.cattle.io/kube-version: '>= 1.23.0-0 < 1.27.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.7.0-0 < 2.8.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.17.2 +apiVersion: v1 +appVersion: 1.17.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: 102.2.0+up1.17.2 diff --git a/charts/rancher-istio/102.2.0+up1.17.2/README.md b/charts/rancher-istio/102.2.0+up1.17.2/README.md new file mode 100644 index 000000000..2230c6185 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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/charts/rancher-istio/102.2.0+up1.17.2/app-readme.md b/charts/rancher-istio/102.2.0+up1.17.2/app-readme.md new file mode 100644 index 000000000..6f083ad56 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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 `102.2.0+up1.17.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 + +#### 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/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/Chart.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/Chart.yaml new file mode 100644 index 000000000..811ddfde7 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.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.66.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/master/themes/kiali/static/img/kiali_logo_masthead.png +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.66.0 diff --git a/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/NOTES.txt b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/NOTES.txt new file mode 100644 index 000000000..751019401 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.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/102.2.0+up1.17.2/charts/kiali/templates/_helpers.tpl b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/_helpers.tpl new file mode 100644 index 000000000..045a2d724 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/_helpers.tpl @@ -0,0 +1,226 @@ +{{/* 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 with the old verbose_mode and the new log_level considered. +*/}} +{{- define "kiali-server.logLevel" -}} +{{- if .Values.deployment.verbose_mode -}} +{{- .Values.deployment.verbose_mode -}} +{{- else -}} +{{- .Values.deployment.logger.log_level -}} +{{- end -}} +{{- 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.kiali_feature_flags.clustering.autodetect_secrets.enabled }} + {{- $secretLabelToLookFor := (regexSplit "=" .Values.kiali_feature_flags.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/102.2.0+up1.17.2/charts/kiali/templates/cabundle.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/cabundle.yaml new file mode 100644 index 000000000..7462b95a7 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.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/102.2.0+up1.17.2/charts/kiali/templates/configmap.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/configmap.yaml new file mode 100644 index 000000000..f7b68294d --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.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/102.2.0+up1.17.2/charts/kiali/templates/deployment.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/deployment.yaml new file mode 100644 index 000000000..cfe9099c4 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/deployment.yaml @@ -0,0 +1,218 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "kiali-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "kiali-server.labels" . | nindent 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.metrics_enabled }} + prometheus.io/scrape: "true" + prometheus.io/port: {{ .Values.server.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 }} + 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.metrics_enabled }} + - name: http-metrics + containerPort: {{ .Values.server.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.kiali_feature_flags.clustering.clusters }} + - name: {{ .name }} + mountPath: "/kiali-remote-cluster-secrets/{{ .secret_name }}" + {{- 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 }} + secret: + secretName: {{ .name }} + optional: {{ .optional | default false }} + {{- end }} + {{- range $key, $val := (include "kiali-server.remote-cluster-secrets" .) | fromJson }} + - name: {{ $key }} + secret: + secretName: {{ $val }} + {{- end }} + {{- range .Values.kiali_feature_flags.clustering.clusters }} + - name: {{ .name }} + secret: + secretName: {{ .secret_name }} + {{- 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/102.2.0+up1.17.2/charts/kiali/templates/hpa.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/hpa.yaml new file mode 100644 index 000000000..934c4c1e9 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.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/102.2.0+up1.17.2/charts/kiali/templates/ingress.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/ingress.yaml new file mode 100644 index 000000000..27807fc3d --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.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/102.2.0+up1.17.2/charts/kiali/templates/oauth.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/oauth.yaml new file mode 100644 index 000000000..b2e590425 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/oauth.yaml @@ -0,0 +1,22 @@ +{{- 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 }} +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/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/psp.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/psp.yaml new file mode 100644 index 000000000..e31d706d4 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/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/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/role-controlplane.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/role-controlplane.yaml new file mode 100644 index 000000000..707501c67 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.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/102.2.0+up1.17.2/charts/kiali/templates/role-viewer.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/role-viewer.yaml new file mode 100644 index 000000000..8c7fda182 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/role-viewer.yaml @@ -0,0 +1,87 @@ +--- +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 +... diff --git a/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/role.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/role.yaml new file mode 100644 index 000000000..8969da3e6 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/role.yaml @@ -0,0 +1,94 @@ +--- +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 +... diff --git a/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/rolebinding-controlplane.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/rolebinding-controlplane.yaml new file mode 100644 index 000000000..5a0015836 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.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/102.2.0+up1.17.2/charts/kiali/templates/rolebinding.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/rolebinding.yaml new file mode 100644 index 000000000..e2a794c7b --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/rolebinding.yaml @@ -0,0 +1,20 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: {{ include "kiali-server.fullname" . }} + 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/102.2.0+up1.17.2/charts/kiali/templates/route.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/route.yaml new file mode 100644 index 000000000..8325c14a7 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.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/102.2.0+up1.17.2/charts/kiali/templates/service.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/service.yaml new file mode 100644 index 000000000..3acbc8543 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/service.yaml @@ -0,0 +1,48 @@ +--- +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 .Values.server.metrics_enabled }} + - name: http-metrics + appProtocol: http + protocol: TCP + port: {{ .Values.server.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/102.2.0+up1.17.2/charts/kiali/templates/serviceaccount.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/serviceaccount.yaml new file mode 100644 index 000000000..9151b6f6a --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.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/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/validate-psp-install.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/validate-psp-install.yaml new file mode 100644 index 000000000..a30c59d3b --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/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/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/web-root-configmap.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/templates/web-root-configmap.yaml new file mode 100644 index 000000000..970d4e4f5 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/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/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/values.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/values.yaml new file mode 100644 index 000000000..49ac80d37 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/kiali/values.yaml @@ -0,0 +1,125 @@ +# '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. +# + +istio_namespace: "" # default is where Kiali is installed + +auth: + openid: {} + openshift: {} + strategy: "" + +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: [] + 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.66.0 # version like "v1.66" (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.66.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 + clustering: + autodetect_secrets: + enabled: true + label: "kiali.io/multiCluster=true" + clusters: [] + disabled_features: [] + validations: + ignore: ["KIA1201"] + +login_token: + signing_key: "" + +server: + port: 20001 + 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/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/.helmignore b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/.helmignore new file mode 100644 index 000000000..0e8a0eb36 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/.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/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/Chart.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/Chart.yaml new file mode 100644 index 000000000..0cfa6aacc --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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.43.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.43.0 diff --git a/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/README.md b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/README.md new file mode 100644 index 000000000..25534c628 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/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/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/_affinity.tpl b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/_affinity.tpl new file mode 100644 index 000000000..bf6a9aee5 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/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/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/_helpers.tpl b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/_helpers.tpl new file mode 100644 index 000000000..09c6b0546 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/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/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/deployment.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/deployment.yaml new file mode 100644 index 000000000..f8a682808 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/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/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/psp.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/psp.yaml new file mode 100644 index 000000000..4d5c271e1 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/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/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/pvc.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/pvc.yaml new file mode 100644 index 000000000..9b4c55e4f --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/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/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/service.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/service.yaml new file mode 100644 index 000000000..4210a9b5f --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/service.yaml @@ -0,0 +1,63 @@ +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 + selector: + app: {{ .Values.provider }} diff --git a/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/serviceaccount.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/serviceaccount.yaml new file mode 100644 index 000000000..1bff77ff6 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/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/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/validate-psp-install.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/templates/validate-psp-install.yaml new file mode 100644 index 000000000..a30c59d3b --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/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/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/values.yaml b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/values.yaml new file mode 100644 index 000000000..4dd095827 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/charts/tracing/values.yaml @@ -0,0 +1,52 @@ +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: + amd64: 2 + s390x: 2 + ppc64le: 2 + defaultNodeSelector: + kubernetes.io/os: linux + rbac: + pspEnabled: false + +jaeger: + repository: rancher/mirrored-jaegertracing-all-in-one + tag: 1.43.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/charts/rancher-istio/102.2.0+up1.17.2/configs/istio-base.yaml b/charts/rancher-istio/102.2.0+up1.17.2/configs/istio-base.yaml new file mode 100644 index 000000000..9d99112e3 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/configs/istio-base.yaml @@ -0,0 +1,135 @@ +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 }} + revision: {{ .Values.revision }} + meshConfig: + defaultConfig: + 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 }} + {{- 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/charts/rancher-istio/102.2.0+up1.17.2/requirements.yaml b/charts/rancher-istio/102.2.0+up1.17.2/requirements.yaml new file mode 100644 index 000000000..943a08326 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/requirements.yaml @@ -0,0 +1,7 @@ +dependencies: +- condition: kiali.enabled + name: kiali + repository: file://./charts/kiali +- condition: tracing.enabled + name: tracing + repository: file://./charts/tracing diff --git a/charts/rancher-istio/102.2.0+up1.17.2/samples/overlay-example.yaml b/charts/rancher-istio/102.2.0+up1.17.2/samples/overlay-example.yaml new file mode 100644 index 000000000..5cf3cf3b0 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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/charts/rancher-istio/102.2.0+up1.17.2/templates/_helpers.tpl b/charts/rancher-istio/102.2.0+up1.17.2/templates/_helpers.tpl new file mode 100644 index 000000000..30b429a80 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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/charts/rancher-istio/102.2.0+up1.17.2/templates/admin-role.yaml b/charts/rancher-istio/102.2.0+up1.17.2/templates/admin-role.yaml new file mode 100644 index 000000000..ad1313c4f --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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/charts/rancher-istio/102.2.0+up1.17.2/templates/base-config-map.yaml b/charts/rancher-istio/102.2.0+up1.17.2/templates/base-config-map.yaml new file mode 100644 index 000000000..5323917bc --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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/charts/rancher-istio/102.2.0+up1.17.2/templates/clusterrole.yaml b/charts/rancher-istio/102.2.0+up1.17.2/templates/clusterrole.yaml new file mode 100644 index 000000000..d6721cc45 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/templates/clusterrole.yaml @@ -0,0 +1,134 @@ +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 + - persistentvolumeclaims + - secrets + - services + - serviceaccounts + verbs: + - '*' +{{- if and .Values.global.cattle.psp.enabled }} +- apiGroups: + - policy + resourceNames: + - istio-installer + resources: + - podsecuritypolicies + verbs: + - use +{{- end }} diff --git a/charts/rancher-istio/102.2.0+up1.17.2/templates/clusterrolebinding.yaml b/charts/rancher-istio/102.2.0+up1.17.2/templates/clusterrolebinding.yaml new file mode 100644 index 000000000..9d74a0434 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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/charts/rancher-istio/102.2.0+up1.17.2/templates/edit-role.yaml b/charts/rancher-istio/102.2.0+up1.17.2/templates/edit-role.yaml new file mode 100644 index 000000000..d1059d58d --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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/charts/rancher-istio/102.2.0+up1.17.2/templates/istio-cni-psp.yaml b/charts/rancher-istio/102.2.0+up1.17.2/templates/istio-cni-psp.yaml new file mode 100644 index 000000000..a71561e67 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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/charts/rancher-istio/102.2.0+up1.17.2/templates/istio-install-job.yaml b/charts/rancher-istio/102.2.0+up1.17.2/templates/istio-install-job.yaml new file mode 100644 index 000000000..c2e362e68 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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/charts/rancher-istio/102.2.0+up1.17.2/templates/istio-install-psp.yaml b/charts/rancher-istio/102.2.0+up1.17.2/templates/istio-install-psp.yaml new file mode 100644 index 000000000..9da3391d4 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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/charts/rancher-istio/102.2.0+up1.17.2/templates/istio-psp.yaml b/charts/rancher-istio/102.2.0+up1.17.2/templates/istio-psp.yaml new file mode 100644 index 000000000..cfada1bf7 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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/charts/rancher-istio/102.2.0+up1.17.2/templates/istio-uninstall-job.yaml b/charts/rancher-istio/102.2.0+up1.17.2/templates/istio-uninstall-job.yaml new file mode 100644 index 000000000..0091d0c17 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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/charts/rancher-istio/102.2.0+up1.17.2/templates/overlay-config-map.yaml b/charts/rancher-istio/102.2.0+up1.17.2/templates/overlay-config-map.yaml new file mode 100644 index 000000000..287d26b2c --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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/charts/rancher-istio/102.2.0+up1.17.2/templates/service-monitors.yaml b/charts/rancher-istio/102.2.0+up1.17.2/templates/service-monitors.yaml new file mode 100644 index 000000000..c3d60c4fc --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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/charts/rancher-istio/102.2.0+up1.17.2/templates/serviceaccount.yaml b/charts/rancher-istio/102.2.0+up1.17.2/templates/serviceaccount.yaml new file mode 100644 index 000000000..82b6cbb7e --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/templates/serviceaccount.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: istio-installer + namespace: {{ template "istio.namespace" . }} diff --git a/charts/rancher-istio/102.2.0+up1.17.2/templates/validate-psp-install.yaml b/charts/rancher-istio/102.2.0+up1.17.2/templates/validate-psp-install.yaml new file mode 100644 index 000000000..4b0e5cfb6 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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/charts/rancher-istio/102.2.0+up1.17.2/templates/view-role.yaml b/charts/rancher-istio/102.2.0+up1.17.2/templates/view-role.yaml new file mode 100644 index 000000000..5947d3eba --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/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/charts/rancher-istio/102.2.0+up1.17.2/values.yaml b/charts/rancher-istio/102.2.0+up1.17.2/values.yaml new file mode 100644 index 000000000..be791fbd3 --- /dev/null +++ b/charts/rancher-istio/102.2.0+up1.17.2/values.yaml @@ -0,0 +1,116 @@ +overlayFile: "" +tag: 1.17.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.17.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. + 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.17.2 + tag: 1.17.2-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.17.2 + tag: 1.17.2-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.17.2 + tag: 1.17.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.17.2 + tag: 1.17.2-distroless + defaultPodDisruptionBudget: + enabled: true + +# Kiali subchart from rancher-kiali-server +kiali: + enabled: true + auth: + strategy: anonymous + 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" + +## 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/index.yaml b/index.yaml index 86820d077..7b4106acd 100755 --- a/index.yaml +++ b/index.yaml @@ -7285,6 +7285,41 @@ entries: - assets/rancher-grafana/rancher-grafana-6.6.401.tgz version: 6.6.401 rancher-istio: + - annotations: + catalog.cattle.io/certified: rancher + catalog.cattle.io/display-name: Istio + catalog.cattle.io/kube-version: '>= 1.23.0-0 < 1.27.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.7.0-0 < 2.8.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.17.2 + apiVersion: v1 + appVersion: 1.17.2 + created: "2023-04-12T17:20:21.34071599-03:00" + dependencies: + - condition: kiali.enabled + name: kiali + repository: file://./charts/kiali + - condition: tracing.enabled + name: tracing + repository: file://./charts/tracing + description: A basic Istio setup that installs with the istioctl. Refer to https://istio.io/latest/ + for details. + digest: b64fb78a5f254273df90efe2eb35d4cfa74dda61a739bcb76e68fcf835ce48a5 + icon: https://charts.rancher.io/assets/logos/istio.svg + keywords: + - networking + - infrastructure + name: rancher-istio + urls: + - assets/rancher-istio/rancher-istio-102.2.0+up1.17.2.tgz + version: 102.2.0+up1.17.2 - annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/display-name: Istio From 546c3d44577ca6bee57cfe3abd4a0a334be68221 Mon Sep 17 00:00:00 2001 From: nicholasSUSE Date: Wed, 12 Apr 2023 17:22:48 -0300 Subject: [PATCH 6/6] update release.yaml --- release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/release.yaml b/release.yaml index f0db7c973..4470779a4 100644 --- a/release.yaml +++ b/release.yaml @@ -7,4 +7,5 @@ rancher-eks-operator-crd: - 102.0.1+up1.1.5 - 102.0.0+up1.2.0 rancher-istio: + - 102.2.0+up1.17.2 - 102.1.0+up1.16.3 \ No newline at end of file