From 3934372ea48fe0c9db2fe06daf79bb734062fbe3 Mon Sep 17 00:00:00 2001
From: Thorsten Klein <thorsten.klein.95@googlemail.com>
Date: Tue, 2 Jun 2020 12:02:15 +0200
Subject: [PATCH] [stable/prometheus-operator]: do not allow '--manage-crds'
 flag in operator version >= v0.39.0 (#22390)

* stable/prometheus-operator: do not allow '--manage-crds' flag in operator version >= v0.39.0

Signed-off-by: Thorsten Klein <iwilltry42@gmail.com>

* stable/prometheus-operator: chart version bump

Signed-off-by: Thorsten Klein <iwilltry42@gmail.com>

* stable/prometheus-operator: chart version bump

Signed-off-by: Thorsten Klein <iwilltry42@gmail.com>
---
 stable/prometheus-operator/Chart.yaml                         | 2 +-
 stable/prometheus-operator/README.md                          | 2 +-
 .../templates/prometheus-operator/deployment.yaml             | 4 +++-
 stable/prometheus-operator/values.yaml                        | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml
index 936ffd24b9..c7f9764c41 100644
--- a/stable/prometheus-operator/Chart.yaml
+++ b/stable/prometheus-operator/Chart.yaml
@@ -12,7 +12,7 @@ sources:
   - https://github.com/coreos/kube-prometheus
   - https://github.com/coreos/prometheus-operator
   - https://coreos.com/operators/prometheus
-version: 8.13.10
+version: 8.13.11
 appVersion: 0.38.1
 tillerVersion: ">=2.12.0"
 home: https://github.com/coreos/prometheus-operator
diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md
index 26ec8c227d..26c50356a4 100644
--- a/stable/prometheus-operator/README.md
+++ b/stable/prometheus-operator/README.md
@@ -198,7 +198,7 @@ The following tables list the configurable parameters of the prometheus-operator
 | `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 | `true` |
+| `prometheusOperator.manageCrds` |If true prometheus operator will create and update its CRDs on startup (for operator `<v0.39.0`)) | `true` |
 | `prometheusOperator.denyNamespaces` | Namespaces not to scope the interaction of the Prometheus Operator (deny list). This is mutually exclusive with `namespaces` | `[]` |
 | `prometheusOperator.enabled` | Deploy Prometheus Operator. Only one of these should be deployed into the cluster | `true` |
 | `prometheusOperator.hyperkubeImage.pullPolicy` | Image pull policy for hyperkube image used to perform maintenance tasks | `IfNotPresent` |
diff --git a/stable/prometheus-operator/templates/prometheus-operator/deployment.yaml b/stable/prometheus-operator/templates/prometheus-operator/deployment.yaml
index e5b28a7509..86316f9653 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/deployment.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/deployment.yaml
@@ -34,7 +34,9 @@ spec:
           image: "{{ .Values.prometheusOperator.image.repository }}:{{ .Values.prometheusOperator.image.tag }}"
           imagePullPolicy: "{{ .Values.prometheusOperator.image.pullPolicy }}"
           args:
-            - --manage-crds={{ $.Values.prometheusOperator.manageCrds }}
+          {{- if semverCompare "< v0.39.0" .Values.prometheusOperator.image.tag }}
+            - --manage-crds={{ .Values.prometheusOperator.manageCrds }}
+          {{- end }}
           {{- if .Values.prometheusOperator.kubeletService.enabled }}
             - --kubelet-service={{ .Values.prometheusOperator.kubeletService.namespace }}/{{ template "prometheus-operator.fullname" . }}-kubelet
           {{- end }}
diff --git a/stable/prometheus-operator/values.yaml b/stable/prometheus-operator/values.yaml
index 3fb13679b5..75d5417f4d 100644
--- a/stable/prometheus-operator/values.yaml
+++ b/stable/prometheus-operator/values.yaml
@@ -1096,6 +1096,7 @@ prometheusOperator:
   enabled: true
 
   # If true prometheus operator will create and update its CRDs on startup
+  # Only for prometheusOperator.image.tag < v0.39.0
   manageCrds: true
 
   tlsProxy: