Adds support to run ceph commands from must-gather pod

This commit adds support to run ceph-commands from must-gather pod which removes the dependency of toolbox pod from must-gather.

Signed-off-by: Ashish Ranjan <[email protected]>

Author: Ashish Ranjan

hack/latest-csv-checksum.md5

@@ -1 +1 @@
-0166608856098a960a4e84e5214c978c
+d8545861e1bf12354a6b531126f18d71

must-gather/Centos-Base.repo

@@ -0,0 +1,6 @@
+[centos]
+name=CentOS-7
+baseurl=http://ftp.heanet.ie/pub/centos/7/os/x86_64/
+enabled=1
+gpgcheck=1
+gpgkey=http://ftp.heanet.ie/pub/centos/7/os/x86_64/RPM-GPG-KEY-CentOS-7

must-gather/Dockerfile

@@ -1,9 +1,39 @@
 FROM quay.io/openshift/origin-must-gather:latest
 
+RUN sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/subscription-manager.conf \
+    && cat /etc/yum/pluginconf.d/subscription-manager.conf \
+    && sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/ovl.conf && cat /etc/yum/pluginconf.d/ovl.conf \
+    && sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/product-id.conf && cat /etc/yum/pluginconf.d/product-id.conf \
+    && sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/search-disabled-repos.conf && cat /etc/yum/pluginconf.d/search-disabled-repos.conf \
+    && rm -rf /etc/yum.repos.d/*
+
+COPY Centos-Base.repo  /etc/yum.repos.d/
+
+RUN rpm --import 'https://download.ceph.com/keys/release.asc'
+
+RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+
+RUN su -c 'rpm -Uvh https://download.ceph.com/rpm-luminous/el7/noarch/ceph-release-1-0.el7.noarch.rpm'
+
+RUN yum install -y \ 
+    http://mirror.centos.org/centos/7/extras/x86_64/Packages/python-werkzeug-0.9.1-2.el7.noarch.rpm \
+    http://mirror.centos.org/centos/7/extras/x86_64/Packages/python-itsdangerous-0.23-2.el7.noarch.rpm \
+    http://mirror.centos.org/centos/7/os/x86_64/Packages/audit-libs-python-2.8.5-4.el7.x86_64.rpm \
+    http://mirror.centos.org/centos/7/os/x86_64/Packages/cryptsetup-2.0.3-5.el7.x86_64.rpm \
+    http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/l/libbabeltrace-1.2.4-3.el7.x86_64.rpm \
+    http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/l/leveldb-1.12.0-11.el7.x86_64.rpm \
+    http://mirror.centos.org/centos/7/extras/x86_64/Packages/python-flask-0.10.1-4.el7.noarch.rpm \
+    http://mirror.centos.org/centos/7/os/x86_64/Packages/device-mapper-event-1.02.158-2.el7.x86_64.rpm \
+    http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/l/lttng-ust-2.4.1-4.el7.x86_64.rpm \
+    ceph
+
 # Save original gather script
 RUN mv /usr/bin/gather /usr/bin/gather_original
 
 # copy all collection scripts to /usr/bin
 COPY collection-scripts/* /usr/bin/
 
-ENTRYPOINT /usr/bin/gather
+RUN mkdir /templates
+COPY templates /templates
+
+ENTRYPOINT /usr/bin/gather

must-gather/collection-scripts/gather_ceph_resources

@@ -8,6 +8,34 @@ if [[ ${BASE_COLLECTION_PATH} == "" ]]; then
 fi
 
 CEPH_COLLLECTION_PATH="${BASE_COLLECTION_PATH}/ceph"
+CEPH_MON_SECRET_NAME="rook-ceph-mon"
+CEPH_MON_CONFIGMAP_NAME="rook-ceph-mon-endpoints"
+KEYRING_FILE="/etc/ceph/keyring"
+CEPH_CONFIG_FILE="/etc/ceph/ceph.conf"
+CEPH_CONFIG_TEMPLATE="/templates/ceph.conf.template"
+CEPH_KEYRING_TEMPLATE="/templates/keyring.template"
+
+generate_config() {
+    namespace=$1
+    # Check if the mon secrets exists
+    secretName=`oc get secrets -n $namespace $CEPH_MON_SECRET_NAME -o jsonpath="{.metadata.name}"`
+    if [ -z ${secretName} ]; then 
+        echo 1
+    fi 
+    adminKey=`oc get secrets -n $namespace $CEPH_MON_SECRET_NAME -o jsonpath="{.data.admin-secret}" | base64 --decode`
+    configMapName=`oc get configmap -n $namespace $CEPH_MON_CONFIGMAP_NAME -o jsonpath="{.metadata.name}"`
+    if [ -z ${configMapName} ]; then
+        echo 1
+    fi
+    monEndPoints=`oc get configmap -n $namespace $CEPH_MON_CONFIGMAP_NAME -o jsonpath="{.data.data}"`
+    monEndPoints=`echo ${monEndPoints} | sed "s/[a-z]\+=//g" | sed "s/rook-ceph-mon[0-9]\+=//g"`
+
+    # creating admin keyring
+    cat ${CEPH_KEYRING_TEMPLATE} | sed "s/REPLACE_WITH_KEYRING/${adminKey}/g" > ${KEYRING_FILE}
+    cat ${CEPH_CONFIG_TEMPLATE} | sed "s/REPLACE_WITH_MON_ENDPOINTS/${monEndPoints}/g" | sed "s/REPLACE_WITH_KEYRING_PATH/${KEYRING_FILE//\//\\/}/g" > ${CEPH_CONFIG_FILE}
+    
+    echo 0
+}
 
 # Ceph resources
 ceph_resources=()
@@ -50,29 +78,30 @@ done
 # Inspecting the namespace where ceph-cluster is installed
 for ns in $(oc get cephcluster --all-namespaces --no-headers | awk '{print $1}'); do
     openshift-must-gather --base-dir=${CEPH_COLLLECTION_PATH} inspect ns/${ns}
+    if [ $(generate_config ${ns}) -eq 1 ]; then 
+        continue
+    fi
+    COMMAND_OUTPUT_DIR=${CEPH_COLLLECTION_PATH}/namespaces/${ns}/must_gather_commands
+    COMMAND_JSON_OUTPUT_DIR=${CEPH_COLLLECTION_PATH}/namespaces/${ns}/must_gather_commands/json_output
+    mkdir -p ${COMMAND_OUTPUT_DIR}
+    mkdir -p ${COMMAND_JSON_OUTPUT_DIR}
+    for ((i = 0; i < ${#ceph_commands[@]}; i++)); do
+        printf "collecting command output for: %s\n"  "${ceph_commands[$i]}"
+        COMMAND_OUTPUT_FILE=${COMMAND_OUTPUT_DIR}/${ceph_commands[$i]// /_}
+        ${ceph_commands[$i]} --connect-timeout=15 >> ${COMMAND_OUTPUT_FILE}
+        JSON_COMMAND_OUTPUT_FILE=${COMMAND_JSON_OUTPUT_DIR}/${ceph_commands[$i]// /_}_--format_json-pretty
+        ${ceph_commands[$i]} --connect-timeout=15 --format json-pretty >> ${JSON_COMMAND_OUTPUT_FILE}
+    done
 
-    # Running ceph commands in the toolbox
-    toolbox_pod_name=`oc get po -n ${ns} -l app=rook-ceph-tools -o jsonpath='{.items[*].metadata.name}'`
-    if [ ! -z ${toolbox_pod_name} ]; then
-        toolbox_pod_status=`oc get po -n ${ns} -l app=rook-ceph-tools -o jsonpath='{.items[*].status.phase}'`
-        if [ "$toolbox_pod_status" != "Running" ]; then
-            exit 0;
-        fi
-        COMMAND_OUTPUT_DIR=${CEPH_COLLLECTION_PATH}/namespaces/${ns}/must_gather_commands
-        COMMAND_JSON_OUTPUT_DIR=${CEPH_COLLLECTION_PATH}/namespaces/${ns}/must_gather_commands/json_output
-        mkdir -p ${COMMAND_OUTPUT_DIR}
-        mkdir -p ${COMMAND_JSON_OUTPUT_DIR}
-        for ((i = 0; i < ${#ceph_commands[@]}; i++)); do
-            printf "collecting command output for: %s\n"  "${ceph_commands[$i]}"
-            COMMAND_OUTPUT_FILE=${COMMAND_OUTPUT_DIR}/${ceph_commands[$i]// /_}
-            oc -n ${ns} exec ${toolbox_pod_name} -- ${ceph_commands[$i]} >> ${COMMAND_OUTPUT_FILE}
-            JSON_COMMAND_OUTPUT_FILE=${COMMAND_JSON_OUTPUT_DIR}/${ceph_commands[$i]// /_}_--format_json-pretty
-            oc -n ${ns} exec ${toolbox_pod_name} -- ${ceph_commands[$i]} --format json-pretty >> ${JSON_COMMAND_OUTPUT_FILE}
-        done
-        for ((i = 0; i < ${#ceph_volume_commands[@]}; i++)); do
-            printf "collecting command output for: %s\n"  "${ceph_volume_commands[$i]}"
+    for ((i = 0; i < ${#ceph_volume_commands[@]}; i++)); do
+        printf "collecting command output for: %s\n"  "${ceph_volume_commands[$i]}"
+        for osdPod in $(oc get pods -n ${ns} -l app=rook-ceph-osd --no-headers | awk '{print $1}'); do
+            pod_status=`oc get po ${osdPod} -n ${ns} -o jsonpath='{.status.phase}'`
+            if [ "${pod_status}" != "Running" ]; then
+                continue
+            fi
             COMMAND_OUTPUT_FILE=${COMMAND_OUTPUT_DIR}/${ceph_volume_commands[$i]// /_}
-            oc -n ${ns} exec ${toolbox_pod_name} -- ${ceph_volume_commands[$i]} >> ${COMMAND_OUTPUT_FILE}
+            oc -n ${ns} exec ${osdPod} -- ${ceph_volume_commands[$i]} >> ${COMMAND_OUTPUT_FILE}
         done
-    fi
+    done
 done

must-gather/templates/ceph.conf.template

@@ -0,0 +1,4 @@
+[global]
+mon_host = REPLACE_WITH_MON_ENDPOINTS
+[client.admin]
+keyring = REPLACE_WITH_KEYRING_PATH

must-gather/templates/keyring.template

@@ -0,0 +1,2 @@
+[client.admin]
+key = REPLACE_WITH_KEYRING