From 4527cf0c42a023b5636736f0f4af16a923874ad8 Mon Sep 17 00:00:00 2001 From: nima-rx Date: Sat, 10 Dec 2022 19:36:52 +0330 Subject: [PATCH 1/2] change prometheus url --- config/manager/manager.yaml | 5 +++++ controllers/namespace/namespace_controller.go | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index beb55d5..300d8ed 100644 --- 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 index f52ac93..9892711 100644 --- 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 { From 44b6b7bb0a78e7aa03b3a2156ba074fb444c23f7 Mon Sep 17 00:00:00 2001 From: nima-rx Date: Mon, 12 Dec 2022 20:04:31 +0330 Subject: [PATCH 2/2] change golang version --- Dockerfile | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 529aad3..22ddc13 100644 --- 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/go.mod b/go.mod index 3f3bdb2..bb3174c 100644 --- 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