Use grafana 11.1.0 (stolostron#1013)

Signed-off-by: clyang82 <[email protected]>
yanmxa · Jul 10, 2024 · 6dd284a · 6dd284a
1 parent 7c44437
commit 6dd284a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/operator/bundle/manifests/multicluster-global-hub-operator.clusterserviceversion.yaml b/operator/bundle/manifests/multicluster-global-hub-operator.clusterserviceversion.yaml
@@ -777,7 +777,7 @@ spec:
                 - name: RELATED_IMAGE_MULTICLUSTER_GLOBAL_HUB_AGENT
                   value: quay.io/stolostron/multicluster-global-hub-agent:latest
                 - name: RELATED_IMAGE_GRAFANA
-                  value: quay.io/stolostron/grafana:globalhub-1.2
+                  value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/release-globalhub-1-3/glo-grafana-globalhub-1-3@sha256:c73fb10b1230c5e678d51fc609a5cfb8fb02ca2f4c12e4639cf7ad483f6a47a0
                 - name: RELATED_IMAGE_POSTGRESQL
                   value: quay.io/stolostron/postgresql-13:1-101
                 - name: RELATED_IMAGE_POSTGRES_EXPORTER

diff --git a/operator/config/manager/manager.yaml b/operator/config/manager/manager.yaml
@@ -52,7 +52,7 @@ spec:
         - name: RELATED_IMAGE_MULTICLUSTER_GLOBAL_HUB_AGENT
           value: quay.io/stolostron/multicluster-global-hub-agent:latest
         - name: RELATED_IMAGE_GRAFANA
-          value: quay.io/stolostron/grafana:globalhub-1.2
+          value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/release-globalhub-1-3/glo-grafana-globalhub-1-3@sha256:c73fb10b1230c5e678d51fc609a5cfb8fb02ca2f4c12e4639cf7ad483f6a47a0
         - name: RELATED_IMAGE_POSTGRESQL
           value: quay.io/stolostron/postgresql-13:1-101
         - name: RELATED_IMAGE_POSTGRES_EXPORTER

diff --git a/operator/pkg/config/multiclusterglobalhub_config.go b/operator/pkg/config/multiclusterglobalhub_config.go
@@ -68,7 +68,8 @@ var (
 		GlobalHubAgentImageKey:   "quay.io/stolostron/multicluster-global-hub-agent:latest",
 		GlobalHubManagerImageKey: "quay.io/stolostron/multicluster-global-hub-manager:latest",
 		OauthProxyImageKey:       "quay.io/stolostron/origin-oauth-proxy:4.9",
-		GrafanaImageKey:          "quay.io/stolostron/grafana:globalhub-1.2",
+		// TODO: replace with quay.io/stolostro/grafana:globalhub-1.3 when it is ready
+		GrafanaImageKey:          "quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/release-globalhub-1-3/glo-grafana-globalhub-1-3@sha256:c73fb10b1230c5e678d51fc609a5cfb8fb02ca2f4c12e4639cf7ad483f6a47a0",
 		PostgresImageKey:         "quay.io/stolostron/postgresql-13:1-101",
 		PostgresExporterImageKey: "quay.io/prometheuscommunity/postgres-exporter:v0.15.0",
 	}

diff --git a/test/script/util.sh b/test/script/util.sh
@@ -16,7 +16,7 @@ export PG_OPERATOR_IMG="registry.developers.crunchydata.com/crunchydata/postgres
 export PG_BACKUP_IMG="registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.40-1"
 export PG_IMG="registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.5-1"
 export OAUTH_PROXY_IMG="quay.io/stolostron/origin-oauth-proxy:4.9"
-export GRAFANA_IMG="quay.io/stolostron/grafana:globalhub-1.2"
+export GRAFANA_IMG="quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/release-globalhub-1-3/glo-grafana-globalhub-1-3@sha256:c73fb10b1230c5e678d51fc609a5cfb8fb02ca2f4c12e4639cf7ad483f6a47a0"
 
 # Environment Variables 
 CURRENT_DIR=$(cd "$(dirname "$0")" || exit; pwd)