Merge pull request #70 from nima-rx/main

change prometheus url and go version
snapp-incubator · Dec 13, 2022 · 87b4642 · 87b4642
2 parents 4c83ba2 + 7db8767
commit 87b4642
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.17 as builder
+FROM golang:1.19 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -41,6 +41,11 @@ spec:
             configMapKeyRef:
               name: grafana-complementary-config
               key: grafana-url
+        - name: PROMETHEUS_URL
+          valueFrom:
+            configMapKeyRef:
+              name: grafana-complementary-config
+              key: prometheus-url
         imagePullPolicy: Always
         name: manager
         securityContext:

diff --git a/controllers/namespace/namespace_controller.go b/controllers/namespace/namespace_controller.go
@@ -38,7 +38,6 @@ import (
 const (
 	baseNs            = "snappcloud-monitoring"
 	baseSa            = "monitoring-datasource"
-	prometheusURL     = "https://thanos-querier-custom.openshift-monitoring.svc.cluster.local:9092"
 	nsMonitoringLabel = "monitoring.snappcloud.io/grafana-datasource"
 	teamLabel         = "snappcloud.io/team"
 )
@@ -47,6 +46,7 @@ const (
 var grafanaPassword = os.Getenv("GRAFANA_PASSWORD")
 var grafanaUsername = os.Getenv("GRAFANA_USERNAME")
 var grafanaURL = os.Getenv("GRAFANA_URL")
+var prometheusURL = os.Getenv("PROMETHEUS_URL")
 
 // NamespaceReconciler reconciles a Namespace object
 type NamespaceReconciler struct {

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/snapp-cab/grafana-complementary-operator
 
-go 1.17
+go 1.19
 
 require (
 	github.com/grafana-operator/grafana-operator/v4 v4.6.0