diff --git a/README.md b/README.md index 5e9f22301..e6896de79 100644 --- a/README.md +++ b/README.md @@ -37,10 +37,13 @@ Kubernetes itself and applications running on top of it. ## Prerequisites -Version `>=0.2.0` of the Prometheus Operator requires a Kubernetes -cluster of version `>=1.5.0`. If you are just starting out with the +Version `>=0.18.0` of the Prometheus Operator requires a Kubernetes +cluster of version `>=1.8.0`. If you are just starting out with the Prometheus Operator, it is highly recommended to use the latest version. +If you have an older version of Kubernetes and the Prometheus Operator running, +we recommend upgrading Kubernetes first and then the Prometheus Operator. + If you have previously used pre-1.5.0 releases of Kubernetes with the `0.1.0` version of the Prometheus Operator, see the [migration](#migration) section. diff --git a/helm/prometheus-operator/Chart.yaml b/helm/prometheus-operator/Chart.yaml index 4883775f6..4081d66ee 100644 --- a/helm/prometheus-operator/Chart.yaml +++ b/helm/prometheus-operator/Chart.yaml @@ -9,4 +9,4 @@ maintainers: name: prometheus-operator sources: - https://github.com/coreos/prometheus-operator -version: 0.0.16 +version: 0.0.17 diff --git a/helm/prometheus-operator/templates/_helpers.tpl b/helm/prometheus-operator/templates/_helpers.tpl index 731123af7..1a6f26e99 100644 --- a/helm/prometheus-operator/templates/_helpers.tpl +++ b/helm/prometheus-operator/templates/_helpers.tpl @@ -28,9 +28,5 @@ If release name contains chart name it will be used as a full name. Return the appropriate apiVersion value to use for the prometheus-operator managed k8s resources */}} {{- define "prometheus-operator.apiVersion" -}} -{{- if lt .Values.image.tag "v0.12.0" }} -{{- printf "%s" "monitoring.coreos.com/v1alpha1" -}} -{{- else -}} {{- printf "%s" "monitoring.coreos.com/v1" -}} {{- end -}} -{{- end -}} diff --git a/helm/prometheus-operator/templates/deployment.yaml b/helm/prometheus-operator/templates/deployment.yaml index 5141c396b..ddeaebda5 100644 --- a/helm/prometheus-operator/templates/deployment.yaml +++ b/helm/prometheus-operator/templates/deployment.yaml @@ -27,9 +27,6 @@ spec: {{- end }} - --prometheus-config-reloader={{ .Values.prometheusConfigReloader.repository }}:{{ .Values.prometheusConfigReloader.tag }} - --config-reloader-image={{ .Values.configmapReload.repository }}:{{ .Values.configmapReload.tag }} - {{- if lt .Values.image.tag "v0.13.0" }} - - --analytics=false - {{- end }} ports: - containerPort: 8080 name: http @@ -45,4 +42,4 @@ spec: {{- if .Values.tolerations }} tolerations: {{ toYaml .Values.tolerations | indent 8 }} - {{- end }} \ No newline at end of file + {{- end }}