From eabe01ffbdd6c48ccac8febad6c7e5866b0e1645 Mon Sep 17 00:00:00 2001
From: Matthieu Leroux <matthieulrx@nl.ibm.com>
Date: Thu, 14 Mar 2024 12:00:40 +0100
Subject: [PATCH 1/2] [minor] - add must gather for DRO

---
 image/cli/mascli/functions/must_gather      |  9 +++++
 image/cli/mascli/must-gather/mg-summary-dro | 39 +++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 image/cli/mascli/must-gather/mg-summary-dro

diff --git a/image/cli/mascli/functions/must_gather b/image/cli/mascli/functions/must_gather
index bf592642c8..106cc9ae96 100644
--- a/image/cli/mascli/functions/must_gather
+++ b/image/cli/mascli/functions/must_gather
@@ -253,6 +253,15 @@ function mustgather() {
       echo_highlight "Unable to find db2u namespace"
     fi
 
+    echo_h3 "IBM Data Reporter Operator"
+    NAMESPACE_LOOKUP=$(oc get namespace redhat-marketplace --ignore-not-found)
+    if [[ "$NAMESPACE_LOOKUP" != "" ]]; then
+      $MG_SCRIPT_DIR/mg-summary-dro &> ${OUTPUT_DIR}/dro.txt
+      genericMustGather redhat-marketplace DataReporterConfig,MarketplaceConfig,MeterReport,MeterBase,RazeeDeployment,MeterDefinition
+    else
+      echo_highlight "Unable to find redhat-marketplace namespace"
+    fi
+
     MONGOCE_NAMESPACES=$(oc get mongodbcommunity --all-namespaces --ignore-not-found -o jsonpath='{.items[*].metadata.namespace}')
     for MONGOCE_NAMESPACE in $MONGOCE_NAMESPACES
     do
diff --git a/image/cli/mascli/must-gather/mg-summary-dro b/image/cli/mascli/must-gather/mg-summary-dro
new file mode 100644
index 0000000000..35b343aa50
--- /dev/null
+++ b/image/cli/mascli/must-gather/mg-summary-dro
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+echo "IBM Date Reporter Operator - DataReporterConfig"
+echo "--------------------------------------------------------------------------------"
+oc -n redhat-marketplace get DataReporterConfig
+echo ""
+
+echo ""
+echo "IBM Date Reporter Operator - MarketplaceConfig"
+echo "--------------------------------------------------------------------------------"
+oc -n redhat-marketplace get MarketplaceConfig
+echo ""
+
+echo ""
+echo "IBM Date Reporter Operator - MeterReport"
+echo "--------------------------------------------------------------------------------"
+oc -n redhat-marketplace get MeterReport
+echo ""
+
+echo ""
+echo "IBM Date Reporter Operator - MeterBase"
+echo "--------------------------------------------------------------------------------"
+oc -n redhat-marketplace get MeterBase
+echo ""
+
+echo ""
+echo "IBM Date Reporter Operator - RazeeDeployment"
+echo "--------------------------------------------------------------------------------"
+oc -n redhat-marketplace get RazeeDeployment
+echo ""
+
+echo ""
+echo "IBM Date Reporter Operator - MeterDefinition"
+echo "--------------------------------------------------------------------------------"
+oc -n redhat-marketplace get MeterDefinition
+echo ""
+
+
+exit 0

From 54c03bf18c5a8ece907d58ba800c9e8de500d9f9 Mon Sep 17 00:00:00 2001
From: Matthieu Leroux <matthieulrx@nl.ibm.com>
Date: Thu, 14 Mar 2024 14:30:39 +0100
Subject: [PATCH 2/2] [minor] - add must gather for RH cert manager

---
 image/cli/mascli/functions/must_gather        | 17 +++++++
 .../must-gather/mg-summary-cert-manager       | 45 +++++++++++++++++++
 image/cli/mascli/must-gather/mg-summary-dro   | 12 ++---
 3 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100644 image/cli/mascli/must-gather/mg-summary-cert-manager

diff --git a/image/cli/mascli/functions/must_gather b/image/cli/mascli/functions/must_gather
index 106cc9ae96..19e13037bf 100644
--- a/image/cli/mascli/functions/must_gather
+++ b/image/cli/mascli/functions/must_gather
@@ -262,6 +262,23 @@ function mustgather() {
       echo_highlight "Unable to find redhat-marketplace namespace"
     fi
 
+    echo_h3 "Red Hat Certificate Manager"
+    NAMESPACE_LOOKUP=$(oc get namespace cert-manager-operator --ignore-not-found)
+    if [[ "$NAMESPACE_LOOKUP" != "" ]]; then
+      $MG_SCRIPT_DIR/mg-summary-cert-manager &> ${OUTPUT_DIR}/cert-manager.txt
+      genericMustGather cert-manager-operator CertificateRequest,Certificate,Challenge,ClusterIssuer,Issuer,Order,CertManager
+    else
+      echo_highlight "Unable to find cert-manager-operator namespace"
+    fi
+
+    NAMESPACE_LOOKUP=$(oc get namespace cert-manager --ignore-not-found)
+    if [[ "$NAMESPACE_LOOKUP" != "" ]]; then
+      genericMustGather cert-manager
+    else
+      echo_highlight "Unable to find cert-manager namespace"
+    fi
+
+
     MONGOCE_NAMESPACES=$(oc get mongodbcommunity --all-namespaces --ignore-not-found -o jsonpath='{.items[*].metadata.namespace}')
     for MONGOCE_NAMESPACE in $MONGOCE_NAMESPACES
     do
diff --git a/image/cli/mascli/must-gather/mg-summary-cert-manager b/image/cli/mascli/must-gather/mg-summary-cert-manager
new file mode 100644
index 0000000000..2f5e811daa
--- /dev/null
+++ b/image/cli/mascli/must-gather/mg-summary-cert-manager
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+echo "Certificate Manager - CertificateRequest"
+echo "--------------------------------------------------------------------------------"
+oc -n cert-manager-operator get CertificateRequest
+echo ""
+
+echo ""
+echo "Certificate Manager - Certificate"
+echo "--------------------------------------------------------------------------------"
+oc -n cert-manager-operator get Certificate
+echo ""
+
+echo ""
+echo "Certificate Manager - Challenge"
+echo "--------------------------------------------------------------------------------"
+oc -n cert-manager-operator get Challenge
+echo ""
+
+echo ""
+echo "Certificate Manager - ClusterIssuer"
+echo "--------------------------------------------------------------------------------"
+oc -n cert-manager-operator get ClusterIssuer
+echo ""
+
+echo ""
+echo "Certificate Manager - Issuer"
+echo "--------------------------------------------------------------------------------"
+oc -n cert-manager-operator get Issuer
+echo ""
+
+echo ""
+echo "Certificate Manager - Order"
+echo "--------------------------------------------------------------------------------"
+oc -n cert-manager-operator get Order
+echo ""
+
+echo ""
+echo "Certificate Manager - CertManager"
+echo "--------------------------------------------------------------------------------"
+oc -n cert-manager-operator get CertManager
+echo ""
+
+
+exit 0
diff --git a/image/cli/mascli/must-gather/mg-summary-dro b/image/cli/mascli/must-gather/mg-summary-dro
index 35b343aa50..d70e88b3f3 100644
--- a/image/cli/mascli/must-gather/mg-summary-dro
+++ b/image/cli/mascli/must-gather/mg-summary-dro
@@ -1,36 +1,36 @@
 #!/bin/bash
 
-echo "IBM Date Reporter Operator - DataReporterConfig"
+echo "IBM Data Reporter Operator - DataReporterConfig"
 echo "--------------------------------------------------------------------------------"
 oc -n redhat-marketplace get DataReporterConfig
 echo ""
 
 echo ""
-echo "IBM Date Reporter Operator - MarketplaceConfig"
+echo "IBM Data Reporter Operator - MarketplaceConfig"
 echo "--------------------------------------------------------------------------------"
 oc -n redhat-marketplace get MarketplaceConfig
 echo ""
 
 echo ""
-echo "IBM Date Reporter Operator - MeterReport"
+echo "IBM Data Reporter Operator - MeterReport"
 echo "--------------------------------------------------------------------------------"
 oc -n redhat-marketplace get MeterReport
 echo ""
 
 echo ""
-echo "IBM Date Reporter Operator - MeterBase"
+echo "IBM Data Reporter Operator - MeterBase"
 echo "--------------------------------------------------------------------------------"
 oc -n redhat-marketplace get MeterBase
 echo ""
 
 echo ""
-echo "IBM Date Reporter Operator - RazeeDeployment"
+echo "IBM Data Reporter Operator - RazeeDeployment"
 echo "--------------------------------------------------------------------------------"
 oc -n redhat-marketplace get RazeeDeployment
 echo ""
 
 echo ""
-echo "IBM Date Reporter Operator - MeterDefinition"
+echo "IBM Data Reporter Operator - MeterDefinition"
 echo "--------------------------------------------------------------------------------"
 oc -n redhat-marketplace get MeterDefinition
 echo ""