Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow defining product namespace instead of prefix #53

Merged
merged 4 commits into from
Jan 14, 2020
Merged

Allow defining product namespace instead of prefix #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c68b95d
Allow defining product namespace instead of prefix
matskiv Dec 18, 2019
a54eeb7
Improve CodeReady pod filtering
matskiv Dec 23, 2019
403ee2e
Ignore jwtproxy pods in codeready pv backup
KevFan Jan 3, 2020
9ee9173
Merge pull request #1 from KevFan/ignore-codeready-jwtproxy-pods
matskiv Jan 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions image/tools/lib/component/3scale-redis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@ function save {
}

function component_dump_data {
if [[ -z "${PRODUCT_NAMESPACE:-}" ]]; then
PRODUCT_NAMESPACE="${PRODUCT_NAMESPACE_PREFIX}3scale"
fi
save
local ts=$(date '+%H_%M_%S')
dest_file="$1/archives/dump-${ts}.rdb"
dump_rdb_path="/var/lib/redis/data/dump.rdb"

oc projects
redis_pod_name=$(oc get pods -l deploymentConfig=backend-redis -o name -n ${PRODUCT_NAMESPACE_PREFIX}3scale | sed -e 's/^pod\///')
redis_pod_name=$(oc get pods -l deploymentConfig=backend-redis -o name -n ${PRODUCT_NAMESPACE} | sed -e 's/^pod\///')

cp_pod_data "${PRODUCT_NAMESPACE_PREFIX}3scale/${redis_pod_name}:${dump_rdb_path}" "${dest_file}"
cp_pod_data "${PRODUCT_NAMESPACE}/${redis_pod_name}:${dump_rdb_path}" "${dest_file}"
}
7 changes: 5 additions & 2 deletions image/tools/lib/component/codeready_pv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ function dump_pod_data {
workspace_pod_name=$1
dump_dest=$2
workspace_id=$(echo ${workspace_pod_name} | awk -F"." '{ print $1}')
cp_pod_data "${PRODUCT_NAMESPACE_PREFIX}codeready/${workspace_pod_name}:/projects" "${dump_dest}/${workspace_id}"
cp_pod_data "${PRODUCT_NAMESPACE}/${workspace_pod_name}:/projects" "${dump_dest}/${workspace_id}"
}

function component_dump_data {
local pods="$(oc get pods -n ${PRODUCT_NAMESPACE_PREFIX}codeready | grep workspace | awk '{print $1}')"
if [[ -z "${PRODUCT_NAMESPACE:-}" ]]; then
PRODUCT_NAMESPACE="${PRODUCT_NAMESPACE_PREFIX}codeready"
fi
local pods="$(oc get pods -n ${PRODUCT_NAMESPACE} --no-headers=true -l "che.workspace_id,che.original_name notin (che-jwtproxy)" | awk '{print $1}')"
if [ "${#pods}" -eq "0" ]; then
echo "=>> No workspaces found to backup"
exit 0
Expand Down
7 changes: 5 additions & 2 deletions image/tools/lib/component/enmasse_pv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ${PRODUCT_NAMESPACE_PREFIX}enmasse -o jsonpath='{.items[*].metadata.name}'`"
echo "`oc get pods --selector='role=broker' -n ${PRODUCT_NAMESPACE} -o jsonpath='{.items[*].metadata.name}'`"
}

function dump_pod_data {
Expand All @@ -12,9 +12,12 @@ function dump_pod_data {

# Create a backup directory for every pod with the same name
# as the pod
cp_pod_data "${PRODUCT_NAMESPACE_PREFIX}enmasse/${pod}:${data_dir}" "${dest}/${pod}"
cp_pod_data "${PRODUCT_NAMESPACE}/${pod}:${data_dir}" "${dest}/${pod}"
}
function component_dump_data {
if [[ -z "${PRODUCT_NAMESPACE:-}" ]]; then
PRODUCT_NAMESPACE="${PRODUCT_NAMESPACE_PREFIX}enmasse"
fi
local archive_path="$1/archives"
local dump_dest="/tmp/enmasse-data"
local pods=$(get_broker_pods)
Expand Down