From 1ca5c4d5f00dcef97e2a270d2fe229a94e64f96d Mon Sep 17 00:00:00 2001
From: dan-j <5727701+dan-j@users.noreply.github.com>
Date: Thu, 4 Nov 2021 11:03:41 +0000
Subject: [PATCH] fix: add root CA bundle to docker image (#591)

Signed-off-by: dan-j <5727701+dan-j@users.noreply.github.com>
---
 Dockerfile                                    |  6 ++++++
 .../dashboards/DashboardFromGrafana.yaml      |  5 +++--
 hack/clean_e2e.sh                             |  1 +
 hack/e2e.sh                                   | 21 ++++++++++++++++---
 4 files changed, 28 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 hack/e2e.sh

diff --git a/Dockerfile b/Dockerfile
index fc46549bc..26cc3e27b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,13 @@ COPY version/ version/
 # Build
 RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -a -o manager main.go
 
+FROM --platform=${TARGETPLATFORM} registry.access.redhat.com/ubi8/ubi-minimal:8.4 as ubi-minimal
+
 FROM --platform=${TARGETPLATFORM} registry.access.redhat.com/ubi8/ubi-micro:8.4
+
+# copy Root CA bundle from ubi-minimal
+COPY --from=ubi-minimal /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.crt
+
 WORKDIR /
 COPY --from=builder /workspace/manager .
 
diff --git a/deploy/examples/dashboards/DashboardFromGrafana.yaml b/deploy/examples/dashboards/DashboardFromGrafana.yaml
index 34c78881d..22601f7ea 100644
--- a/deploy/examples/dashboards/DashboardFromGrafana.yaml
+++ b/deploy/examples/dashboards/DashboardFromGrafana.yaml
@@ -6,5 +6,6 @@ metadata:
     app: grafana
 spec:
   grafanaCom:
-    id: 10441
-    revision: 1
+    id: 1860
+    revision: 23
+  json: ""
diff --git a/hack/clean_e2e.sh b/hack/clean_e2e.sh
index 6309d61e3..e5c9c6bd0 100644
--- a/hack/clean_e2e.sh
+++ b/hack/clean_e2e.sh
@@ -7,6 +7,7 @@ DEBUG_FILE="/tmp/grafana_e2e_debug.txt"
 kubectl delete -f deploy/examples/Grafana.yaml -n $NAMESPACE
 
 kubectl delete -f deploy/examples/dashboards/SimpleDashboard.yaml -n $NAMESPACE
+kubectl delete -f deploy/examples/dashboards/DashboardFromGrafana.yaml -n $NAMESPACE
 kubectl delete -f deploy/examples/datasources/Prometheus.yaml -n $NAMESPACE
 
 sleep 2
diff --git a/hack/e2e.sh b/hack/e2e.sh
old mode 100644
new mode 100755
index a048e7791..10e0803dc
--- a/hack/e2e.sh
+++ b/hack/e2e.sh
@@ -71,6 +71,7 @@ PASSWORD=$(kubectl -n $NAMESPACE get secrets grafana-admin-credentials --templat
 
 # Create some base dashboard & datasource
 kubectl apply -f deploy/examples/dashboards/SimpleDashboard.yaml -n $NAMESPACE
+kubectl apply -f deploy/examples/dashboards/DashboardFromGrafana.yaml -n $NAMESPACE
 kubectl apply -f deploy/examples/datasources/Prometheus.yaml -n $NAMESPACE
 
 # Verify that the grafana dashboard exist
@@ -84,11 +85,25 @@ FPID=$!
 sleep 5
 curl localhost:3000/api/health
 sleep 5
-DASHBOARDOUTPUT=$(curl $HEADER "http://admin:$PASSWORD@localhost:3000/api/search?folderIds=0&query=&starred=false")
+
+# get top-level folders
+DASHBOARDOUTPUT=$(curl $HEADER "http://admin:$PASSWORD@localhost:3000/api/search?folderIds=0")
 sleep 1
-GRAFANAUID=$(echo $DASHBOARDOUTPUT |jq -r '.[0].uid')
+echo "DASHBOARDOUTPUT: $(cat ${DASHBOARDOUTPUT} | jq)"
+
+# get folder ID
+GRAFANA_TOP_FOLDER_ID=$(echo $DASHBOARDOUTPUT |jq -r '.[0].id')
 sleep 1
-GRAFANA_DASHBOARD=$(curl $HEADER "http://admin:$PASSWORD@localhost:3000/api/dashboards/uid/$GRAFANAUID")
+
+GRAFANA_DASHBOARDS=$(curl $HEADER "http://admin:$PASSWORD@localhost:3000/api/search?folderIds=$GRAFANA_TOP_FOLDER_ID")
+NUM_DASHBOARDS=$(echo $GRAFANA_DASHBOARDS | jq -r length)
+if [[ $NUM_DASHBOARDS != 2 ]]; then
+  echo "NUM_DASHBOARDS: want 2, got $NUM_DASHBOARDS"
+  echo "Available dashboards: ${GRAFANA_DASHBOARDS}" >> $DEBUG_FILE
+  exit 1
+fi
+
+GRAFANA_DASHBOARDS=$(curl $HEADER "http://admin:$PASSWORD@localhost:3000/api/dashboards/uid/$GRAFANA_TOP_FOLDER_ID")
 sleep 1
 FOLDER_ID=$(echo $GRAFANA_DASHBOARD |jq -r .meta.folderId)
 if [[ $FOLDER_ID != 0 ]]; then