[stable/prometheus-operator] Only use job alpha feature if available (#17387)

* [stable/prometheus-operator] Only use alpha feature if available

Fixes #17076

Signed-off-by: Emil Marklund <emil.marklund@vkmedia.se>

* [stable/prometheus-operator] Bump version

Signed-off-by: Emil Marklund <emil.marklund@vkmedia.se>

* Add newline to render correctly

Signed-off-by: Emil Marklund <emil.marklund@vkmedia.se>
This commit is contained in:
Emil Marklund
2019-10-05 07:17:11 -07:00
committed by Kubernetes Prow Robot
parent b3bb91f66a
commit 4686a862db
3 changed files with 9 additions and 3 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ name: prometheus-operator
sources:
- https://github.com/coreos/prometheus-operator
- https://coreos.com/operators/prometheus
version: 6.11.0
version: 6.11.1
appVersion: 0.32.0
home: https://github.com/coreos/prometheus-operator
keywords:
@@ -10,7 +10,10 @@ metadata:
app: {{ template "prometheus-operator.name" $ }}-admission-create
{{- include "prometheus-operator.labels" $ | indent 4 }}
spec:
{{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }}
# Alpha feature since k8s 1.12
ttlSecondsAfterFinished: 0
{{- end }}
template:
metadata:
name: {{ template "prometheus-operator.fullname" . }}-admission-create
@@ -43,4 +46,4 @@ spec:
securityContext:
runAsNonRoot: true
runAsUser: 2000
{{- end }}
{{- end }}
@@ -10,7 +10,10 @@ metadata:
app: {{ template "prometheus-operator.name" $ }}-admission-patch
{{- include "prometheus-operator.labels" $ | indent 4 }}
spec:
{{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }}
# Alpha feature since k8s 1.12
ttlSecondsAfterFinished: 0
{{- end }}
template:
metadata:
name: {{ template "prometheus-operator.fullname" . }}-admission-patch
@@ -44,4 +47,4 @@ spec:
securityContext:
runAsNonRoot: true
runAsUser: 2000
{{- end }}
{{- end }}