Merge pull request #156 from obrienrobert/INTLY-808

Bump Prometheus operator to v0.38.1

Author: obrienrobert

deploy/cluster-roles/prometheus-operator-clusterrole.yaml

@@ -14,8 +14,10 @@ rules:
   resources:
   - alertmanagers
   - prometheuses
+  - thanosrulers
   - prometheuses/finalizers
   - alertmanagers/finalizers
+  - thanosrulers/finalizers
   - servicemonitors
   - prometheusrules
   - podmonitors

go.mod

@@ -4,7 +4,7 @@ go 1.13
 
 require (
 	github.com/Masterminds/sprig v2.22.0+incompatible
-	github.com/coreos/prometheus-operator v0.34.0
+	github.com/coreos/prometheus-operator v0.38.1
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/go-openapi/spec v0.19.4
 	github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
@@ -14,10 +14,10 @@ require (
 	golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 // indirect
 	golang.org/x/net v0.0.0-20200301022130-244492dfa37a // indirect
 	google.golang.org/protobuf v1.21.0 // indirect
-	k8s.io/api v0.0.0
-	k8s.io/apimachinery v0.0.0
+	k8s.io/api v0.17.3
+	k8s.io/apimachinery v0.17.3
 	k8s.io/client-go v12.0.0+incompatible
-	k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
+	k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
 	sigs.k8s.io/controller-runtime v0.4.0
 )
 

go.sum

@@ -101,6 +101,7 @@ type Parameters struct {
 	PrometheusInstanceNamespaces     string
 	AlertmanagerInstanceNamespaces   string
 	Affinity                         string
+	PrometheusVersion                string
 	ExtraParams                      map[string]string
 }
 
@@ -150,15 +151,16 @@ func newTemplateHelper(cr *applicationmonitoring.ApplicationMonitoring, extraPar
 		ImageGrafanaOperator:             "quay.io/integreatly/grafana-operator",
 		ImageTagGrafanaOperator:          "v3.6.0",
 		ImageConfigMapReloader:           "quay.io/openshift/origin-configmap-reloader",
-		ImageTagConfigMapReloader:        "4.2",
+		ImageTagConfigMapReloader:        "4.4",
 		ImagePrometheusConfigReloader:    "quay.io/openshift/origin-prometheus-config-reloader",
-		ImageTagPrometheusConfigReloader: "4.2",
+		ImageTagPrometheusConfigReloader: "4.4",
 		ImagePrometheusOperator:          "quay.io/coreos/prometheus-operator",
-		ImageTagPrometheusOperator:       "v0.34.0",
+		ImageTagPrometheusOperator:       "v0.38.1",
 		ImagePrometheus:                  "quay.io/openshift/origin-prometheus",
-		ImageTagPrometheus:               "4.2",
+		ImageTagPrometheus:               "4.4",
 		ImageBlackboxExporter:            "quay.io/prometheus/blackbox-exporter",
 		ImageTagBlackboxExporter:         "v0.14.0",
+		PrometheusVersion:                "v2.15.2",
 		PriorityClassName:                cr.Spec.PriorityClassName,
 		PrometheusRetention:              cr.Spec.PrometheusRetention,
 		PrometheusStorageRequest:         cr.Spec.PrometheusStorageRequest,

pkg/controller/applicationmonitoring/templateHelper.go

@@ -28,11 +28,13 @@ oc apply -f https://raw.githubusercontent.com/integr8ly/grafana-operator/$GRAFAN
 # Prometheus CRDs
 oc get crd | grep prometheus > /dev/null 2>&1
 if [ $? != 0 ]; then
-  oc apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/$PROMETHEUS_OPERATOR_VERSION/example/prometheus-operator-crd/podmonitor.crd.yaml
-  oc apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/$PROMETHEUS_OPERATOR_VERSION/example/prometheus-operator-crd/prometheus.crd.yaml
-  oc apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/$PROMETHEUS_OPERATOR_VERSION/example/prometheus-operator-crd/alertmanager.crd.yaml
-  oc apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/$PROMETHEUS_OPERATOR_VERSION/example/prometheus-operator-crd/prometheusrule.crd.yaml
-  oc apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/$PROMETHEUS_OPERATOR_VERSION/example/prometheus-operator-crd/servicemonitor.crd.yaml
+  oc apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/$PROMETHEUS_OPERATOR_VERSION/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+  oc apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/$PROMETHEUS_OPERATOR_VERSION/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+  oc apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/$PROMETHEUS_OPERATOR_VERSION/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+  oc apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/$PROMETHEUS_OPERATOR_VERSION/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+  oc apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/$PROMETHEUS_OPERATOR_VERSION/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+  oc apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/$PROMETHEUS_OPERATOR_VERSION/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+
 fi
 
 # AMO Deployment

scripts/install.sh

@@ -6,8 +6,7 @@ metadata:
   labels:
     alertmanager: {{ .ApplicationMonitoringName }}
 spec:
-  baseImage: {{ .ImageAlertManager }}
-  tag: "{{ .ImageTagAlertManager }}"
+  image: {{ .ImageAlertManager }}:{{ .ImageTagAlertManager }}
   externalUrl: https://{{ index .ExtraParams "alertmanagerHost" }}
   listenLocal: true
   serviceAccountName: {{ .AlertManagerServiceAccountName }}

templates/alertmanager.yaml

@@ -6,8 +6,7 @@ metadata:
   labels:
     prometheus: {{ .ApplicationMonitoringName }}
 spec:
-  baseImage: {{ .ImagePrometheus }}
-  tag: "{{ .ImageTagPrometheus }}"
+  image: {{ .ImagePrometheus }}:{{ .ImageTagPrometheus }}
 {{- if .Affinity }}
   replicas: 3
 {{- end }}
@@ -105,3 +104,4 @@ spec:
   affinity:
 {{ .Affinity | indent 4 }}
 {{- end }}
+  version:  {{ .PrometheusVersion }}