Merge pull request #77 from integr8ly/update-grafana-operator-1-3-1

upgrade grafana operator to v1.3.1
integr8ly · Aug 16, 2019 · 137081a · 137081a
2 parents 9aed473 + a378da2
commit 137081a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ NAMESPACE ?= application-monitoring
 PROJECT ?= application-monitoring-operator
 REG=quay.io
 SHELL=/bin/bash
-TAG ?= 0.0.22
+TAG ?= 0.0.23
 PKG=github.com/integr8ly/application-monitoring-operator
 TEST_DIRS?=$(shell sh -c "find $(TOP_SRC_DIRS) -name \\*_test.go -exec dirname {} \\; | sort | uniq")
 TEST_POD_NAME=application-monitoring-operator-test

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: application-monitoring-operator
       containers:
         - name: application-monitoring-operator
-          image: quay.io/integreatly/application-monitoring-operator:0.0.22
+          image: quay.io/integreatly/application-monitoring-operator:0.0.23
           ports:
             - containerPort: 60000
               name: metrics

diff --git a/pkg/controller/applicationmonitoring/templateHelper.go b/pkg/controller/applicationmonitoring/templateHelper.go
@@ -139,7 +139,7 @@ func newTemplateHelper(cr *applicationmonitoring.ApplicationMonitoring, extraPar
 		ImageGrafana:                     "quay.io/openshift/origin-grafana",
 		ImageTagGrafana:                  "4.2",
 		ImageGrafanaOperator:             "quay.io/integreatly/grafana-operator",
-		ImageTagGrafanaOperator:          "v1.2.0",
+		ImageTagGrafanaOperator:          "v1.3.1",
 		ImageConfigMapReloader:           "quay.io/openshift/origin-configmap-reloader",
 		ImageTagConfigMapReloader:        "4.2",
 		ImagePrometheusConfigReloader:    "quay.io/openshift/origin-prometheus-config-reloader",

diff --git a/version/version.go b/version/version.go
@@ -1,5 +1,5 @@
 package version
 
 var (
-	Version = "0.0.22"
+	Version = "0.0.23"
 )