Merge pull request #36 from matskiv/INTLY-1493

INTLY-1493 - Add parameter for namespace prefix
integr8ly · Mar 26, 2019 · 0c5153b · 0c5153b
2 parents d51e926 + ef9ca69
commit 0c5153b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/image/tools/lib/component/3scale-redis.sh b/image/tools/lib/component/3scale-redis.sh
@@ -4,6 +4,6 @@ function component_dump_data {
     dump_rdb_path="/var/lib/redis/data/dump.rdb"
 
     oc projects
-    redis_pod_name=$(oc get pods -l deploymentConfig=backend-redis -o name -n 3scale | sed -e 's/^pod\///')
-    cp_pod_data "3scale/${redis_pod_name}:${dump_rdb_path}" "${dest_file}"
+    redis_pod_name=$(oc get pods -l deploymentConfig=backend-redis -o name -n ${PRODUCT_NAMESPACE_PREFIX}3scale | sed -e 's/^pod\///')
+    cp_pod_data "${PRODUCT_NAMESPACE_PREFIX}3scale/${redis_pod_name}:${dump_rdb_path}" "${dest_file}"
 }
diff --git a/image/tools/lib/component/codeready_pv.sh b/image/tools/lib/component/codeready_pv.sh
@@ -4,11 +4,11 @@ function dump_pod_data {
     workspace_pod_name=$1
     dump_dest=$2
     workspace_id=$(echo ${workspace_pod_name} | awk -F"." '{ print $1}')
-    cp_pod_data "codeready/${workspace_pod_name}:/projects" "${dump_dest}/${workspace_id}"
+    cp_pod_data "${PRODUCT_NAMESPACE_PREFIX}codeready/${workspace_pod_name}:/projects" "${dump_dest}/${workspace_id}"
 }
 
 function component_dump_data {
-    workspace_pods=$(oc get pods -n codeready | grep workspace | awk '{print $1}')
+    workspace_pods=$(oc get pods -n ${PRODUCT_NAMESPACE_PREFIX}codeready | grep workspace | awk '{print $1}')
 
     if [ ${#workspace_pods} = 0 ]
     then

diff --git a/image/tools/lib/component/enmasse_pv.sh b/image/tools/lib/component/enmasse_pv.sh
@@ -2,7 +2,7 @@
 
 # Brokered pods have a storage PV attached. They are labelled with role=broker
 function get_broker_pods {
-    echo "`oc get pods --selector='role=broker' -n enmasse -o jsonpath='{.items[*].metadata.name}'`"
+    echo "`oc get pods --selector='role=broker' -n ${PRODUCT_NAMESPACE_PREFIX}enmasse -o jsonpath='{.items[*].metadata.name}'`"
 }
 
 function dump_pod_data {
@@ -12,7 +12,7 @@ function dump_pod_data {
 
     # Create a backup directory for every pod with the same name
     # as the pod
-    cp_pod_data "enmasse/${pod}:${data_dir}" "${dest}/${pod}"
+    cp_pod_data "${PRODUCT_NAMESPACE_PREFIX}enmasse/${pod}:${data_dir}" "${dest}/${pod}"
 }
 function component_dump_data {
     local archive_path="$1/archives"

diff --git a/templates/openshift/backup-cronjob-template.yaml b/templates/openshift/backup-cronjob-template.yaml
@@ -54,6 +54,8 @@ objects:
                       value: "${COMPONENT_SECRET_NAMESPACE}"
                     - name: PRODUCT_NAME
                       value: "${PRODUCT_NAME}"
+                    - name: PRODUCT_NAMESPACE_PREFIX
+                      value: "${PRODUCT_NAMESPACE_PREFIX}"
               restartPolicy: Never
 parameters:
   - name: NAME
@@ -65,6 +67,9 @@ parameters:
   - name: COMPONENT
     description: Component name to run the backup
     required: true
+  - name: PRODUCT_NAMESPACE_PREFIX
+    description: Namespace prefix for individual product namespaces. Empty by default. Planned to be 'openshift-' for RHMI.
+    value: ''
   - name: BACKEND
     description: Backend engine to upload the component archive
     value: s3

diff --git a/templates/openshift/backup-job-template.yaml b/templates/openshift/backup-job-template.yaml
@@ -51,6 +51,8 @@ objects:
                   value: "${COMPONENT_SECRET_NAMESPACE}"
                 - name: PRODUCT_NAME
                   value: "${PRODUCT_NAME}"
+                - name: PRODUCT_NAMESPACE_PREFIX
+                  value: "${PRODUCT_NAMESPACE_PREFIX}"
           restartPolicy: Never
 parameters:
   - name: NAME
@@ -62,6 +64,9 @@ parameters:
   - name: COMPONENT
     description: Component name to run the backup
     required: true
+  - name: PRODUCT_NAMESPACE_PREFIX
+    description: Namespace prefix for individual product namespaces. Empty by default. Planned to be 'openshift-' for RHMI.
+    value: ''
   - name: BACKEND
     description: Backend engine to upload the component archive
     value: s3