[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>
This commit is contained in:
Thorsten Klein
2020-06-02 03:02:15 -07:00
committed by GitHub
parent 9d3ab97392
commit 3934372ea4
4 changed files with 6 additions and 3 deletions
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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` |
@@ -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 }}
+1
View File
@@ -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: