aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/oneclick
diff options
context:
space:
mode:
authorBorislav Glozman <Borislav.Glozman@amdocs.com>2017-07-24 10:45:28 +0300
committerBorislav Glozman <Borislav.Glozman@amdocs.com>2017-08-03 13:05:45 +0000
commit5197e2e88144a536068fb75e912f91b20e39db2e (patch)
tree965bdfc496c5eef1286680996051afe8aba577c5 /kubernetes/oneclick
parent097208524f1954a08e3c6d82d15bb4090678b2ed (diff)
[OOM-3] Docker credentials secret missing
Change-Id: I30df3cc11315b757a1d3e3da832681682a970825 Signed-off-by: Borislav Glozman <Borislav.Glozman@amdocs.com>
Diffstat (limited to 'kubernetes/oneclick')
-rwxr-xr-xkubernetes/oneclick/createAll.bash19
-rwxr-xr-xkubernetes/oneclick/deleteAll.bash23
-rw-r--r--kubernetes/oneclick/setenv.bash8
3 files changed, 41 insertions, 9 deletions
diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash
index 6e62c6bec4..af300f25cd 100755
--- a/kubernetes/oneclick/createAll.bash
+++ b/kubernetes/oneclick/createAll.bash
@@ -1,5 +1,7 @@
#!/bin/bash
+. $(dirname "$0")/setenv.bash
+
usage() {
cat <<EOF
Usage: $0 [PARAMs]
@@ -17,6 +19,10 @@ create_namespace() {
kubectl create namespace $1-$2
}
+create_registry_key() {
+ kubectl --namespace $1-$2 create secret docker-registry $3 --docker-server=$4 --docker-username=$5 --docker-password=$6 --docker-email=$7
+}
+
create_service() {
kubectl --namespace $1-$2 create -f ../$2/all-services.yaml
}
@@ -25,8 +31,10 @@ create_service() {
NS=
INCL_SVC=true
APP=
+DU=$ONAP_DOCKER_USER
+DP=$ONAP_DOCKER_PASS
-while getopts ":n:u:s:a:" PARAM; do
+while getopts ":n:u:s:a:du:dp:" PARAM; do
case $PARAM in
u)
usage
@@ -45,6 +53,12 @@ while getopts ":n:u:s:a:" PARAM; do
exit 1
fi
;;
+ du)
+ DU=${OPTARG}
+ ;;
+ dp)
+ DP=${OPTARG}
+ ;;
?)
usage
exit
@@ -59,8 +73,6 @@ fi
if [[ ! -z "$APP" ]]; then
ONAP_APPS=($APP)
-else
- ONAP_APPS=('sdc' 'aai' 'mso' 'message-router' 'robot' 'vid' 'sdnc' 'portal' 'policy' 'appc')
fi
printf "\n********** Creating up ONAP: ${ONAP_APPS[*]}\n"
@@ -79,6 +91,7 @@ done
printf "\n\n********** Creating deployments for ${ONAP_APPS[*]} ********** \n"
for i in ${ONAP_APPS[@]}; do
+ create_registry_key $NS $i $ONAP_DOCKER_REGISTRY_KEY $ONAP_DOCKER_REGISTRY $DU $DP $ONAP_DOCKER_MAIL
/bin/bash $i.sh $NS $i 'create'
done
diff --git a/kubernetes/oneclick/deleteAll.bash b/kubernetes/oneclick/deleteAll.bash
index 8d145f945a..3d54aa80ae 100755
--- a/kubernetes/oneclick/deleteAll.bash
+++ b/kubernetes/oneclick/deleteAll.bash
@@ -1,6 +1,19 @@
#!/bin/bash
+
+. $(dirname "$0")/setenv.bash
+
delete_namespace() {
- kubectl delete namespace $1-$2
+ _NS=$1-$2
+ kubectl delete namespace $_NS
+ printf "Waiting for namespace $_NS termination...\n"
+ while kubectl get namespaces $_NS > /dev/null 2>&1; do
+ sleep 2
+ done
+ printf "Namespace $_NS deleted.\n\n"
+}
+
+delete_registry_key() {
+ kubectl --namespace $1-$2 delete secret onap-docker-registry-key
}
delete_service() {
@@ -58,23 +71,21 @@ fi
if [[ ! -z "$APP" ]]; then
ONAP_APPS=($APP)
-else
- ONAP_APPS=('sdc' 'aai' 'mso' 'message-router' 'robot' 'vid' 'sdnc' 'portal' 'policy' 'appc')
fi
printf "\n********** Cleaning up ONAP: ${ONAP_APPS[*]}\n"
for i in ${ONAP_APPS[@]}; do
+ # delete the deployments
+ /bin/bash $i.sh $NS $i 'delete'
+
if [[ "$INCL_SVC" == true ]]; then
printf "\nDeleting services **********\n"
delete_service $NS $i
delete_namespace $NS $i
fi
- # delete the deployments
- /bin/bash $i.sh $NS $i 'delete'
-
done
diff --git a/kubernetes/oneclick/setenv.bash b/kubernetes/oneclick/setenv.bash
new file mode 100644
index 0000000000..05a0d4760a
--- /dev/null
+++ b/kubernetes/oneclick/setenv.bash
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+ONAP_APPS=('sdc' 'aai' 'mso' 'message-router' 'robot' 'vid' 'sdnc' 'portal' 'policy' 'appc')
+ONAP_DOCKER_REGISTRY_KEY=${ONAP_DOCKER_REGISTRY_KEY:-onap-docker-registry-key}
+ONAP_DOCKER_REGISTRY=${ONAP_DOCKER_REGISTRY:-nexus3.onap.org:10001}
+ONAP_DOCKER_USER=${ONAP_DOCKER_USER:-docker}
+ONAP_DOCKER_PASS=${ONAP_DOCKER_PASS:-docker}
+ONAP_DOCKER_MAIL=${ONAP_DOCKER_MAIL:-$USERNAME@$USERDOMAIN}