From 8e6e45ad6d6cd4e96ad5bc140a24ab389e3d3d3c Mon Sep 17 00:00:00 2001 From: Brenda Rearden Date: Thu, 17 Sep 2020 01:34:49 -0700 Subject: [PATCH] (dev-v2.6-archive) Update kiali to 1.23.0 (partially cherry picked from commit d397bb512cb6d9ef953bb8745a9e7217f2f61299) --- packages/fleet-agent/package.yaml | 2 +- packages/fleet-crd/package.yaml | 2 +- packages/fleet/package.yaml | 2 +- packages/rancher-istio/charts/Chart.yaml | 7 +- .../charts/configs/istio-base.yaml | 8 - .../rancher-istio/charts/requirements.yaml | 2 +- packages/rancher-istio/charts/values.yaml | 18 +- packages/rancher-kiali-server/package.yaml | 2 +- .../rancher-kiali-server.patch | 37 +- packages/rancher-monitoring/package.yaml | 2 +- .../rancher-monitoring.patch | 914 ++++++++++-------- packages/rancher-operator-crd/package.yaml | 2 +- packages/rancher-operator/package.yaml | 2 +- packages/rio/charts/Chart.yaml | 3 +- packages/rio/charts/README.md | 7 +- .../charts/helm/tiller-serviceaccount.yaml | 20 + 16 files changed, 580 insertions(+), 450 deletions(-) create mode 100644 packages/rio/charts/helm/tiller-serviceaccount.yaml diff --git a/packages/fleet-agent/package.yaml b/packages/fleet-agent/package.yaml index 598718ea5..8c4e982aa 100644 --- a/packages/fleet-agent/package.yaml +++ b/packages/fleet-agent/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/fleet/releases/download/v0.3.0-beta1/fleet-agent-0.3.0-beta1.tgz +url: https://github.com/rancher/fleet/releases/download/v0.3.0-alpha9/fleet-agent-0.3.0-alpha9.tgz packageVersion: 00 diff --git a/packages/fleet-crd/package.yaml b/packages/fleet-crd/package.yaml index 33d32164a..225213ba0 100644 --- a/packages/fleet-crd/package.yaml +++ b/packages/fleet-crd/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/fleet/releases/download/v0.3.0-beta1/fleet-crd-0.3.0-beta1.tgz +url: https://github.com/rancher/fleet/releases/download/v0.3.0-alpha9/fleet-crd-0.3.0-alpha9.tgz packageVersion: 00 diff --git a/packages/fleet/package.yaml b/packages/fleet/package.yaml index a8d3a6275..b56f975fd 100644 --- a/packages/fleet/package.yaml +++ b/packages/fleet/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/fleet/releases/download/v0.3.0-beta1/fleet-0.3.0-beta1.tgz +url: https://github.com/rancher/fleet/releases/download/v0.3.0-alpha9/fleet-0.3.0-alpha9.tgz packageVersion: 00 diff --git a/packages/rancher-istio/charts/Chart.yaml b/packages/rancher-istio/charts/Chart.yaml index 08a4b446d..3c052316a 100644 --- a/packages/rancher-istio/charts/Chart.yaml +++ b/packages/rancher-istio/charts/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: 1.6.8 -description: Helm chart for installing istio components with the istioctl +appVersion: 1.7.1 +description: A basic Istio setup that installs with the istioctl. Refer to https://istio.io/latest/ for details. name: rancher-istio -version: 1.6.800 +version: 1.7.100 icon: https://charts.rancher.io/assets/logos/istio.svg keywords: - networking @@ -13,4 +13,5 @@ annotations: catalog.cattle.io/release-name: rancher-istio catalog.cattle.io/ui-component: istio catalog.cattle.io/requires-gvr: monitoring.coreos.com.prometheus/v1 + catalog.cattle.io/provides-gvr: networking.istio.io.virtualservice/v1beta1 catalog.cattle.io/auto-install: rancher-kiali-server-crd=1.22.001 diff --git a/packages/rancher-istio/charts/configs/istio-base.yaml b/packages/rancher-istio/charts/configs/istio-base.yaml index 93fd51c56..976fc2240 100644 --- a/packages/rancher-istio/charts/configs/istio-base.yaml +++ b/packages/rancher-istio/charts/configs/istio-base.yaml @@ -4,14 +4,6 @@ spec: addonComponents: istiocoredns: enabled: {{ .Values.istiocoredns.enabled }} - prometheus: - enabled: false - grafana: - enabled: false - kiali: - enabled: false - tracing: - enabled: false components: base: enabled: {{ .Values.base.enabled }} diff --git a/packages/rancher-istio/charts/requirements.yaml b/packages/rancher-istio/charts/requirements.yaml index f81657e3d..6c0a47abd 100644 --- a/packages/rancher-istio/charts/requirements.yaml +++ b/packages/rancher-istio/charts/requirements.yaml @@ -3,5 +3,5 @@ dependencies: - name: rancher-kiali-server alias: kiali condition: kiali.enabled - version: 1.22.0 + version: 1.23.0 repository: file://../../rancher-kiali-server/charts diff --git a/packages/rancher-istio/charts/values.yaml b/packages/rancher-istio/charts/values.yaml index b6470c1cb..a7f1be8fa 100644 --- a/packages/rancher-istio/charts/values.yaml +++ b/packages/rancher-istio/charts/values.yaml @@ -1,6 +1,6 @@ overlayFile: "" -tag: 1.6.8 -installerVersion: 1.6.8-rancher1 +tag: 1.7.1 +installerVersion: 1.7.1-rancher1 forceInstall: false istiocoredns: @@ -18,7 +18,7 @@ base: cni: enabled: false repository: rancher/istio-install-cni - tag: 1.6.8 + tag: 1.7.1 egressGateways: enabled: false @@ -34,17 +34,17 @@ istiodRemote: pilot: enabled: true repository: rancher/istio-pilot - tag: 1.6.8 + tag: 1.7.1 policy: enabled: true repository: rancher/istio-mixer - tag: 1.6.8 + tag: 1.7.1 telemetry: enabled: true repository: rancher/istio-mixer - tag: 1.6.8 + tag: 1.7.1 sidecarInjectorWebhook: enableNamespacesByDefault: false @@ -58,10 +58,10 @@ global: systemDefaultRegistry: "" proxy: repository: rancher/istio-proxyv2 - tag: 1.6.8 + tag: 1.7.1 proxy_init: repository: rancher/istio-proxyv2 - tag: 1.6.8 + tag: 1.7.1 defaultPodDisruptionBudget: enabled: true @@ -77,7 +77,7 @@ kiali: deployment: ingress_enabled: false repository: rancher/kiali-kiali - tag: v1.22.1 + tag: v1.23.0 external_services: prometheus: custom_metrics_url: "http://rancher-monitoring-prometheus.cattle-monitoring-system.svc:9090" diff --git a/packages/rancher-kiali-server/package.yaml b/packages/rancher-kiali-server/package.yaml index adcc9fa88..6ba62c867 100644 --- a/packages/rancher-kiali-server/package.yaml +++ b/packages/rancher-kiali-server/package.yaml @@ -1,4 +1,4 @@ -url: https://kiali.org/helm-charts/kiali-server-1.22.0.tgz +url: https://kiali.org/helm-charts/kiali-server-1.23.0.tgz packageVersion: 01 generateCRDChart: enabled: true diff --git a/packages/rancher-kiali-server/rancher-kiali-server.patch b/packages/rancher-kiali-server/rancher-kiali-server.patch index 3cb1ecd6c..bcf49ab07 100644 --- a/packages/rancher-kiali-server/rancher-kiali-server.patch +++ b/packages/rancher-kiali-server/rancher-kiali-server.patch @@ -1,12 +1,12 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/Chart.yaml packages/rancher-kiali-server/charts/Chart.yaml --- packages/rancher-kiali-server/charts-original/Chart.yaml +++ packages/rancher-kiali-server/charts/Chart.yaml -@@ -1,20 +1,28 @@ +@@ -1,20 +1,27 @@ apiVersion: v2 - appVersion: v1.22.0 + appVersion: v1.23.0 -description: Kiali is an open source project for service mesh observability, refer - to https://www.kiali.io for details. -+description: Rancher chart based on Kiali Server, containing standard defaults. Installed as sub-chart with customized values in Rancher's Istio. ++description: Kiali is an open source project for service mesh observability, refer to https://www.kiali.io for details. This is installed as sub-chart with customized values in Rancher's Istio. home: https://github.com/kiali/kiali icon: https://raw.githubusercontent.com/kiali/kiali.io/master/themes/kiali/static/img/kiali_logo_masthead.png keywords: @@ -34,13 +34,12 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/C + - https://github.com/kiali/kiali-ui + - https://github.com/kiali/kiali-operator + - https://github.com/kiali/helm-charts - version: 1.22.0 + version: 1.23.0 +annotations: + catalog.cattle.io/requires-gvr: monitoring.coreos.com.prometheus/v1 + catalog.rancher.io/namespace: cattle-istio-system + catalog.rancher.io/release-name: rancher-kiali-server + catalog.cattle.io/hidden: true -+ catalog.cattle.io/auto-install: rancher-kiali-server-crd=match + catalog.cattle.io/provides-gvr: monitoringdashboards.monitoring.kiali.io/v1alpha1 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/templates/_helpers.tpl packages/rancher-kiali-server/charts/templates/_helpers.tpl --- packages/rancher-kiali-server/charts-original/templates/_helpers.tpl @@ -64,8 +63,8 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/t {{- end }} + +{{- define "system_default_registry" -}} -+{{- if .Values.global.systemDefaultRegistry -}} -+{{- printf "%s/" .Values.global.systemDefaultRegistry -}} ++{{- if .Values.global.cattle.systemDefaultRegistry -}} ++{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}} +{{- else -}} +{{- "" -}} +{{- end -}} @@ -123,7 +122,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/t + {{- include "kiali-server.labels" . | nindent 4 }} +data: + env.js: | -+ window.WEB_ROOT='/k8s/clusters/{{ .Values.global.rancher.clusterId }}/api/v1/namespaces/{{ .Release.Namespace }}/services/http:rancher-istio-kiali:20001/proxy'; ++ window.WEB_ROOT='/k8s/clusters/{{ .Values.global.cattle.clusterId }}/api/v1/namespaces/{{ .Release.Namespace }}/services/http:rancher-istio-kiali:20001/proxy'; +{{- end }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/values.yaml packages/rancher-kiali-server/charts/values.yaml --- packages/rancher-kiali-server/charts-original/values.yaml @@ -136,9 +135,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/v +web_root_override: true + # - # Settings that mimic the Kiali CR which are placed in the ConfigMap - # -@@ -57,10 +60,10 @@ + # 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. +@@ -34,10 +37,10 @@ custom_dashboards: excludes: [''] includes: ['*'] @@ -146,22 +145,20 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/v + repository: rancher/kiali-kiali image_pull_policy: "Always" image_pull_secrets: [] -- image_version: v1.22.0 -+ tag: v1.22.0 +- image_version: v1.23.0 ++ tag: v1.23.0 ingress_enabled: true node_selector: {} override_ingress_yaml: -@@ -182,3 +185,13 @@ - web_fqdn: "" +@@ -66,3 +69,11 @@ + metrics_enabled: true + metrics_port: 9090 web_root: "" - web_schema: "" + +# Common settings used among istio subcharts. +global: -+ + # Specify rancher clusterId of external tracing config + # https://github.com/istio/istio.io/issues/4146#issuecomment-493543032 -+ rancher: ++ cattle: ++ systemDefaultRegistry: "" + clusterId: -+ -+ systemDefaultRegistry: "" diff --git a/packages/rancher-monitoring/package.yaml b/packages/rancher-monitoring/package.yaml index e351d7af4..d41a142b3 100644 --- a/packages/rancher-monitoring/package.yaml +++ b/packages/rancher-monitoring/package.yaml @@ -1,4 +1,4 @@ -url: https://github.com/prometheus-community/helm-charts/releases/download/kube-prometheus-stack-9.4.2/kube-prometheus-stack-9.4.2.tgz +url: https://kubernetes-charts.storage.googleapis.com/prometheus-operator-8.16.1.tgz packageVersion: 00 generateCRDChart: enabled: true diff --git a/packages/rancher-monitoring/rancher-monitoring.patch b/packages/rancher-monitoring/rancher-monitoring.patch index 7f40dcd7a..85215f918 100644 --- a/packages/rancher-monitoring/rancher-monitoring.patch +++ b/packages/rancher-monitoring/rancher-monitoring.patch @@ -1,89 +1,82 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/Chart.yaml packages/rancher-monitoring/charts/Chart.yaml --- packages/rancher-monitoring/charts-original/Chart.yaml +++ packages/rancher-monitoring/charts/Chart.yaml -@@ -5,31 +5,34 @@ - - name: Upstream Project - url: https://github.com/prometheus-operator/kube-prometheus - artifacthub.io/operator: "true" +@@ -1,22 +1,28 @@ + apiVersion: v1 + appVersion: 0.38.1 +-description: Provides easy monitoring definitions for Kubernetes services, and deployment +- and management of Prometheus instances. ++annotations: + catalog.cattle.io/certified: rancher + catalog.cattle.io/namespace: cattle-monitoring-system + catalog.cattle.io/release-name: rancher-monitoring + catalog.cattle.io/ui-component: monitoring + catalog.cattle.io/provides-gvr: monitoring.coreos.com.prometheus/v1 - apiVersion: v1 - appVersion: 0.38.1 --description: kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, -- and Prometheus rules combined with documentation and scripts to provide easy to -- operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus -- Operator. -+description: Collects several related Helm charts, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. - home: https://github.com/prometheus-operator/kube-prometheus ++description: Modifies the upstream Prometheus Operator chart, which provides easy monitoring definitions for Kubernetes services and the deployment and management of Prometheus instances, and enables Prometheus Adapter on a default Prometheus instance. + engine: gotpl + home: https://github.com/coreos/prometheus-operator icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png keywords: -- operator -- prometheus --- kube-prometheus + - operator + - prometheus -+ - kube-prometheus + - monitoring maintainers: -- name: vsliouniaev -- name: bismarck -- email: gianrubio@gmail.com - name: gianrubio --- email: github.gkarthiks@gmail.com -- name: gkarthiks --- email: scott@r6by.com -- name: scottrigby --- email: miroslav.hadzhiev@gmail.com -- name: Xtigyro --name: kube-prometheus-stack +-name: prometheus-operator + - name: vsliouniaev + - name: bismarck + - email: gianrubio@gmail.com + name: gianrubio -+ - email: github.gkarthiks@gmail.com -+ name: gkarthiks -+ - email: scott@r6by.com -+ name: scottrigby -+ - email: miroslav.hadzhiev@gmail.com -+ name: Xtigyro +name: rancher-monitoring sources: --- https://github.com/prometheus-community/helm-charts --- https://github.com/prometheus-operator/kube-prometheus -+ - https://github.com/prometheus-community/helm-charts -+ - https://github.com/prometheus-operator/kube-prometheus - version: 9.4.2 +-- https://github.com/coreos/kube-prometheus +-- https://github.com/coreos/prometheus-operator +-- https://coreos.com/operators/prometheus ++ - https://github.com/coreos/kube-prometheus ++ - https://github.com/coreos/prometheus-operator ++ - https://coreos.com/operators/prometheus + tillerVersion: '>=2.12.0' + version: 8.16.1 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/README.md packages/rancher-monitoring/charts/README.md --- packages/rancher-monitoring/charts-original/README.md +++ packages/rancher-monitoring/charts/README.md -@@ -127,7 +127,43 @@ - helm show values prometheus-community/kube-prometheus-stack - ``` +@@ -2,6 +2,8 @@ --You may also `helm show values` on this chart's [dependencies](#dependencies) for additional options. -+You may also run `helm show values` on this chart's [dependencies](#dependencies) for additional options. + Installs [prometheus-operator](https://github.com/coreos/prometheus-operator) to create/configure/manage Prometheus clusters atop Kubernetes. This chart includes multiple components and is suitable for a variety of use-cases. + ++You must install the Prometheus Operator CRDs first using the `rancher-monitoring-crd` chart before installing this chart. + + The default installation is intended to suit monitoring a kubernetes cluster the chart is deployed onto. It closely matches the kube-prometheus project. + - [prometheus-operator](https://github.com/coreos/prometheus-operator) + - [prometheus](https://prometheus.io/) +@@ -9,6 +11,12 @@ + - [node-exporter](https://github.com/helm/charts/tree/master/stable/prometheus-node-exporter) + - [kube-state-metrics](https://github.com/helm/charts/tree/master/stable/kube-state-metrics) + - [grafana](https://github.com/helm/charts/tree/master/stable/grafana) ++- [prometheus-adapter](https://github.com/helm/charts/tree/master/stable/prometheus-adapter) ++- [rancher-pushprox](https://github.com/rancher/dev-charts/tree/master/packages/rancher-pushprox) charts to monitor internal kubernetes components for k3s, rke, and kubeAdm clusters ++ - kube-scheduler ++ - kube-controller-manager ++ - kube-proxy ++ - kube-etcd (only rke and kubeAdm) + - service monitors to scrape internal kubernetes components + - kube-apiserver + - kube-scheduler +@@ -136,6 +144,30 @@ + + The following tables list the configurable parameters of the prometheus-operator chart and their default values. + +### Rancher Monitoring Configuration -+ -+The following table shows values exposed by Rancher Monitoring's additions to the chart: -+ +| Parameter | Description | Default | +| ----- | ----------- | ------ | -+| `nameOverride` | Provide a name that should be used instead of the chart name when naming all resources deployed by this chart |`"rancher-monitoring"`| -+| `namespaceOverride` | Override the deployment namespace | `"cattle-monitoring-system"` | -+| `global.rbac.userRoles.create` | Create default user ClusterRoles to allow users to interact with Prometheus CRs, ConfigMaps, and Secrets | `true` | -+| `global.rbac.userRoles.aggregateToDefaultRoles` | Aggregate default user ClusterRoles into default k8s ClusterRoles | `true` | +| `prometheus-adapter.enabled` | Whether to install [prometheus-adapter](https://github.com/helm/charts/tree/master/stable/prometheus-adapter) within the cluster | `true` | +| `prometheus-adapter.prometheus.url` | A URL pointing to the Prometheus deployment within your cluster. The default value is set based on the assumption that you plan to deploy the default Prometheus instance from this chart where `.Values.namespaceOverride=cattle-monitoring-system` and `.Values.nameOverride=rancher-monitoring` | `http://rancher-monitoring-prometheus.cattle-monitoring-system.svc` | +| `prometheus-adapter.prometheus.port` | The port on the Prometheus deployment that Prometheus Adapter can make requests to | `9090` | -+| `prometheus.prometheusSpec.ignoreNamespaceSelectors` | Ignore NamespaceSelector settings from the PodMonitor and ServiceMonitor configs. If true, PodMonitors and ServiceMonitors can only discover Pods and Services within the namespace they are deployed into | `false` | -+| `alertmanager.secret.cleanupOnUninstall` | Whether or not to trigger a job to clean up the alertmanager config secret to be deleted on a `helm uninstall`. By default, this is disabled to prevent the loss of alerting configuration on an uninstall. | `false` | -+| `alertmanager.secret.image.pullPolicy` | Image pull policy for job(s) related to alertmanager config secret's lifecycle | `IfNotPresent` | -+| `alertmanager.secret.image.repository` | Repository to use for job(s) related to alertmanager config secret's lifecycle | `rancher/rancher-agent` | -+| `alertmanager.secret.image.tag` | Tag to use for job(s) related to alertmanager config secret's lifecycle | `v2.4.8` | + +The following values are enabled for different distributions via [rancher-pushprox](https://github.com/rancher/dev-charts/tree/master/packages/rancher-pushprox). See the rancher-pushprox `README.md` for more information on what all values can be configured for the PushProxy chart. + @@ -101,111 +94,248 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/REA +| `kubeAdmProxy.enabled` | Create a PushProx installation for monitoring kube-proxy metrics in kubeAdm clusters | `false` | +| `kubeAdmEtcd.enabled` | Create a PushProx installation for monitoring etcd metrics in kubeAdm clusters | `false` | + ++ + ### General + | Parameter | Description | Default | + | ----- | ----------- | ------ | +@@ -173,7 +205,9 @@ + | `defaultRules.rules.time` | Create time default rules | `true` | + | `fullnameOverride` | Provide a name to substitute for the full names of resources |`""`| + | `global.imagePullSecrets` | Reference to one or more secrets to be used when pulling images | `[]` | +-| `global.rbac.create` | Create RBAC resources | `true` | ++| `global.rbac.create` | Create RBAC resources for ServiceAccounts and users | `true` | ++| `global.rbac.userRoles.create` | Create default user ClusterRoles to allow users to interact with Prometheus CRs, ConfigMaps, and Secrets | `true` | ++| `global.rbac.userRoles.aggregateToDefaultRoles` | Aggregate default user ClusterRoles into default k8s ClusterRoles | `true` | + | `global.rbac.pspEnabled` | Create pod security policy resources | `true` | + | `global.rbac.pspAnnotations` | Add annotations to the PSP configurations | `{}` | + | `kubeTargetVersionOverride` | Provide a target gitVersion of K8S, in case .Capabilites.KubeVersion is not available (e.g. `helm template`) |`""`| +@@ -188,30 +222,25 @@ + | `prometheusOperator.admissionWebhooks.failurePolicy` | Failure policy for admission webhooks | `Fail` | + | `prometheusOperator.admissionWebhooks.patch.enabled` | If true, will use a pre and post install hooks to generate a CA and certificate to use for the prometheus operator tls proxy, and patch the created webhooks with the CA. | `true` | + | `prometheusOperator.admissionWebhooks.patch.image.pullPolicy` | Image pull policy for the webhook integration jobs | `IfNotPresent` | +-| `prometheusOperator.admissionWebhooks.patch.image.repository` | Repository to use for the webhook integration jobs | `jettech/kube-webhook-certgen` | ++| `prometheusOperator.admissionWebhooks.patch.image.repository` | Repository to use for the webhook integration jobs | `rancher/jettech-kube-webhook-certgen` | + | `prometheusOperator.admissionWebhooks.patch.image.tag` | Tag to use for the webhook integration jobs | `v1.2.1` | + | `prometheusOperator.admissionWebhooks.patch.resources` | Resource limits for admission webhook | `{}` | + | `prometheusOperator.admissionWebhooks.patch.nodeSelector` | Node selector for running admission hook patch jobs | `nil` | + | `prometheusOperator.admissionWebhooks.patch.podAnnotations` | Annotations for the webhook job pods | `nil` | + | `prometheusOperator.admissionWebhooks.patch.priorityClassName` | Priority class for the webhook integration jobs | `nil` | + | `prometheusOperator.affinity` | Assign custom affinity rules to the prometheus operator https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ | `{}` | +-| `prometheusOperator.cleanupCustomResource` | Attempt to delete CRDs when the release is removed. This option may be useful while testing but is not recommended, as deleting the CRD definition will delete resources and prevent the operator from being able to clean up resources that it manages | `false` | + | `prometheusOperator.configReloaderCpu` | Set the prometheus config reloader side-car CPU limit. If unset, uses the prometheus-operator project default | `nil` | + | `prometheusOperator.configReloaderMemory` | Set the prometheus config reloader side-car memory limit. If unset, uses the prometheus-operator project default | `nil` | +-| `prometheusOperator.configmapReloadImage.repository` | Repository for configmapReload image | `docker.io/jimmidyson/configmap-reload` | ++| `prometheusOperator.configmapReloadImage.repository` | Repository for configmapReload image | `rancher/jimmidyson-configmap-reload` | + | `prometheusOperator.configmapReloadImage.tag` | Tag for configmapReload image | `v0.3.0` | +-| `prometheusOperator.createCustomResource` | Create CRDs. Required if deploying anything besides the operator itself as part of the release. The operator will create / update these on startup. If your Helm version < 2.10 you will have to either create the CRDs first or deploy the operator first, then the rest of the resources. Regardless of value of this, Helm v3+ will install the CRDs if those are not present already. Use `--skip-crds` with `helm install` if you want to skip CRD creation | `true` | + | `prometheusOperator.namespaces` | Namespaces to scope the interaction of the Prometheus Operator and the apiserver (allow list). This is mutually exclusive with `denyNamespaces`. Setting this to an empty object will disable the configuration | `{}` | + | `prometheusOperator.namespaces.releaseNamespace` | Include the release namespace | `false` | + | `prometheusOperator.namespaces.additional` | Include additional namespaces besides the release namespace | `[]` | +-| `prometheusOperator.manageCrds` |If true prometheus operator will create and update its CRDs on startup (for operator `= 5.0.0`) | `7.0.3` | + | `image.pullPolicy` | Image pull policy | `IfNotPresent` | + | `image.pullSecrets` | Image pull secrets | `{}` | +@@ -92,7 +92,7 @@ + | `persistence.finalizers` | PersistentVolumeClaim finalizers | `[ "kubernetes.io/pvc-protection" ]` | + | `persistence.subPath` | Mount a sub dir of the persistent volume | `nil` | + | `initChownData.enabled` | If false, don't reset data ownership at startup | true | +-| `initChownData.image.repository` | init-chown-data container image repository | `busybox` | ++| `initChownData.image.repository` | init-chown-data container image repository | `rancher/busybox` | + | `initChownData.image.tag` | init-chown-data container image tag | `latest` | + | `initChownData.image.pullPolicy` | init-chown-data container image pull policy | `IfNotPresent` | + | `initChownData.resources` | init-chown-data pod resource requests & limits | `{}` | +@@ -120,7 +120,7 @@ + | `podAnnotations` | Pod annotations | `{}` | + | `podLabels` | Pod labels | `{}` | + | `podPortName` | Name of the grafana port on the pod | `grafana` | +-| `sidecar.image.repository` | Sidecar image repository | `kiwigrid/k8s-sidecar` | ++| `sidecar.image.repository` | Sidecar image repository | `rancher/kiwigrid-k8s-sidecar` | + | `sidecar.image.tag` | Sidecar image tag | `0.1.151` | + | `sidecar.imagePullPolicy` | Sidecar image pull policy | `IfNotPresent` | + | `sidecar.resources` | Sidecar resources | `{}` | +@@ -159,13 +159,13 @@ + | `rbac.extraClusterRoleRules` | Additional rules to add to the ClusterRole | [] | + | `command` | Define command to be executed by grafana container at startup | `nil` | + | `testFramework.enabled` | Whether to create test-related resources | `true` | +-| `testFramework.image` | `test-framework` image repository. | `bats/bats` | ++| `testFramework.image` | `test-framework` image repository. | `rancher/bats-bats` | + | `testFramework.tag` | `test-framework` image tag. | `v1.1.0` | + | `testFramework.imagePullPolicy` | `test-framework` image pull policy. | `IfNotPresent` | + | `testFramework.securityContext` | `test-framework` securityContext | `{}` | + | `downloadDashboards.env` | Environment variables to be passed to the `download-dashboards` container | `{}` | + | `downloadDashboards.resources` | Resources of `download-dashboards` container | `{}` | +-| `downloadDashboardsImage.repository` | Curl docker image repo | `curlimages/curl` | ++| `downloadDashboardsImage.repository` | Curl docker image repo | `rancher/curlimages-curl` | + | `downloadDashboardsImage.tag` | Curl docker image tag | `7.68.0` | + | `downloadDashboardsImage.pullPolicy` | Curl docker image pull policy | `IfNotPresent` | + | `namespaceOverride` | Override the deployment namespace | `""` (`Release.Namespace`) | diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/grafana/templates/_pod.tpl packages/rancher-monitoring/charts/charts/grafana/templates/_pod.tpl --- packages/rancher-monitoring/charts-original/charts/grafana/templates/_pod.tpl +++ packages/rancher-monitoring/charts/charts/grafana/templates/_pod.tpl -@@ -1,4 +1,3 @@ -- - {{- define "grafana.pod" -}} - {{- if .Values.schedulerName }} - schedulerName: "{{ .Values.schedulerName }}" -@@ -21,9 +20,9 @@ +@@ -15,7 +15,7 @@ + {{- end }} {{- if ( and .Values.persistence.enabled .Values.initChownData.enabled ) }} - name: init-chown-data - {{- if .Values.initChownData.image.sha }} -- image: "{{ .Values.initChownData.image.repository }}:{{ .Values.initChownData.image.tag }}@sha256:{{ .Values.initChownData.image.sha }}" -+ image: "{{ template "system_default_registry" . }}{{ .Values.initChownData.image.repository }}:{{ .Values.initChownData.image.tag }}@sha256:{{ .Values.initChownData.image.sha }}" - {{- else }} - image: "{{ .Values.initChownData.image.repository }}:{{ .Values.initChownData.image.tag }}" + image: "{{ template "system_default_registry" . }}{{ .Values.initChownData.image.repository }}:{{ .Values.initChownData.image.tag }}" - {{- end }} imagePullPolicy: {{ .Values.initChownData.image.pullPolicy }} securityContext: -@@ -41,9 +40,9 @@ + runAsUser: 0 +@@ -31,7 +31,7 @@ + {{- end }} {{- if .Values.dashboards }} - name: download-dashboards - {{- if .Values.downloadDashboardsImage.sha }} -- image: "{{ .Values.downloadDashboardsImage.repository }}:{{ .Values.downloadDashboardsImage.tag }}@sha256:{{ .Values.downloadDashboardsImage.sha }}" -+ image: "{{ template "system_default_registry" . }}{{ .Values.downloadDashboardsImage.repository }}:{{ .Values.downloadDashboardsImage.tag }}@sha256:{{ .Values.downloadDashboardsImage.sha }}" - {{- else }} - image: "{{ .Values.downloadDashboardsImage.repository }}:{{ .Values.downloadDashboardsImage.tag }}" + image: "{{ template "system_default_registry" . }}{{ .Values.downloadDashboardsImage.repository }}:{{ .Values.downloadDashboardsImage.tag }}" - {{- end }} imagePullPolicy: {{ .Values.downloadDashboardsImage.pullPolicy }} command: ["/bin/sh"] -@@ -73,9 +72,9 @@ + args: [ "-c", "mkdir -p /var/lib/grafana/dashboards/default && /bin/sh /etc/grafana/download_dashboards.sh" ] +@@ -59,7 +59,7 @@ + {{- end }} {{- if .Values.sidecar.datasources.enabled }} - name: {{ template "grafana.name" . }}-sc-datasources - {{- if .Values.sidecar.image.sha }} -- image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}" -+ image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}" - {{- else }} - image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}" + image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}" - {{- end }} imagePullPolicy: {{ .Values.sidecar.imagePullPolicy }} env: -@@ -108,9 +107,9 @@ - {{- if .Values.sidecar.notifiers.enabled }} - - name: {{ template "grafana.name" . }}-sc-notifiers - {{- if .Values.sidecar.image.sha }} -- image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}" -+ image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}" - {{- else }} -- image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}" -+ image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}" - {{- end }} - imagePullPolicy: {{ .Values.sidecar.imagePullPolicy }} - env: -@@ -153,9 +152,9 @@ + - name: METHOD +@@ -96,7 +96,7 @@ + containers: {{- if .Values.sidecar.dashboards.enabled }} - name: {{ template "grafana.name" . }}-sc-dashboard - {{- if .Values.sidecar.image.sha }} -- image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}" -+ image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}" - {{- else }} - image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}" + image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}" - {{- end }} imagePullPolicy: {{ .Values.sidecar.imagePullPolicy }} env: -@@ -187,9 +186,9 @@ + - name: METHOD +@@ -122,7 +122,7 @@ + mountPath: {{ .Values.sidecar.dashboards.folder | quote }} {{- end}} - name: {{ .Chart.Name }} - {{- if .Values.image.sha }} -- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}@sha256:{{ .Values.image.sha }}" -+ image: "{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}@sha256:{{ .Values.image.sha }}" - {{- else }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + image: "{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}" - {{- end }} imagePullPolicy: {{ .Values.image.pullPolicy }} {{- if .Values.command }} + command: diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/grafana/values.yaml packages/rancher-monitoring/charts/charts/grafana/values.yaml --- packages/rancher-monitoring/charts-original/charts/grafana/values.yaml +++ packages/rancher-monitoring/charts/charts/grafana/values.yaml -@@ -49,7 +49,7 @@ +@@ -49,8 +49,8 @@ # schedulerName: "default-scheduler" image: - repository: grafana/grafana +- tag: 7.0.5 + repository: rancher/grafana-grafana - tag: 7.1.5 - sha: "" ++ tag: 7.0.6 pullPolicy: IfNotPresent -@@ -63,7 +63,7 @@ + + ## Optionally specify an array of imagePullSecrets. +@@ -62,7 +62,7 @@ testFramework: enabled: true @@ -214,33 +344,45 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/cha tag: "v1.1.0" imagePullPolicy: IfNotPresent securityContext: {} -@@ -91,7 +91,7 @@ +@@ -90,7 +90,7 @@ # priorityClassName: downloadDashboardsImage: - repository: curlimages/curl + repository: rancher/curlimages-curl tag: 7.70.0 - sha: "" pullPolicy: IfNotPresent -@@ -244,7 +244,7 @@ + +@@ -224,7 +224,7 @@ ## initChownData container image ## image: - repository: busybox + repository: rancher/busybox tag: "1.31.1" - sha: "" pullPolicy: IfNotPresent -@@ -486,7 +486,7 @@ + +@@ -465,7 +465,7 @@ ## Requires at least Grafana 5 to work and can't be used together with parameters dashboardProviders, datasources and dashboards sidecar: image: - repository: kiwigrid/k8s-sidecar + repository: rancher/kiwigrid-k8s-sidecar tag: 0.1.151 - sha: "" imagePullPolicy: IfNotPresent + resources: {} +diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/kube-state-metrics/README.md packages/rancher-monitoring/charts/charts/kube-state-metrics/README.md +--- packages/rancher-monitoring/charts-original/charts/kube-state-metrics/README.md ++++ packages/rancher-monitoring/charts/charts/kube-state-metrics/README.md +@@ -14,7 +14,7 @@ + + | Parameter | Description | Default | + |:---------------------------------------------|:--------------------------------------------------------------------------------------|:-------------------------------------------| +-| `image.repository` | The image repository to pull from | `quay.io/coreos/kube-state-metrics` | ++| `image.repository` | The image repository to pull from | `rancher/coreos-kube-state-metrics` | + | `image.tag` | The image tag to pull from | `v1.9.7` | + | `image.pullPolicy` | Image pull policy | `IfNotPresent` | + | `imagePullSecrets` | List of container registry secrets | `[]` | diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/kube-state-metrics/templates/deployment.yaml packages/rancher-monitoring/charts/charts/kube-state-metrics/templates/deployment.yaml --- packages/rancher-monitoring/charts-original/charts/kube-state-metrics/templates/deployment.yaml +++ packages/rancher-monitoring/charts/charts/kube-state-metrics/templates/deployment.yaml @@ -301,17 +443,18 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/cha tag: v0.6.0 pullPolicy: IfNotPresent -diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/prometheus-node-exporter/OWNERS packages/rancher-monitoring/charts/charts/prometheus-node-exporter/OWNERS ---- packages/rancher-monitoring/charts-original/charts/prometheus-node-exporter/OWNERS -+++ packages/rancher-monitoring/charts/charts/prometheus-node-exporter/OWNERS -@@ -0,0 +1,6 @@ -+approvers: -+- gianrubio -+- vsliouniaev -+reviewers: -+- gianrubio -+- vsliouniaev -\ No newline at end of file +diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/prometheus-node-exporter/README.md packages/rancher-monitoring/charts/charts/prometheus-node-exporter/README.md +--- packages/rancher-monitoring/charts-original/charts/prometheus-node-exporter/README.md ++++ packages/rancher-monitoring/charts/charts/prometheus-node-exporter/README.md +@@ -38,7 +38,7 @@ + + | Parameter | Description | Default | + | ------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------ | +-| `image.repository` | Image repository | `quay.io/prometheus/node-exporter` | ++| `image.repository` | Image repository | `rancher/prom-node-exporter` | + | `image.tag` | Image tag | `v1.0.0` | + | `image.pullPolicy` | Image pull policy | `IfNotPresent` | + | `extraArgs` | Additional container arguments | `[]` | diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/charts/prometheus-node-exporter/templates/daemonset.yaml packages/rancher-monitoring/charts/charts/prometheus-node-exporter/templates/daemonset.yaml --- packages/rancher-monitoring/charts-original/charts/prometheus-node-exporter/templates/daemonset.yaml +++ packages/rancher-monitoring/charts/charts/prometheus-node-exporter/templates/daemonset.yaml @@ -333,7 +476,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/cha image: - repository: quay.io/prometheus/node-exporter + repository: rancher/prom-node-exporter - tag: v1.0.1 + tag: v1.0.0 pullPolicy: IfNotPresent diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/crds/crd-alertmanager.yaml packages/rancher-monitoring/charts/crds/crd-alertmanager.yaml @@ -405,25 +548,25 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/crd diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/requirements.yaml packages/rancher-monitoring/charts/requirements.yaml --- packages/rancher-monitoring/charts-original/requirements.yaml +++ packages/rancher-monitoring/charts/requirements.yaml -@@ -1,16 +1,108 @@ +@@ -1,16 +1,111 @@ dependencies: -- + - name: kube-state-metrics - version: "2.8.*" + version: 2.8.14 repository: https://kubernetes-charts.storage.googleapis.com/ condition: kubeStateMetrics.enabled -- + - name: prometheus-node-exporter -- version: "1.11.*" -+ version: 1.11.2 - repository: https://prometheus-community.github.io/helm-charts +- version: "1.10.*" ++ version: 1.10.0 + repository: https://kubernetes-charts.storage.googleapis.com/ condition: nodeExporter.enabled -- + - name: grafana -- version: "5.6.*" -+ version: 5.6.4 - repository: https://grafana.github.io/helm-charts +- version: "5.3.*" ++ version: 5.3.6 + repository: https://kubernetes-charts.storage.googleapis.com/ condition: grafana.enabled + + - name: prometheus-adapter @@ -561,19 +704,19 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem + {{/* vim: set filetype=mustache: */}} {{/* Expand the name of the chart. This is suffixed with -alertmanager, which means subtract 13 from longest 63 available */}} - {{- define "kube-prometheus-stack.name" -}} + {{- define "prometheus-operator.name" -}} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/alertmanager/alertmanager.yaml packages/rancher-monitoring/charts/templates/alertmanager/alertmanager.yaml --- packages/rancher-monitoring/charts-original/templates/alertmanager/alertmanager.yaml +++ packages/rancher-monitoring/charts/templates/alertmanager/alertmanager.yaml @@ -9,7 +9,7 @@ - {{ include "kube-prometheus-stack.labels" . | indent 4 }} + {{ include "prometheus-operator.labels" . | indent 4 }} spec: {{- if .Values.alertmanager.alertmanagerSpec.image }} - baseImage: {{ .Values.alertmanager.alertmanagerSpec.image.repository }} + baseImage: {{ template "system_default_registry" . }}{{ .Values.alertmanager.alertmanagerSpec.image.repository }} version: {{ .Values.alertmanager.alertmanagerSpec.image.tag }} - {{- if .Values.alertmanager.alertmanagerSpec.image.sha }} - sha: {{ .Values.alertmanager.alertmanagerSpec.image.sha }} + {{- end }} + replicas: {{ .Values.alertmanager.alertmanagerSpec.replicas }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/alertmanager/cleanupSecret.yaml packages/rancher-monitoring/charts/templates/alertmanager/cleanupSecret.yaml --- packages/rancher-monitoring/charts-original/templates/alertmanager/cleanupSecret.yaml +++ packages/rancher-monitoring/charts/templates/alertmanager/cleanupSecret.yaml @@ -582,11 +725,11 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem +apiVersion: batch/v1 +kind: Job +metadata: -+ name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-post-delete -+ namespace: {{ template "kube-prometheus-stack.namespace" . }} ++ name: alertmanager-{{ template "prometheus-operator.fullname" . }}-post-delete ++ namespace: {{ template "prometheus-operator.namespace" . }} + labels: -+{{ include "kube-prometheus-stack.labels" . | indent 4 }} -+ app: {{ template "kube-prometheus-stack.name" . }}-alertmanager ++{{ include "prometheus-operator.labels" . | indent 4 }} ++ app: {{ template "prometheus-operator.name" . }}-alertmanager + annotations: + "helm.sh/hook": post-delete + "helm.sh/hook-delete-policy": hook-succeeded, hook-failed @@ -594,11 +737,11 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem +spec: + template: + metadata: -+ name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-post-delete -+ labels: {{ include "kube-prometheus-stack.labels" . | nindent 8 }} -+ app: {{ template "kube-prometheus-stack.name" . }}-alertmanager ++ name: alertmanager-{{ template "prometheus-operator.fullname" . }}-post-delete ++ labels: {{ include "prometheus-operator.labels" . | nindent 8 }} ++ app: {{ template "prometheus-operator.name" . }}-alertmanager + spec: -+ serviceAccountName: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-post-delete ++ serviceAccountName: alertmanager-{{ template "prometheus-operator.fullname" . }}-post-delete + containers: + - name: delete-secret + image: {{ template "system_default_registry" . }}{{ .Values.alertmanager.secret.image.repository }}:{{ .Values.alertmanager.secret.image.tag }} @@ -607,17 +750,17 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem + - /bin/sh + - -c + - > -+ if kubectl get secret -n {{ template "kube-prometheus-stack.namespace" . }} alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-alertmanager > /dev/null 2>&1; then -+ kubectl delete secret -n {{ template "kube-prometheus-stack.namespace" . }} alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-alertmanager ++ if kubectl get secret -n {{ template "prometheus-operator.namespace" . }} alertmanager-{{ template "prometheus-operator.fullname" . }}-alertmanager > /dev/null 2>&1; then ++ kubectl delete secret -n {{ template "prometheus-operator.namespace" . }} alertmanager-{{ template "prometheus-operator.fullname" . }}-alertmanager + fi; + restartPolicy: OnFailure +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: -+ name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-post-delete ++ name: alertmanager-{{ template "prometheus-operator.fullname" . }}-post-delete + labels: -+ app: {{ template "kube-prometheus-stack.name" . }}-alertmanager ++ app: {{ template "prometheus-operator.name" . }}-alertmanager + annotations: + "helm.sh/hook": post-delete + "helm.sh/hook-delete-policy": hook-succeeded, hook-failed @@ -632,9 +775,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: -+ name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-post-delete ++ name: alertmanager-{{ template "prometheus-operator.fullname" . }}-post-delete + labels: -+ app: {{ template "kube-prometheus-stack.name" . }}-alertmanager ++ app: {{ template "prometheus-operator.name" . }}-alertmanager + annotations: + "helm.sh/hook": post-delete + "helm.sh/hook-delete-policy": hook-succeeded, hook-failed @@ -642,19 +785,19 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole -+ name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-post-delete ++ name: alertmanager-{{ template "prometheus-operator.fullname" . }}-post-delete +subjects: +- kind: ServiceAccount -+ name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-post-delete -+ namespace: {{ template "kube-prometheus-stack.namespace" . }} ++ name: alertmanager-{{ template "prometheus-operator.fullname" . }}-post-delete ++ namespace: {{ template "prometheus-operator.namespace" . }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: -+ name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-post-delete -+ namespace: {{ template "kube-prometheus-stack.namespace" . }} ++ name: alertmanager-{{ template "prometheus-operator.fullname" . }}-post-delete ++ namespace: {{ template "prometheus-operator.namespace" . }} + labels: -+ app: {{ template "kube-prometheus-stack.name" . }}-alertmanager ++ app: {{ template "prometheus-operator.name" . }}-alertmanager + annotations: + "helm.sh/hook": post-delete + "helm.sh/hook-delete-policy": hook-succeeded, hook-failed @@ -664,26 +807,29 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/alertmanager/secret.yaml packages/rancher-monitoring/charts/templates/alertmanager/secret.yaml --- packages/rancher-monitoring/charts-original/templates/alertmanager/secret.yaml +++ packages/rancher-monitoring/charts/templates/alertmanager/secret.yaml -@@ -1,11 +1,16 @@ +@@ -1,11 +1,19 @@ {{- if and (.Values.alertmanager.enabled) (not .Values.alertmanager.alertmanagerSpec.useExistingSecret) }} +{{- if .Release.IsInstall }} -+{{- $secretName := (printf "alertmanager-%s-alertmanager" (include "kube-prometheus-stack.fullname" .)) }} -+{{- if (lookup "v1" "Secret" (include "kube-prometheus-stack.namespace" .) $secretName) }} -+{{- required (printf "Cannot overwrite existing secret %s in namespace %s." $secretName (include "kube-prometheus-stack.namespace" .)) "" }} ++{{- $secretName := (printf "alertmanager-%s-alertmanager" (include "prometheus-operator.fullname" .)) }} ++{{- if (lookup "v1" "Secret" (include "prometheus-operator.namespace" .) $secretName) }} ++{{- required (printf "Cannot overwrite existing secret %s in namespace %s." $secretName (include "prometheus-operator.namespace" .)) "" }} +{{- end }}{{- end }} apiVersion: v1 kind: Secret metadata: -- name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-alertmanager -+ name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-pre-install - namespace: {{ template "kube-prometheus-stack.namespace" . }} +- name: alertmanager-{{ template "prometheus-operator.fullname" . }}-alertmanager ++ name: alertmanager-{{ template "prometheus-operator.fullname" . }}-pre-install + namespace: {{ template "prometheus-operator.namespace" . }} -{{- if .Values.alertmanager.secret.annotations }} annotations: ++ "helm.sh/hook": pre-install ++ "helm.sh/hook-delete-policy": hook-succeeded, hook-failed ++ "helm.sh/hook-weight": "4" +{{- if .Values.alertmanager.secret.annotations }} {{ toYaml .Values.alertmanager.secret.annotations | indent 4 }} {{- end }} labels: -@@ -20,4 +25,93 @@ +@@ -20,4 +28,93 @@ {{- range $key, $val := .Values.alertmanager.templateFiles }} {{ $key }}: {{ $val | b64enc | quote }} {{- end }} @@ -691,11 +837,11 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem +apiVersion: batch/v1 +kind: Job +metadata: -+ name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-pre-install -+ namespace: {{ template "kube-prometheus-stack.namespace" . }} ++ name: alertmanager-{{ template "prometheus-operator.fullname" . }}-pre-install ++ namespace: {{ template "prometheus-operator.namespace" . }} + labels: -+{{ include "kube-prometheus-stack.labels" . | indent 4 }} -+ app: {{ template "kube-prometheus-stack.name" . }}-alertmanager ++{{ include "prometheus-operator.labels" . | indent 4 }} ++ app: {{ template "prometheus-operator.name" . }}-alertmanager + annotations: + "helm.sh/hook": pre-install + "helm.sh/hook-delete-policy": hook-succeeded, hook-failed @@ -703,11 +849,11 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem +spec: + template: + metadata: -+ name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-pre-install -+ labels: {{ include "kube-prometheus-stack.labels" . | nindent 8 }} -+ app: {{ template "kube-prometheus-stack.name" . }}-alertmanager ++ name: alertmanager-{{ template "prometheus-operator.fullname" . }}-pre-install ++ labels: {{ include "prometheus-operator.labels" . | nindent 8 }} ++ app: {{ template "prometheus-operator.name" . }}-alertmanager + spec: -+ serviceAccountName: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-pre-install ++ serviceAccountName: alertmanager-{{ template "prometheus-operator.fullname" . }}-pre-install + containers: + - name: copy-pre-install-secret + image: {{ template "system_default_registry" . }}{{ .Values.alertmanager.secret.image.repository }}:{{ .Values.alertmanager.secret.image.tag }} @@ -716,25 +862,25 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem + - /bin/sh + - -c + - > -+ if kubectl get secret -n {{ template "kube-prometheus-stack.namespace" . }} alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-alertmanager > /dev/null 2>&1; then ++ if kubectl get secret -n {{ template "prometheus-operator.namespace" . }} alertmanager-{{ template "prometheus-operator.fullname" . }}-alertmanager > /dev/null 2>&1; then + echo "Secret already exists" + exit 1 + fi; -+ kubectl patch secret -n {{ template "kube-prometheus-stack.namespace" . }} --dry-run -o yaml -+ alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-pre-install -+ -p '{{ printf "{\"metadata\":{\"name\": \"alertmanager-%s-alertmanager\"}}" (include "kube-prometheus-stack.fullname" .) }}' ++ kubectl patch secret -n {{ template "prometheus-operator.namespace" . }} --dry-run -o yaml ++ alertmanager-{{ template "prometheus-operator.fullname" . }}-pre-install ++ -p '{{ printf "{\"metadata\":{\"name\": \"alertmanager-%s-alertmanager\"}}" (include "prometheus-operator.fullname" .) }}' + | kubectl apply -f -; -+ kubectl annotate secret -n {{ template "kube-prometheus-stack.namespace" . }} -+ alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-alertmanager ++ kubectl annotate secret -n {{ template "prometheus-operator.namespace" . }} ++ alertmanager-{{ template "prometheus-operator.fullname" . }}-alertmanager + helm.sh/hook- helm.sh/hook-delete-policy- helm.sh/hook-weight-; + restartPolicy: OnFailure +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: -+ name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-pre-install ++ name: alertmanager-{{ template "prometheus-operator.fullname" . }}-pre-install + labels: -+ app: {{ template "kube-prometheus-stack.name" . }}-alertmanager ++ app: {{ template "prometheus-operator.name" . }}-alertmanager + annotations: + "helm.sh/hook": pre-install + "helm.sh/hook-delete-policy": hook-succeeded, hook-failed @@ -749,9 +895,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: -+ name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-pre-install ++ name: alertmanager-{{ template "prometheus-operator.fullname" . }}-pre-install + labels: -+ app: {{ template "kube-prometheus-stack.name" . }}-alertmanager ++ app: {{ template "prometheus-operator.name" . }}-alertmanager + annotations: + "helm.sh/hook": pre-install + "helm.sh/hook-delete-policy": hook-succeeded, hook-failed @@ -759,19 +905,19 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole -+ name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-pre-install ++ name: alertmanager-{{ template "prometheus-operator.fullname" . }}-pre-install +subjects: +- kind: ServiceAccount -+ name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-pre-install -+ namespace: {{ template "kube-prometheus-stack.namespace" . }} ++ name: alertmanager-{{ template "prometheus-operator.fullname" . }}-pre-install ++ namespace: {{ template "prometheus-operator.namespace" . }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: -+ name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-pre-install -+ namespace: {{ template "kube-prometheus-stack.namespace" . }} ++ name: alertmanager-{{ template "prometheus-operator.fullname" . }}-pre-install ++ namespace: {{ template "prometheus-operator.namespace" . }} + labels: -+ app: {{ template "kube-prometheus-stack.name" . }}-alertmanager ++ app: {{ template "prometheus-operator.name" . }}-alertmanager + annotations: + "helm.sh/hook": pre-install + "helm.sh/hook-delete-policy": hook-succeeded, hook-failed @@ -783,56 +929,56 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem @@ -3,7 +3,7 @@ kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-coredns -- namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ template "prometheus-operator.fullname" . }}-coredns +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: "kube-system" labels: - app: {{ template "kube-prometheus-stack.name" . }}-coredns - {{ include "kube-prometheus-stack.labels" . | indent 4 }} + app: {{ template "prometheus-operator.name" . }}-coredns + {{ include "prometheus-operator.labels" . | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/exporters/kube-api-server/servicemonitor.yaml packages/rancher-monitoring/charts/templates/exporters/kube-api-server/servicemonitor.yaml --- packages/rancher-monitoring/charts-original/templates/exporters/kube-api-server/servicemonitor.yaml +++ packages/rancher-monitoring/charts/templates/exporters/kube-api-server/servicemonitor.yaml @@ -3,7 +3,7 @@ kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-apiserver -- namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ template "prometheus-operator.fullname" . }}-apiserver +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: default labels: - app: {{ template "kube-prometheus-stack.name" . }}-apiserver - {{ include "kube-prometheus-stack.labels" . | indent 4 }} + app: {{ template "prometheus-operator.name" . }}-apiserver + {{ include "prometheus-operator.labels" . | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/exporters/kube-controller-manager/servicemonitor.yaml packages/rancher-monitoring/charts/templates/exporters/kube-controller-manager/servicemonitor.yaml --- packages/rancher-monitoring/charts-original/templates/exporters/kube-controller-manager/servicemonitor.yaml +++ packages/rancher-monitoring/charts/templates/exporters/kube-controller-manager/servicemonitor.yaml @@ -3,7 +3,7 @@ kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-kube-controller-manager -- namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ template "prometheus-operator.fullname" . }}-kube-controller-manager +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: "kube-system" labels: - app: {{ template "kube-prometheus-stack.name" . }}-kube-controller-manager - {{ include "kube-prometheus-stack.labels" . | indent 4 }} + app: {{ template "prometheus-operator.name" . }}-kube-controller-manager + {{ include "prometheus-operator.labels" . | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/exporters/kubelet/servicemonitor.yaml packages/rancher-monitoring/charts/templates/exporters/kubelet/servicemonitor.yaml --- packages/rancher-monitoring/charts-original/templates/exporters/kubelet/servicemonitor.yaml +++ packages/rancher-monitoring/charts/templates/exporters/kubelet/servicemonitor.yaml @@ -3,7 +3,7 @@ kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-kubelet -- namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ template "prometheus-operator.fullname" . }}-kubelet +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.kubelet.namespace }} labels: - app: {{ template "kube-prometheus-stack.name" . }}-kubelet - {{- include "kube-prometheus-stack.labels" . | indent 4 }} + app: {{ template "prometheus-operator.name" . }}-kubelet + {{- include "prometheus-operator.labels" . | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/configmap-dashboards.yaml packages/rancher-monitoring/charts/templates/grafana/configmap-dashboards.yaml --- packages/rancher-monitoring/charts-original/templates/grafana/configmap-dashboards.yaml +++ packages/rancher-monitoring/charts/templates/grafana/configmap-dashboards.yaml @@ -10,7 +10,7 @@ kind: ConfigMap metadata: - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) $dashboardName | trunc 63 | trimSuffix "-" }} -- namespace: {{ template "kube-prometheus-stack.namespace" $ }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) $dashboardName | trunc 63 | trimSuffix "-" }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} @@ -843,8 +989,8 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem @@ -3,7 +3,7 @@ kind: ConfigMap metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-grafana-datasource -- namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ template "prometheus-operator.fullname" . }}-grafana-datasource +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.datasources.searchNamespace }} {{- if .Values.grafana.sidecar.datasources.annotations }} annotations: @@ -853,7 +999,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem --- packages/rancher-monitoring/charts-original/templates/grafana/dashboards/etcd.yaml +++ packages/rancher-monitoring/charts/templates/grafana/dashboards/etcd.yaml @@ -4,11 +4,12 @@ - https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} -{{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeEtcd.enabled }} @@ -862,9 +1008,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} @@ -1113,4 +1114,5 @@ @@ -881,9 +1027,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards/k8s-node-rsrc-use.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards/k8s-node-rsrc-use.yaml @@ -893,9 +1039,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-node-rsrc-use" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-node-rsrc-use" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards/k8s-resources-cluster.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards/k8s-resources-cluster.yaml @@ -905,9 +1051,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards/k8s-resources-namespace.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards/k8s-resources-namespace.yaml @@ -917,9 +1063,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards/k8s-resources-pod.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards/k8s-resources-pod.yaml @@ -929,9 +1075,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards/k8s-resources-workload.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards/k8s-resources-workload.yaml @@ -941,9 +1087,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml @@ -953,9 +1099,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards/nodes.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards/nodes.yaml @@ -965,9 +1111,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards/persistentvolumesusage.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards/persistentvolumesusage.yaml @@ -977,9 +1123,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards/pods.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards/pods.yaml @@ -989,9 +1135,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "pods" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "pods" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards/statefulset.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards/statefulset.yaml @@ -1001,9 +1147,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/apiserver.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/apiserver.yaml @@ -1013,9 +1159,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "apiserver" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "apiserver" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/cluster-total.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/cluster-total.yaml @@ -1025,16 +1171,16 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "cluster-total" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "cluster-total" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/controller-manager.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/controller-manager.yaml --- packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/controller-manager.yaml +++ packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/controller-manager.yaml @@ -4,11 +4,12 @@ - https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} -{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeControllerManager.enabled }} @@ -1043,9 +1189,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "controller-manager" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "controller-manager" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} @@ -1139,4 +1140,5 @@ @@ -1059,7 +1205,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem --- packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/etcd.yaml +++ packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/etcd.yaml @@ -4,11 +4,12 @@ - https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} -{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeEtcd.enabled }} @@ -1068,9 +1214,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} @@ -1113,4 +1114,5 @@ @@ -1083,18 +1229,15 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/k8s-coredns.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/k8s-coredns.yaml --- packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/k8s-coredns.yaml +++ packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/k8s-coredns.yaml -@@ -4,10 +4,8 @@ +@@ -4,7 +4,7 @@ apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-coredns" | trunc 63 | trimSuffix "-" }} -- annotations: --{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-coredns" | trunc 63 | trimSuffix "-" }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} - {{ $.Values.grafana.sidecar.dashboards.label }}: "1" diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml --- packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml +++ packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml @@ -1102,9 +1245,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml @@ -1114,9 +1257,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/k8s-resources-node.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/k8s-resources-node.yaml @@ -1126,9 +1269,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-node" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-node" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml @@ -1138,9 +1281,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml @@ -1150,9 +1293,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml @@ -1162,9 +1305,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/kubelet.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/kubelet.yaml @@ -1174,9 +1317,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "kubelet" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "kubelet" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/namespace-by-pod.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/namespace-by-pod.yaml @@ -1186,9 +1329,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "namespace-by-pod" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "namespace-by-pod" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/namespace-by-workload.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/namespace-by-workload.yaml @@ -1198,9 +1341,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "namespace-by-workload" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "namespace-by-workload" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml @@ -1210,9 +1353,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "node-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "node-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/node-rsrc-use.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/node-rsrc-use.yaml @@ -1222,9 +1365,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "node-rsrc-use" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "node-rsrc-use" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/nodes.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/nodes.yaml @@ -1234,9 +1377,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml @@ -1246,9 +1389,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/pod-total.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/pod-total.yaml @@ -1258,9 +1401,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "pod-total" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "pod-total" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml @@ -1270,9 +1413,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "prometheus-remote-write" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "prometheus-remote-write" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/prometheus.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/prometheus.yaml @@ -1282,16 +1425,16 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "prometheus" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "prometheus" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/proxy.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/proxy.yaml --- packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/proxy.yaml +++ packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/proxy.yaml @@ -4,11 +4,12 @@ - https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} -{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeProxy.enabled }} @@ -1300,9 +1443,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "proxy" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "proxy" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} @@ -1218,4 +1219,4 @@ @@ -1317,7 +1460,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem --- packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/scheduler.yaml +++ packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/scheduler.yaml @@ -4,11 +4,12 @@ - https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} -{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeScheduler.enabled }} @@ -1326,9 +1469,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "scheduler" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "scheduler" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} @@ -1063,4 +1064,5 @@ @@ -1345,9 +1488,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/dashboards-1.14/workload-total.yaml packages/rancher-monitoring/charts/templates/grafana/dashboards-1.14/workload-total.yaml @@ -1357,9 +1500,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem apiVersion: v1 kind: ConfigMap metadata: -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ .Values.grafana.sidecar.dashboards.searchNamespace }} - name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "workload-total" | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "workload-total" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/grafana/namespaces.yaml packages/rancher-monitoring/charts/templates/grafana/namespaces.yaml @@ -1396,11 +1539,11 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem - baseImage: {{ .Values.prometheus.prometheusSpec.image.repository }} + baseImage: {{ template "system_default_registry" . }}{{ .Values.prometheus.prometheusSpec.image.repository }} version: {{ .Values.prometheus.prometheusSpec.image.tag }} - {{- if .Values.prometheus.prometheusSpec.image.sha }} - sha: {{ .Values.prometheus.prometheusSpec.image.sha }} -@@ -59,6 +59,9 @@ + {{- end }} + {{- if .Values.prometheus.prometheusSpec.externalLabels }} +@@ -56,6 +56,9 @@ {{- else }} - externalUrl: http://{{ template "kube-prometheus-stack.fullname" . }}-prometheus.{{ template "kube-prometheus-stack.namespace" . }}:{{ .Values.prometheus.service.port }} + externalUrl: http://{{ template "prometheus-operator.fullname" . }}-prometheus.{{ template "prometheus-operator.namespace" . }}:{{ .Values.prometheus.service.port }} {{- end }} +{{- if .Values.prometheus.prometheusSpec.ignoreNamespaceSelectors }} + ignoreNamespaceSelectors: {{ .Values.prometheus.prometheusSpec.ignoreNamespaceSelectors }} @@ -1412,7 +1555,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem --- packages/rancher-monitoring/charts-original/templates/prometheus/rules/etcd.yaml +++ packages/rancher-monitoring/charts/templates/prometheus/rules/etcd.yaml @@ -4,7 +4,8 @@ - https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} -{{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeEtcd.enabled .Values.defaultRules.rules.etcd }} @@ -1432,7 +1575,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem --- packages/rancher-monitoring/charts-original/templates/prometheus/rules/kube-scheduler.rules.yaml +++ packages/rancher-monitoring/charts/templates/prometheus/rules/kube-scheduler.rules.yaml @@ -4,7 +4,8 @@ - https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} -{{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeScheduler.enabled .Values.defaultRules.rules.kubeScheduler }} @@ -1473,7 +1616,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem --- packages/rancher-monitoring/charts-original/templates/prometheus/rules-1.14/etcd.yaml +++ packages/rancher-monitoring/charts/templates/prometheus/rules-1.14/etcd.yaml @@ -4,7 +4,8 @@ - https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} -{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeEtcd.enabled .Values.defaultRules.rules.etcd }} @@ -1494,7 +1637,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem --- packages/rancher-monitoring/charts-original/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml +++ packages/rancher-monitoring/charts/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml @@ -4,7 +4,8 @@ - https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} -{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeScheduler.enabled .Values.defaultRules.rules.kubeScheduler }} @@ -1514,7 +1657,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem --- packages/rancher-monitoring/charts-original/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml +++ packages/rancher-monitoring/charts/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml @@ -4,7 +4,8 @@ - https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} -{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeControllerManager.enabled }} @@ -1543,7 +1686,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem --- packages/rancher-monitoring/charts-original/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml +++ packages/rancher-monitoring/charts/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml @@ -4,7 +4,8 @@ - https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} -{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeScheduler.enabled .Values.defaultRules.rules.kubeScheduler }} @@ -1571,68 +1714,58 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml packages/rancher-monitoring/charts/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml --- packages/rancher-monitoring/charts-original/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml +++ packages/rancher-monitoring/charts/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml -@@ -32,9 +32,9 @@ +@@ -31,7 +31,7 @@ + {{- end }} containers: - name: create - {{- if .Values.prometheusOperator.admissionWebhooks.patch.image.sha }} -- image: {{ .Values.prometheusOperator.admissionWebhooks.patch.image.repository }}:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.tag }}@sha256:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.sha }} -+ image: {{ template "system_default_registry" . }}{{ .Values.prometheusOperator.admissionWebhooks.patch.image.repository }}:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.tag }}@sha256:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.sha }} - {{- else }} - image: {{ .Values.prometheusOperator.admissionWebhooks.patch.image.repository }}:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.tag }} + image: {{ template "system_default_registry" . }}{{ .Values.prometheusOperator.admissionWebhooks.patch.image.repository }}:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.tag }} - {{- end }} imagePullPolicy: {{ .Values.prometheusOperator.admissionWebhooks.patch.image.pullPolicy }} args: + - create diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml packages/rancher-monitoring/charts/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml --- packages/rancher-monitoring/charts-original/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml +++ packages/rancher-monitoring/charts/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml -@@ -32,9 +32,9 @@ +@@ -31,7 +31,7 @@ + {{- end }} containers: - name: patch - {{- if .Values.prometheusOperator.admissionWebhooks.patch.image.sha }} -- image: {{ .Values.prometheusOperator.admissionWebhooks.patch.image.repository }}:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.tag }}@sha256:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.sha }} -+ image: {{ template "system_default_registry" . }}{{ .Values.prometheusOperator.admissionWebhooks.patch.image.repository }}:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.tag }}@sha256:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.sha }} - {{- else }} - image: {{ .Values.prometheusOperator.admissionWebhooks.patch.image.repository }}:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.tag }} + image: {{ template "system_default_registry" . }}{{ .Values.prometheusOperator.admissionWebhooks.patch.image.repository }}:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.tag }} - {{- end }} imagePullPolicy: {{ .Values.prometheusOperator.admissionWebhooks.patch.image.pullPolicy }} args: + - patch diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/prometheus-operator/cleanup-crds.yaml packages/rancher-monitoring/charts/templates/prometheus-operator/cleanup-crds.yaml --- packages/rancher-monitoring/charts-original/templates/prometheus-operator/cleanup-crds.yaml +++ packages/rancher-monitoring/charts/templates/prometheus-operator/cleanup-crds.yaml -@@ -1,49 +0,0 @@ +@@ -1,45 +0,0 @@ -{{- if and .Values.prometheusOperator.enabled .Values.prometheusOperator.cleanupCustomResource }} -apiVersion: batch/v1 -kind: Job -metadata: -- name: {{ template "kube-prometheus-stack.fullname" . }}-operator-cleanup -- namespace: {{ template "kube-prometheus-stack.namespace" . }} +- name: {{ template "prometheus-operator.fullname" . }}-operator-cleanup +- namespace: {{ template "prometheus-operator.namespace" . }} - annotations: - "helm.sh/hook": pre-delete - "helm.sh/hook-weight": "3" - "helm.sh/hook-delete-policy": hook-succeeded - labels: -- app: {{ template "kube-prometheus-stack.name" . }}-operator --{{ include "kube-prometheus-stack.labels" . | indent 4 }} +- app: {{ template "prometheus-operator.name" . }}-operator +-{{ include "prometheus-operator.labels" . | indent 4 }} -spec: - template: - metadata: -- name: {{ template "kube-prometheus-stack.fullname" . }}-operator-cleanup +- name: {{ template "prometheus-operator.fullname" . }}-operator-cleanup - labels: -- app: {{ template "kube-prometheus-stack.name" . }}-operator --{{ include "kube-prometheus-stack.labels" . | indent 8 }} +- app: {{ template "prometheus-operator.name" . }}-operator +-{{ include "prometheus-operator.labels" . | indent 8 }} - spec: - {{- if .Values.global.rbac.create }} -- serviceAccountName: {{ template "kube-prometheus-stack.operator.serviceAccountName" . }} +- serviceAccountName: {{ template "prometheus-operator.operator.serviceAccountName" . }} - {{- end }} - containers: - - name: kubectl -- {{- if .Values.prometheusOperator.hyperkubeImage.sha }} -- image: {{ .Values.prometheusOperator.hyperkubeImage.repository }}:{{ .Values.prometheusOperator.hyperkubeImage.tag }}@sha256:{{ .Values.prometheusOperator.hyperkubeImage.sha }} -- {{- else }} - image: "{{ .Values.prometheusOperator.hyperkubeImage.repository }}:{{ .Values.prometheusOperator.hyperkubeImage.tag }}" -- {{- end }} - imagePullPolicy: "{{ .Values.prometheusOperator.hyperkubeImage.pullPolicy }}" - command: - - /bin/sh @@ -1655,8 +1788,8 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem --- packages/rancher-monitoring/charts-original/templates/prometheus-operator/clusterrole.yaml +++ packages/rancher-monitoring/charts/templates/prometheus-operator/clusterrole.yaml @@ -7,7 +7,7 @@ - app: {{ template "kube-prometheus-stack.name" . }}-operator - {{ include "kube-prometheus-stack.labels" . | indent 4 }} + app: {{ template "prometheus-operator.name" . }}-operator + {{ include "prometheus-operator.labels" . | indent 4 }} rules: -{{- if or .Values.prometheusOperator.manageCrds .Values.prometheusOperator.cleanupCustomResource }} +{{- if .Values.prometheusOperator.manageCrds }} @@ -1676,49 +1809,35 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/prometheus-operator/deployment.yaml packages/rancher-monitoring/charts/templates/prometheus-operator/deployment.yaml --- packages/rancher-monitoring/charts-original/templates/prometheus-operator/deployment.yaml +++ packages/rancher-monitoring/charts/templates/prometheus-operator/deployment.yaml -@@ -33,9 +33,9 @@ +@@ -32,7 +32,7 @@ + {{- end }} containers: - - name: {{ template "kube-prometheus-stack.name" . }} - {{- if .Values.prometheusOperator.image.sha }} -- image: "{{ .Values.prometheusOperator.image.repository }}:{{ .Values.prometheusOperator.image.tag }}@sha256:{{ .Values.prometheusOperator.image.sha }}" -+ image: "{{ template "system_default_registry" . }}{{ .Values.prometheusOperator.image.repository }}:{{ .Values.prometheusOperator.image.tag }}@sha256:{{ .Values.prometheusOperator.image.sha }}" - {{- else }} + - name: {{ template "prometheus-operator.name" . }} - image: "{{ .Values.prometheusOperator.image.repository }}:{{ .Values.prometheusOperator.image.tag }}" + image: "{{ template "system_default_registry" . }}{{ .Values.prometheusOperator.image.repository }}:{{ .Values.prometheusOperator.image.tag }}" - {{- end }} imagePullPolicy: "{{ .Values.prometheusOperator.image.pullPolicy }}" args: -@@ -64,14 +64,14 @@ + {{- if semverCompare "< v0.39.0" .Values.prometheusOperator.image.tag }} +@@ -59,8 +59,8 @@ + {{- end }} - --logtostderr=true - --localhost=127.0.0.1 - {{- if .Values.prometheusOperator.prometheusConfigReloaderImage.sha }} -- - --prometheus-config-reloader={{ .Values.prometheusOperator.prometheusConfigReloaderImage.repository }}:{{ .Values.prometheusOperator.prometheusConfigReloaderImage.tag }}@sha256:{{ .Values.prometheusOperator.prometheusConfigReloaderImage.sha }} -+ - --prometheus-config-reloader={{ template "system_default_registry" . }}{{ .Values.prometheusOperator.prometheusConfigReloaderImage.repository }}:{{ .Values.prometheusOperator.prometheusConfigReloaderImage.tag }}@sha256:{{ .Values.prometheusOperator.prometheusConfigReloaderImage.sha }} - {{- else }} - - --prometheus-config-reloader={{ .Values.prometheusOperator.prometheusConfigReloaderImage.repository }}:{{ .Values.prometheusOperator.prometheusConfigReloaderImage.tag }} -+ - --prometheus-config-reloader={{ template "system_default_registry" . }}{{ .Values.prometheusOperator.prometheusConfigReloaderImage.repository }}:{{ .Values.prometheusOperator.prometheusConfigReloaderImage.tag }} - {{- end }} - {{- if .Values.prometheusOperator.configmapReloadImage.sha }} -- - --config-reloader-image={{ .Values.prometheusOperator.configmapReloadImage.repository }}:{{ .Values.prometheusOperator.configmapReloadImage.tag }}@sha256:{{ .Values.prometheusOperator.configmapReloadImage.sha }} -+ - --config-reloader-image={{ template "system_default_registry" . }}{{ .Values.prometheusOperator.configmapReloadImage.repository }}:{{ .Values.prometheusOperator.configmapReloadImage.tag }}@sha256:{{ .Values.prometheusOperator.configmapReloadImage.sha }} - {{- else }} - - --config-reloader-image={{ .Values.prometheusOperator.configmapReloadImage.repository }}:{{ .Values.prometheusOperator.configmapReloadImage.tag }} ++ - --prometheus-config-reloader={{ template "system_default_registry" . }}{{ .Values.prometheusOperator.prometheusConfigReloaderImage.repository }}:{{ .Values.prometheusOperator.prometheusConfigReloaderImage.tag }} + - --config-reloader-image={{ template "system_default_registry" . }}{{ .Values.prometheusOperator.configmapReloadImage.repository }}:{{ .Values.prometheusOperator.configmapReloadImage.tag }} - {{- end }} - --config-reloader-cpu={{ .Values.prometheusOperator.configReloaderCpu }} - --config-reloader-memory={{ .Values.prometheusOperator.configReloaderMemory }} -@@ -89,9 +89,9 @@ + ports: +@@ -73,7 +73,7 @@ + readOnlyRootFilesystem: true {{- if .Values.prometheusOperator.tlsProxy.enabled }} - name: tls-proxy - {{- if .Values.prometheusOperator.tlsProxy.image.sha }} -- image: {{ .Values.prometheusOperator.tlsProxy.image.repository }}:{{ .Values.prometheusOperator.tlsProxy.image.tag }}@sha256:{{ .Values.prometheusOperator.tlsProxy.image.sha }} -+ image: {{ template "system_default_registry" . }}{{ .Values.prometheusOperator.tlsProxy.image.repository }}:{{ .Values.prometheusOperator.tlsProxy.image.tag }}@sha256:{{ .Values.prometheusOperator.tlsProxy.image.sha }} - {{- else }} - image: {{ .Values.prometheusOperator.tlsProxy.image.repository }}:{{ .Values.prometheusOperator.tlsProxy.image.tag }} + image: {{ template "system_default_registry" . }}{{ .Values.prometheusOperator.tlsProxy.image.repository }}:{{ .Values.prometheusOperator.tlsProxy.image.tag }} - {{- end }} imagePullPolicy: {{ .Values.prometheusOperator.tlsProxy.image.pullPolicy }} args: + - server diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/rancher-monitoring/clusterrole.yaml packages/rancher-monitoring/charts/templates/rancher-monitoring/clusterrole.yaml --- packages/rancher-monitoring/charts-original/templates/rancher-monitoring/clusterrole.yaml +++ packages/rancher-monitoring/charts/templates/rancher-monitoring/clusterrole.yaml @@ -1729,7 +1848,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem +kind: ClusterRole +metadata: + name: monitoring-admin -+ labels: {{ include "kube-prometheus-stack.labels" . | nindent 4 }} ++ labels: {{ include "prometheus-operator.labels" . | nindent 4 }} + {{- if .Values.global.rbac.userRoles.aggregateToDefaultRoles }} + rbac.authorization.k8s.io/aggregate-to-admin: "true" + {{- end }} @@ -1768,7 +1887,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem +kind: ClusterRole +metadata: + name: monitoring-edit -+ labels: {{ include "kube-prometheus-stack.labels" . | nindent 4 }} ++ labels: {{ include "prometheus-operator.labels" . | nindent 4 }} + {{- if .Values.global.rbac.userRoles.aggregateToDefaultRoles }} + rbac.authorization.k8s.io/aggregate-to-edit: "true" + {{- end }} @@ -1808,7 +1927,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem +kind: ClusterRole +metadata: + name: monitoring-view -+ labels: {{ include "kube-prometheus-stack.labels" . | nindent 4 }} ++ labels: {{ include "prometheus-operator.labels" . | nindent 4 }} + {{- if .Values.global.rbac.userRoles.aggregateToDefaultRoles }} + rbac.authorization.k8s.io/aggregate-to-view: "true" + {{- end }} @@ -1844,7 +1963,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem +kind: ClusterRole +metadata: + name: grafana-config-edit -+ labels: {{ include "kube-prometheus-stack.labels" . | nindent 4 }} ++ labels: {{ include "prometheus-operator.labels" . | nindent 4 }} +rules: +- apiGroups: + - "" @@ -1858,7 +1977,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem +kind: ClusterRole +metadata: + name: grafana-config-view -+ labels: {{ include "kube-prometheus-stack.labels" . | nindent 4 }} ++ labels: {{ include "prometheus-operator.labels" . | nindent 4 }} +rules: +- apiGroups: + - "" @@ -2135,7 +2254,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val + +# Prometheus Operator Configuration + - ## Provide a name in place of kube-prometheus-stack for `app:` labels + ## Provide a name in place of prometheus-operator for `app:` labels +## NOTE: If you change this value, you must update the prometheus-adapter.prometheus.url ## -nameOverride: "" @@ -2325,10 +2444,10 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val image: - repository: quay.io/prometheus/alertmanager + repository: rancher/prom-alertmanager - tag: v0.21.0 - sha: "" + tag: v0.20.0 -@@ -410,9 +763,13 @@ + ## If true then the user will be responsible to provide a secret with alertmanager configuration +@@ -409,9 +762,13 @@ ## Define resources requests and limits for single Pods. ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ ## @@ -2345,7 +2464,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val ## Pod anti-affinity can prevent the scheduler from placing Prometheus replicas on the same node. ## The default value "soft" means that the scheduler should *prefer* to not schedule two replica pods onto the same node but no guarantee is provided. -@@ -487,6 +844,9 @@ +@@ -486,6 +843,9 @@ enabled: true namespaceOverride: "" @@ -2355,7 +2474,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val ## Deploy default dashboards. ## defaultDashboardsEnabled: true -@@ -530,6 +890,7 @@ +@@ -529,6 +889,7 @@ dashboards: enabled: true label: grafana_dashboard @@ -2363,7 +2482,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val ## Annotations for Grafana dashboard configmaps ## -@@ -548,6 +909,7 @@ +@@ -547,6 +908,7 @@ ## ref: https://git.io/fjaBS createPrometheusReplicasDatasources: false label: grafana_datasource @@ -2371,7 +2490,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val extraConfigmapMounts: [] # - name: certs-configmap -@@ -575,6 +937,19 @@ +@@ -574,6 +936,19 @@ ## service: portName: service @@ -2391,7 +2510,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val ## If true, create a serviceMonitor for grafana ## -@@ -600,6 +975,14 @@ +@@ -599,6 +974,14 @@ # targetLabel: nodename # replacement: $1 # action: replace @@ -2406,7 +2525,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val ## Component scraping the kube api server ## -@@ -756,7 +1139,7 @@ +@@ -755,7 +1138,7 @@ ## Component scraping the kube controller manager ## kubeControllerManager: @@ -2415,7 +2534,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val ## If your kube controller manager is not deployed as a pod, specify IPs it can be found on ## -@@ -889,7 +1272,7 @@ +@@ -888,7 +1271,7 @@ ## Component scraping etcd ## kubeEtcd: @@ -2424,7 +2543,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val ## If your etcd is not deployed as a pod, specify IPs it can be found on ## -@@ -949,7 +1332,7 @@ +@@ -948,7 +1331,7 @@ ## Component scraping kube scheduler ## kubeScheduler: @@ -2433,7 +2552,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val ## If your kube scheduler is not deployed as a pod, specify IPs it can be found on ## -@@ -1002,7 +1385,7 @@ +@@ -1001,7 +1384,7 @@ ## Component scraping kube proxy ## kubeProxy: @@ -2442,7 +2561,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val ## If your kube proxy is not deployed as a pod, specify IPs it can be found on ## -@@ -1076,6 +1459,13 @@ +@@ -1075,6 +1458,13 @@ create: true podSecurityPolicy: enabled: true @@ -2456,7 +2575,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val ## Deploy node exporter as a daemonset to all nodes ## -@@ -1125,6 +1515,16 @@ +@@ -1124,6 +1514,16 @@ extraArgs: - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+)($|/) - --collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$ @@ -2473,25 +2592,25 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val ## Manages Prometheus and Alertmanager components ## -@@ -1138,7 +1538,7 @@ +@@ -1137,7 +1537,7 @@ tlsProxy: enabled: true image: - repository: squareup/ghostunnel + repository: rancher/squareup-ghostunnel tag: v1.5.2 - sha: "" pullPolicy: IfNotPresent -@@ -1156,7 +1556,7 @@ + resources: {} +@@ -1154,7 +1554,7 @@ patch: enabled: true image: - repository: jettech/kube-webhook-certgen + repository: rancher/jettech-kube-webhook-certgen tag: v1.2.1 - sha: "" pullPolicy: IfNotPresent -@@ -1285,13 +1685,13 @@ + resources: {} +@@ -1280,13 +1680,13 @@ ## Resource limits & requests ## @@ -2512,23 +2631,21 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val # Required for use in managed kubernetes clusters (such as AWS EKS) with custom CNI (such as calico), # because control-plane managed by AWS cannot communicate with pods' IP CIDR and admission webhooks are not working -@@ -1335,7 +1735,7 @@ +@@ -1330,20 +1730,20 @@ ## Prometheus-operator image ## image: - repository: quay.io/coreos/prometheus-operator + repository: rancher/coreos-prometheus-operator tag: v0.38.1 - sha: "" pullPolicy: IfNotPresent -@@ -1343,14 +1743,14 @@ + ## Configmap-reload image to use for reloading configmaps ## configmapReloadImage: - repository: docker.io/jimmidyson/configmap-reload + repository: rancher/jimmidyson-configmap-reload tag: v0.3.0 - sha: "" ## Prometheus-config-reloader image to use for config and rule reloading ## @@ -2536,33 +2653,32 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val - repository: quay.io/coreos/prometheus-config-reloader + repository: rancher/coreos-prometheus-config-reloader tag: v0.38.1 - sha: "" -@@ -1366,14 +1766,6 @@ + ## Set the prometheus config reloader side-car CPU limit +@@ -1354,13 +1754,6 @@ ## - secretFieldSelector: "" + configReloaderMemory: 25Mi - ## Hyperkube image to use when cleaning up - ## - hyperkubeImage: - repository: k8s.gcr.io/hyperkube - tag: v1.16.12 -- sha: "" - pullPolicy: IfNotPresent - ## Deploy a Prometheus instance ## prometheus: -@@ -1614,7 +2006,7 @@ +@@ -1577,7 +1970,7 @@ ## Image of Prometheus. ## image: - repository: quay.io/prometheus/prometheus + repository: rancher/prom-prometheus - tag: v2.18.2 - sha: "" + tag: v2.18.1 -@@ -1666,6 +2058,11 @@ + ## Tolerations for use with node taints +@@ -1628,6 +2021,11 @@ ## externalUrl: "" @@ -2574,7 +2690,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val ## Define which Nodes the Pods are scheduled on. ## ref: https://kubernetes.io/docs/user-guide/node-selection/ ## -@@ -1698,7 +2095,7 @@ +@@ -1660,7 +2058,7 @@ ## prometheus resource to be created with selectors based on values in the helm deployment, ## which will also match the PrometheusRule resources created ## @@ -2583,7 +2699,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val ## PrometheusRules to be selected for target discovery. ## If {}, select all ServiceMonitors -@@ -1723,7 +2120,7 @@ +@@ -1685,7 +2083,7 @@ ## prometheus resource to be created with selectors based on values in the helm deployment, ## which will also match the servicemonitors created ## @@ -2592,7 +2708,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val ## ServiceMonitors to be selected for target discovery. ## If {}, select all ServiceMonitors -@@ -1743,7 +2140,7 @@ +@@ -1705,7 +2103,7 @@ ## prometheus resource to be created with selectors based on values in the helm deployment, ## which will also match the podmonitors created ## @@ -2601,7 +2717,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val ## PodMonitors to be selected for target discovery. ## If {}, select all PodMonitors -@@ -1840,9 +2237,13 @@ +@@ -1802,9 +2200,13 @@ ## Resource limits & requests ## @@ -2617,4 +2733,4 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val + cpu: 750m ## Prometheus StorageSpec for persistent data - ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/storage.md + ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/user-guides/storage.md diff --git a/packages/rancher-operator-crd/package.yaml b/packages/rancher-operator-crd/package.yaml index 595a0da3a..a66caaa8b 100644 --- a/packages/rancher-operator-crd/package.yaml +++ b/packages/rancher-operator-crd/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/rancher-operator/releases/download/v0.1.0-alpha7/rancher-operator-crd-0.1.0-alpha7.tgz +url: https://github.com/rancher/rancher-operator/releases/download/v0.1.0-alpha6/rancher-operator-crd-0.1.0-alpha6.tgz packageVersion: 00 diff --git a/packages/rancher-operator/package.yaml b/packages/rancher-operator/package.yaml index 2bc3bcac8..f03147f1d 100644 --- a/packages/rancher-operator/package.yaml +++ b/packages/rancher-operator/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/rancher-operator/releases/download/v0.1.0-alpha7/rancher-operator-0.1.0-alpha7.tgz +url: https://github.com/rancher/rancher-operator/releases/download/v0.1.0-alpha6/rancher-operator-0.1.0-alpha6.tgz packageVersion: 00 diff --git a/packages/rio/charts/Chart.yaml b/packages/rio/charts/Chart.yaml index 53724a654..fc517e85c 100644 --- a/packages/rio/charts/Chart.yaml +++ b/packages/rio/charts/Chart.yaml @@ -9,5 +9,4 @@ annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/namespace: rio-system catalog.cattle.io/release-name: rio - catalog.cattle.io/experimental: true - catalog.cattle.io/requires-gvr: networking.istio.io.virtualservice/v1beta1 \ No newline at end of file + catalog.cattle.io/experimental: true \ No newline at end of file diff --git a/packages/rio/charts/README.md b/packages/rio/charts/README.md index 376e91a7b..9d742bd15 100644 --- a/packages/rio/charts/README.md +++ b/packages/rio/charts/README.md @@ -12,7 +12,12 @@ See values.yaml for installation options. ## Prerequisites -Rio requires Kubernetes 1.15 or newer cluster. +1. Rio requires Kubernetes 1.15 or newer cluster. +1. Helm installed in the cluster. If Tiller and its service account are not already installed run the following: + ```bash + $ kubectl apply -f helm/tiller-serviceaccount.yaml + $ helm init --service-account tiller + ``` ## Installation diff --git a/packages/rio/charts/helm/tiller-serviceaccount.yaml b/packages/rio/charts/helm/tiller-serviceaccount.yaml new file mode 100644 index 000000000..325d36a9b --- /dev/null +++ b/packages/rio/charts/helm/tiller-serviceaccount.yaml @@ -0,0 +1,20 @@ +# This grants Helm/tiller the cluster admin role. +apiVersion: v1 +kind: ServiceAccount +metadata: + name: tiller + namespace: kube-system +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: tiller-cluster-rule +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cluster-admin +subjects: +- kind: ServiceAccount + name: tiller + namespace: kube-system +