From 1fafcab11e48bf8465c427fdb4fa42a76b689cb2 Mon Sep 17 00:00:00 2001
From: Ernesto Puerta <epuertat@redhat.com>
Date: Fri, 1 Apr 2022 11:49:33 +0200
Subject: [PATCH] grafana/trigger: remove docker references

And upgrade Grafana default version to 8.3.5

Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
---
 ceph-grafana-trigger/build/build                            | 5 ++---
 .../config/definitions/ceph-grafana-trigger.yml             | 6 +-----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ceph-grafana-trigger/build/build b/ceph-grafana-trigger/build/build
index 987e6377..65a84fd4 100644
--- a/ceph-grafana-trigger/build/build
+++ b/ceph-grafana-trigger/build/build
@@ -1,12 +1,11 @@
 #!/bin/bash -ex
 
-CONTAINER_VERSION=${CONTAINER_VERSION:-8.2.6}
+CONTAINER_VERSION=${CONTAINER_VERSION:-8.3.5}
 CONTAINER=ceph/ceph-grafana:${CONTAINER_VERSION}
 sudo dnf install -y podman
-sudo podman login docker.io -u ${DOCKER_HUB_USERNAME} -p ${DOCKER_HUB_PASSWORD}
 sudo podman login quay.io -u ${CONTAINER_REPO_USERNAME} -p ${CONTAINER_REPO_PASSWORD}
 
-for repohost in quay.io docker.io; do
+for repohost in quay.io; do
         sudo podman rmi -f grafana:${CONTAINER_VERSION}-combined ${repohost}/${CONTAINER}-x86_64 ${repohost}/${CONTAINER}-aarch64  || true
 
         sudo podman pull ${repohost}/${CONTAINER}-x86_64
diff --git a/ceph-grafana-trigger/config/definitions/ceph-grafana-trigger.yml b/ceph-grafana-trigger/config/definitions/ceph-grafana-trigger.yml
index 1cd8923d..ee7ebf1a 100644
--- a/ceph-grafana-trigger/config/definitions/ceph-grafana-trigger.yml
+++ b/ceph-grafana-trigger/config/definitions/ceph-grafana-trigger.yml
@@ -23,7 +23,7 @@
       - string:
           name: CONTAINER_VERSION
           description: "The version tag for the containers; will have -ARCH added to it.  By convention, the version of Grafana"
-          default: "8.2.6"
+          default: "8.3.5"
     axes:
         - axis:
             type: label-expression
@@ -50,10 +50,6 @@
           global: true
           mask-password-params: true
       - credentials-binding:
-          - username-password-separated:
-              credential-id: docker-hub-leseb
-              username: DOCKER_HUB_USERNAME
-              password: DOCKER_HUB_PASSWORD
           - username-password-separated:
               credential-id: dmick-quay
               username: CONTAINER_REPO_USERNAME
-- 
2.39.5