From a5b8bd3a128764077148d8d6998f19f80f583981 Mon Sep 17 00:00:00 2001
From: Julien Leduc <julien.leduc@cern.ch>
Date: Thu, 9 Feb 2017 20:50:12 +0100
Subject: [PATCH] Using lower case only for configmap keys as Eric had a
problem with upper case with the same kubectl binary... Will be fine for
everyone this way.
---
.../orchestration/create_instance.sh | 14 +++++++-------
continuousintegration/orchestration/pod-init.yaml | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/continuousintegration/orchestration/create_instance.sh b/continuousintegration/orchestration/create_instance.sh
index abe7b6f650..480884554a 100755
--- a/continuousintegration/orchestration/create_instance.sh
+++ b/continuousintegration/orchestration/create_instance.sh
@@ -7,8 +7,8 @@ config_database="./database-sqlite.yaml"
# By default keep Database and keep Objectstore
# default should not make user loose data if he forgot the option
-keepDatabase=1
-keepObjectstore=1
+keepdatabase=1
+keepobjectstore=1
usage() { cat <<EOF 1>&2
Usage: $0 -n <namespace> [-o <objectstore_configmap>] [-d <database_configmap>] [-p <gitlab pipeline ID>] [-D] [-O]
@@ -37,10 +37,10 @@ while getopts "n:o:d:p:DO" o; do
pipelineid=${OPTARG}
;;
O)
- keepObjectstore=0
+ keepobjectstore=0
;;
D)
- keepDatabase=0
+ keepdatabase=0
;;
*)
usage
@@ -78,13 +78,13 @@ if [ ! -z "${error}" ]; then
exit 1
fi
-if [ $keepDatabase == 1 ] ; then
+if [ $keepdatabase == 1 ] ; then
echo "DB content will be kept"
else
echo "DB content will be wiped"
fi
-if [ $keepObjectstore == 1 ] ; then
+if [ $keepobjectstore == 1 ] ; then
echo "objecstore content will be kept"
else
echo "objectstore content will be wiped"
@@ -96,7 +96,7 @@ echo "Creating ${instance} instance"
kubectl create namespace ${instance} || exit 1
-kubectl --namespace ${instance} create configmap init --from-literal=keepDatabase=${keepDatabase} --from-literal=keepObjectstore=${keepObjectstore}
+kubectl --namespace ${instance} create configmap init --from-literal=keepdatabase=${keepdatabase} --from-literal=keepobjectstore=${keepobjectstore}
echo "creating configmaps in instance"
diff --git a/continuousintegration/orchestration/pod-init.yaml b/continuousintegration/orchestration/pod-init.yaml
index 7a5a48eb58..6229a341a6 100644
--- a/continuousintegration/orchestration/pod-init.yaml
+++ b/continuousintegration/orchestration/pod-init.yaml
@@ -25,12 +25,12 @@ spec:
valueFrom:
configMapKeyRef:
name: init
- key: keepDatabase
+ key: keepdatabase
- name: KEEP_OBJECTSTORE
valueFrom:
configMapKeyRef:
name: init
- key: keepObjectstore
+ key: keepobjectstore
command: ['/opt/run/bin/init.sh']
args: ["none"]
volumeMounts:
--
GitLab