Merge pull request #78 from integr8ly/INTLY-3134

fix self monitoring
integr8ly · Aug 29, 2019 · 37344c3 · 37344c3
2 parents 137081a + 76ecaf8
commit 37344c3
Show file tree

Hide file tree

Showing 5 changed files with 9 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.23
+TAG ?= 0.0.24
 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.23
+          image: quay.io/integreatly/application-monitoring-operator:0.0.24
           ports:
             - containerPort: 60000
               name: metrics

diff --git a/templates/grafana-servicemonitor.yaml b/templates/grafana-servicemonitor.yaml
@@ -8,7 +8,9 @@ metadata:
 spec:
   endpoints:
     - port: grafana
-      scheme: http
+      scheme: https
+      tlsConfig:
+        insecureSkipVerify: true
   selector:
     matchLabels:
       application-monitoring: 'true'
diff --git a/templates/prometheus-servicemonitor.yaml b/templates/prometheus-servicemonitor.yaml
@@ -8,6 +8,9 @@ metadata:
 spec:
   endpoints:
     - port: web
+      scheme: https
+      tlsConfig:
+        insecureSkipVerify: true
   selector:
     matchLabels:
       application-monitoring: 'true'
diff --git a/version/version.go b/version/version.go
@@ -1,5 +1,5 @@
 package version
 
 var (
-	Version = "0.0.23"
+	Version = "0.0.24"
 )