From 44b0ec39047ddb08af9729169173b181b67d2d3b Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Wed, 25 Aug 2021 10:27:47 -0700 Subject: [PATCH] (dev-v2.6-archive) Bump eks and gke operators to final releases (partially cherry picked from commit 24f33ba4ae59e0e3c2d0fc8bba3fa2f9b734555a) --- .../rancher-eks-operator-crd/package.yaml | 2 +- packages/rancher-eks-operator/package.yaml | 2 +- .../rancher-gke-operator-crd/package.yaml | 2 +- packages/rancher-gke-operator/package.yaml | 2 +- packages/rancher-istio/charts/Chart.yaml | 4 +- packages/rancher-istio/charts/app-readme.md | 5 + packages/rancher-istio/charts/values.yaml | 12 +-- packages/rancher-istio/package.yaml | 2 +- .../dependencies/rkeWindows/dependency.yaml | 2 - .../dependency.yaml | 0 .../generated-changes/patch/Chart.yaml.patch | 94 ++++++++++++++----- .../generated-changes/patch/values.yaml.patch | 90 ++++++++---------- 12 files changed, 126 insertions(+), 91 deletions(-) delete mode 100644 packages/rancher-monitoring/generated-changes/dependencies/rkeWindows/dependency.yaml rename packages/rancher-monitoring/generated-changes/dependencies/{rke2Windows => windowsExporter}/dependency.yaml (100%) diff --git a/packages/rancher-eks-operator-crd/package.yaml b/packages/rancher-eks-operator-crd/package.yaml index 72c57d0b0..8016a5b87 100644 --- a/packages/rancher-eks-operator-crd/package.yaml +++ b/packages/rancher-eks-operator-crd/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/eks-operator/releases/download/v1.1.1-rc8/rancher-eks-operator-crd-1.1.1-rc8.tgz +url: https://github.com/rancher/eks-operator/releases/download/v1.1.1/rancher-eks-operator-crd-1.1.1.tgz version: 100.0.0 diff --git a/packages/rancher-eks-operator/package.yaml b/packages/rancher-eks-operator/package.yaml index 807237742..a745f2586 100644 --- a/packages/rancher-eks-operator/package.yaml +++ b/packages/rancher-eks-operator/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/eks-operator/releases/download/v1.1.1-rc8/rancher-eks-operator-1.1.1-rc8.tgz +url: https://github.com/rancher/eks-operator/releases/download/v1.1.1/rancher-eks-operator-1.1.1.tgz version: 100.0.0 diff --git a/packages/rancher-gke-operator-crd/package.yaml b/packages/rancher-gke-operator-crd/package.yaml index a820b31fa..cb1e803ba 100644 --- a/packages/rancher-gke-operator-crd/package.yaml +++ b/packages/rancher-gke-operator-crd/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/gke-operator/releases/download/v1.1.1-rc10/rancher-gke-operator-crd-1.1.1-rc10.tgz +url: https://github.com/rancher/gke-operator/releases/download/v1.1.1/rancher-gke-operator-crd-1.1.1.tgz version: 100.0.0 diff --git a/packages/rancher-gke-operator/package.yaml b/packages/rancher-gke-operator/package.yaml index 24bcfbade..9f5ba2774 100644 --- a/packages/rancher-gke-operator/package.yaml +++ b/packages/rancher-gke-operator/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/gke-operator/releases/download/v1.1.1-rc10/rancher-gke-operator-1.1.1-rc10.tgz +url: https://github.com/rancher/gke-operator/releases/download/v1.1.1/rancher-gke-operator-1.1.1.tgz version: 100.0.0 diff --git a/packages/rancher-istio/charts/Chart.yaml b/packages/rancher-istio/charts/Chart.yaml index 6fde1aa74..82a387e1b 100644 --- a/packages/rancher-istio/charts/Chart.yaml +++ b/packages/rancher-istio/charts/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: 1.10.2 +appVersion: 1.10.4 description: A basic Istio setup that installs with the istioctl. Refer to https://istio.io/latest/ for details. name: rancher-istio -version: 1.10.2 +version: 1.10.4 icon: https://charts.rancher.io/assets/logos/istio.svg keywords: - networking diff --git a/packages/rancher-istio/charts/app-readme.md b/packages/rancher-istio/charts/app-readme.md index 0e42df083..3e42df443 100644 --- a/packages/rancher-istio/charts/app-readme.md +++ b/packages/rancher-istio/charts/app-readme.md @@ -4,6 +4,11 @@ Our [Istio](https://istio.io/) installer wraps the istioctl binary commands in a * **[Kiali](https://kiali.io/)**: Used for graphing traffic flow throughout the mesh * **[Jaeger](https://www.jaegertracing.io/)**: A quick start, all-in-one installation used for tracing distributed systemm. This is not production qualified, please refer to jaeger documentation to determine which installation you may need instead. +### Known Issues + +**Airgapped Environments** +If you are using this chart in an airgapped environment, you will not be able to upgrade. This is because the `istioctl` upgrade command reaches out to an external repo and it is not configurable. We are tracking the fix for this issue [here](https://github.com/rancher/rancher/issues/33402) + ### Dependencies **Rancher Monitoring or other Prometheus installation** diff --git a/packages/rancher-istio/charts/values.yaml b/packages/rancher-istio/charts/values.yaml index 93bdc8af4..0db701795 100644 --- a/packages/rancher-istio/charts/values.yaml +++ b/packages/rancher-istio/charts/values.yaml @@ -1,11 +1,11 @@ overlayFile: "" -tag: 1.10.2 +tag: 1.10.4 ##Setting forceInstall: true will remove the check for istio version < 1.6.x and will not analyze your install cluster prior to install forceInstall: false installer: repository: rancher/istio-installer - tag: 1.10.2-rancher1 + tag: 1.10.4-rancher1 ##Native support for dns added in 1.8 dns: @@ -17,7 +17,7 @@ base: cni: enabled: false repository: rancher/mirrored-istio-install-cni - tag: 1.10.2 + tag: 1.10.4 logLevel: info excludeNamespaces: - istio-system @@ -37,7 +37,7 @@ istiodRemote: pilot: enabled: true repository: rancher/mirrored-istio-pilot - tag: 1.10.2 + tag: 1.10.4 telemetry: enabled: true @@ -49,10 +49,10 @@ global: systemDefaultRegistry: "" proxy: repository: rancher/mirrored-istio-proxyv2 - tag: 1.10.2 + tag: 1.10.4 proxy_init: repository: rancher/mirrored-istio-proxyv2 - tag: 1.10.2 + tag: 1.10.4 defaultPodDisruptionBudget: enabled: true rbac: diff --git a/packages/rancher-istio/package.yaml b/packages/rancher-istio/package.yaml index 262ba6c5f..d839a451a 100644 --- a/packages/rancher-istio/package.yaml +++ b/packages/rancher-istio/package.yaml @@ -1,2 +1,2 @@ url: local -version: 100.0.0+up1.10.2 +version: 100.0.0+up1.10.4 diff --git a/packages/rancher-monitoring/generated-changes/dependencies/rkeWindows/dependency.yaml b/packages/rancher-monitoring/generated-changes/dependencies/rkeWindows/dependency.yaml deleted file mode 100644 index 663a96cc7..000000000 --- a/packages/rancher-monitoring/generated-changes/dependencies/rkeWindows/dependency.yaml +++ /dev/null @@ -1,2 +0,0 @@ -workingDir: "" -url: packages/rancher-windows-exporter diff --git a/packages/rancher-monitoring/generated-changes/dependencies/rke2Windows/dependency.yaml b/packages/rancher-monitoring/generated-changes/dependencies/windowsExporter/dependency.yaml similarity index 100% rename from packages/rancher-monitoring/generated-changes/dependencies/rke2Windows/dependency.yaml rename to packages/rancher-monitoring/generated-changes/dependencies/windowsExporter/dependency.yaml diff --git a/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch index c792a279c..89c47b28a 100644 --- a/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch @@ -1,9 +1,47 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -5,6 +5,16 @@ +@@ -1,3 +1,35 @@ ++apiVersion: v2 ++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. ++icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png ++engine: gotpl ++type: application ++maintainers: ++ - name: vsliouniaev ++ - name: bismarck ++ - name: gianrubio ++ email: gianrubio@gmail.com ++ - name: gkarthiks ++ email: github.gkarthiks@gmail.com ++ - name: scottrigby ++ email: scott@r6by.com ++ - name: Xtigyro ++ email: miroslav.hadzhiev@gmail.com ++ - name: Arvind ++ email: arvind.iyengar@suse.com ++ url: "" ++name: rancher-monitoring ++sources: ++ - https://github.com/prometheus-community/helm-charts ++ - https://github.com/prometheus-operator/kube-prometheus ++version: 16.6.0 ++appVersion: 0.48.0 ++kubeVersion: ">=1.16.0-0" ++home: https://github.com/prometheus-operator/kube-prometheus ++keywords: ++- operator ++- prometheus ++- kube-prometheus ++- monitoring + annotations: + artifacthub.io/links: | + - name: Chart Source +@@ -5,8 +37,16 @@ - name: Upstream Project url: https://github.com/prometheus-operator/kube-prometheus artifacthub.io/operator: "true" +-apiVersion: v2 +-appVersion: 0.48.0 + catalog.cattle.io/certified: rancher + catalog.cattle.io/namespace: cattle-monitoring-system + catalog.cattle.io/release-name: rancher-monitoring @@ -14,38 +52,42 @@ + catalog.cattle.io/auto-install: rancher-monitoring-crd=match + catalog.cattle.io/requests-cpu: "4500m" + catalog.cattle.io/requests-memory: "4000Mi" - apiVersion: v2 - appVersion: 0.48.0 dependencies: -@@ -74,19 +84,17 @@ + - condition: grafana.enabled + name: grafana +@@ -71,34 +111,6 @@ - condition: rkeScheduler.enabled name: rkeScheduler repository: file://./charts/rkeScheduler --- condition: rkeWindows.enabled +-- condition: windowsExporter.enabled +- condition: global.cattle.windows.enabled - name: rkeWindows - repository: file://./charts/rkeWindows + name: windowsExporter + repository: file://./charts/windowsExporter -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 - icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png - keywords: - - operator - - prometheus - - kube-prometheus -+- monitoring - kubeVersion: '>=1.16.0-0' - maintainers: - - name: vsliouniaev -@@ -99,7 +107,7 @@ - name: scottrigby - - email: miroslav.hadzhiev@gmail.com - name: Xtigyro +-home: https://github.com/prometheus-operator/kube-prometheus +-icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png +-keywords: +-- operator +-- prometheus +-- kube-prometheus +-kubeVersion: '>=1.16.0-0' +-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: rancher-monitoring - sources: - - https://github.com/prometheus-community/helm-charts - - https://github.com/prometheus-operator/kube-prometheus +-sources: +-- https://github.com/prometheus-community/helm-charts +-- https://github.com/prometheus-operator/kube-prometheus +-type: application +-version: 16.6.0 diff --git a/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch index 035408215..62f839a48 100644 --- a/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/values.yaml +++ charts/values.yaml -@@ -2,13 +2,436 @@ +@@ -2,13 +2,427 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. @@ -19,7 +19,7 @@ + create: true + +## RKE PushProx Monitoring -+## ref: https://github.com/rancher/charts/tree/release-v2.6/charts/rancher-pushprox ++## ref: https://github.com/rancher/charts/tree/dev-v2.5-source/packages/rancher-pushprox +## +rkeControllerManager: + enabled: false @@ -100,7 +100,7 @@ + node-role.kubernetes.io/worker: "true" + +## k3s PushProx Monitoring -+## ref: https://github.com/rancher/charts/tree/release-v2.6/charts/rancher-pushprox ++## ref: https://github.com/rancher/charts/tree/dev-v2.5-source/packages/rancher-pushprox +## +k3sServer: + enabled: false @@ -146,7 +146,7 @@ + targetLabel: metrics_path + +## KubeADM PushProx Monitoring -+## ref: https://github.com/rancher/charts/tree/release-v2.6/charts/rancher-pushprox ++## ref: https://github.com/rancher/charts/tree/dev-v2.5-source/packages/rancher-pushprox +## +kubeAdmControllerManager: + enabled: false @@ -214,8 +214,8 @@ + - effect: "NoSchedule" + operator: "Exists" + -+## RKE2 PushProx Monitoring -+## ref: https://github.com/rancher/charts/tree/release-v2.6/charts/rancher-pushprox ++## rke2 PushProx Monitoring ++## ref: https://github.com/rancher/charts/tree/dev-v2.5-source/packages/rancher-pushprox +## +rke2ControllerManager: + enabled: false @@ -306,19 +306,10 @@ + enabled: false + replicas: 1 + -+## RKE2 Windows Monitoring -+## ref: https://github.com/rancher/charts/tree/release-v2.6/charts/rancher-windows-exporter -+## -+## Deploys a DaemonSet of Prometheus exporters based on https://github.com/prometheus-community/windows_exporter. -+## Every Windows host must have a wins version of 0.1.0+ to use this chart (default as of Rancher 2.5.8). -+## To upgrade wins versions on Windows hosts, see https://github.com/rancher/wins/tree/master/charts/rancher-wins-upgrader. -+## -+rke2Windows: -+ ## Do not enable this value if global.cattle.windows.enabled=true -+ enabled: false ++ + +## Additional PushProx Monitoring -+## ref: https://github.com/rancher/charts/tree/release-v2.6/charts/rancher-pushprox ++## ref: https://github.com/rancher/charts/tree/dev-v2.5-source/packages/rancher-pushprox +## + +# hardenedKubelet can only be deployed if kubelet.enabled=true @@ -439,21 +430,20 @@ ## Provide a k8s version to auto dashboard import script example: kubeTargetVersionOverride: 1.16.6 ## -@@ -93,8 +516,33 @@ +@@ -93,8 +507,32 @@ ## global: + cattle: + systemDefaultRegistry: "" -+ ## RKE1 Windows Monitoring -+ ## ref: https://github.com/rancher/charts/tree/release-v2.6/charts/rancher-windows-exporter ++ ## Windows Monitoring ++ ## ref: https://github.com/rancher/charts/tree/dev-v2.5-source/packages/rancher-windows-exporter + ## + ## Deploys a DaemonSet of Prometheus exporters based on https://github.com/prometheus-community/windows_exporter. + ## Every Windows host must have a wins version of 0.1.0+ to use this chart (default as of Rancher 2.5.8). + ## To upgrade wins versions on Windows hosts, see https://github.com/rancher/wins/tree/master/charts/rancher-wins-upgrader. + ## + windows: -+ # Do not enable this value if rke2Windows.enabled=true + enabled: false + kubectl: + repository: rancher/kubectl @@ -473,7 +463,7 @@ pspEnabled: true pspAnnotations: {} ## Specify pod annotations -@@ -187,25 +635,76 @@ +@@ -187,25 +625,76 @@ ## ref: https://prometheus.io/docs/alerting/notifications/ ## https://prometheus.io/docs/alerting/notification_examples/ ## @@ -569,7 +559,7 @@ ingress: enabled: false -@@ -395,7 +894,7 @@ +@@ -395,7 +884,7 @@ ## Image of Alertmanager ## image: @@ -578,7 +568,7 @@ tag: v0.22.2 sha: "" -@@ -507,9 +1006,13 @@ +@@ -507,9 +996,13 @@ ## Define resources requests and limits for single Pods. ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ ## @@ -595,7 +585,7 @@ ## 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. -@@ -613,6 +1116,30 @@ +@@ -613,6 +1106,30 @@ enabled: true namespaceOverride: "" @@ -626,7 +616,7 @@ ## ForceDeployDatasources Create datasource configmap even if grafana deployment has been disabled ## forceDeployDatasources: false -@@ -625,6 +1152,18 @@ +@@ -625,6 +1142,18 @@ ## defaultDashboardsEnabled: true @@ -645,7 +635,7 @@ adminPassword: prom-operator ingress: -@@ -664,6 +1203,7 @@ +@@ -664,6 +1193,7 @@ dashboards: enabled: true label: grafana_dashboard @@ -653,7 +643,7 @@ ## Annotations for Grafana dashboard configmaps ## -@@ -716,7 +1256,60 @@ +@@ -716,7 +1246,60 @@ ## Passed to grafana subchart and used by servicemonitor below ## service: @@ -715,7 +705,7 @@ ## If true, create a serviceMonitor for grafana ## -@@ -746,6 +1339,14 @@ +@@ -746,6 +1329,14 @@ # targetLabel: nodename # replacement: $1 # action: replace @@ -730,7 +720,7 @@ ## Component scraping the kube api server ## -@@ -907,7 +1508,7 @@ +@@ -907,7 +1498,7 @@ ## Component scraping the kube controller manager ## kubeControllerManager: @@ -739,7 +729,7 @@ ## If your kube controller manager is not deployed as a pod, specify IPs it can be found on ## -@@ -1054,7 +1655,7 @@ +@@ -1054,7 +1645,7 @@ ## Component scraping etcd ## kubeEtcd: @@ -748,7 +738,7 @@ ## If your etcd is not deployed as a pod, specify IPs it can be found on ## -@@ -1119,7 +1720,7 @@ +@@ -1119,7 +1710,7 @@ ## Component scraping kube scheduler ## kubeScheduler: @@ -757,7 +747,7 @@ ## If your kube scheduler is not deployed as a pod, specify IPs it can be found on ## -@@ -1177,7 +1778,7 @@ +@@ -1177,7 +1768,7 @@ ## Component scraping kube proxy ## kubeProxy: @@ -766,7 +756,7 @@ ## If your kube proxy is not deployed as a pod, specify IPs it can be found on ## -@@ -1266,6 +1867,13 @@ +@@ -1266,6 +1857,13 @@ create: true podSecurityPolicy: enabled: true @@ -780,7 +770,7 @@ ## Deploy node exporter as a daemonset to all nodes ## -@@ -1319,6 +1927,16 @@ +@@ -1319,6 +1917,16 @@ extraArgs: - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/.+)($|/) - --collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$ @@ -797,7 +787,7 @@ ## Manages Prometheus and Alertmanager components ## -@@ -1331,8 +1949,8 @@ +@@ -1331,8 +1939,8 @@ enabled: true # Value must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants tlsMinVersion: VersionTLS13 @@ -808,7 +798,7 @@ ## Admission webhook support for PrometheusRules resources added in Prometheus Operator 0.30 can be enabled to prevent incorrectly formatted ## rules from making their way into prometheus and potentially preventing the container from starting -@@ -1349,7 +1967,7 @@ +@@ -1349,7 +1957,7 @@ patch: enabled: true image: @@ -817,7 +807,7 @@ tag: v1.5.2 sha: "" pullPolicy: IfNotPresent -@@ -1498,13 +2116,13 @@ +@@ -1498,13 +2106,13 @@ ## Resource limits & requests ## @@ -838,7 +828,7 @@ # 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 -@@ -1557,7 +2175,7 @@ +@@ -1557,7 +2165,7 @@ ## Prometheus-operator image ## image: @@ -847,7 +837,7 @@ tag: v0.48.0 sha: "" pullPolicy: IfNotPresent -@@ -1573,7 +2191,7 @@ +@@ -1573,7 +2181,7 @@ ## Prometheus-config-reloader image to use for config and rule reloading ## prometheusConfigReloaderImage: @@ -856,7 +846,7 @@ tag: v0.48.0 sha: "" -@@ -1659,7 +2277,7 @@ +@@ -1659,7 +2267,7 @@ port: 9090 ## To be used with a proxy extraContainer port @@ -865,7 +855,7 @@ ## List of IP addresses at which the Prometheus server service is available ## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips -@@ -1916,7 +2534,7 @@ +@@ -1916,7 +2524,7 @@ ## Image of Prometheus. ## image: @@ -874,7 +864,7 @@ tag: v2.27.1 sha: "" -@@ -1979,6 +2597,11 @@ +@@ -1979,6 +2587,11 @@ ## externalUrl: "" @@ -886,7 +876,7 @@ ## Define which Nodes the Pods are scheduled on. ## ref: https://kubernetes.io/docs/user-guide/node-selection/ ## -@@ -2011,7 +2634,7 @@ +@@ -2011,7 +2624,7 @@ ## prometheus resource to be created with selectors based on values in the helm deployment, ## which will also match the PrometheusRule resources created ## @@ -895,7 +885,7 @@ ## PrometheusRules to be selected for target discovery. ## If {}, select all PrometheusRules -@@ -2036,7 +2659,7 @@ +@@ -2036,7 +2649,7 @@ ## prometheus resource to be created with selectors based on values in the helm deployment, ## which will also match the servicemonitors created ## @@ -904,7 +894,7 @@ ## ServiceMonitors to be selected for target discovery. ## If {}, select all ServiceMonitors -@@ -2059,7 +2682,7 @@ +@@ -2059,7 +2672,7 @@ ## prometheus resource to be created with selectors based on values in the helm deployment, ## which will also match the podmonitors created ## @@ -913,7 +903,7 @@ ## PodMonitors to be selected for target discovery. ## If {}, select all PodMonitors -@@ -2190,9 +2813,13 @@ +@@ -2190,9 +2803,13 @@ ## Resource limits & requests ## @@ -930,7 +920,7 @@ ## Prometheus StorageSpec for persistent data ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/storage.md -@@ -2215,7 +2842,13 @@ +@@ -2215,7 +2832,13 @@ # medium: Memory # Additional volumes on the output StatefulSet definition. @@ -945,7 +935,7 @@ # Additional VolumeMounts on the output StatefulSet definition. volumeMounts: [] -@@ -2322,9 +2955,34 @@ +@@ -2322,9 +2945,34 @@ ## thanos: {} @@ -981,7 +971,7 @@ ## InitContainers allows injecting additional initContainers. This is meant to allow doing some changes ## (permissions, dir tree) on mounted volumes before starting prometheus -@@ -2332,7 +2990,7 @@ +@@ -2332,7 +2980,7 @@ ## PortName to use for Prometheus. ##