aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/oneclick
diff options
context:
space:
mode:
authorKeren Joseph <keren.joseph@amdocs.com>2017-09-12 10:13:15 +0300
committerMandeep Khinda <mandeep.khinda@amdocs.com>2017-09-13 19:29:38 +0000
commit4b7026e95b93f2077f18d0681d55bbac022b5396 (patch)
tree670c66bf0c603bd0cfa4d4cb6436bbfa7604258a /kubernetes/oneclick
parentdb4c9ae652b8222acf931f093e2e0ede44bc270f (diff)
Revert "moving certs and keys to k8s secrets"
This reverts commit 59ffd500ea34c201fbb3edc39e64655fa8381be0. Tested locally and does not work. DmaaP fails to come up causing many other pods to crash loop. failed to start container "dmaap": Error response from daemon: {"message":"invalid header field value "oci runtime error: container_linux.go:247:starting container process caused "process_linux.go:359: container init caused "rootfs_linux.go:53: mounting "/var/lib/kubelet/pods/9ae222e0-98a9-11e7-badd-02cfc855c3b9 /volumes/kubernetes.io~secret/mykey" to rootfs "/var/lib/docker/aufs/mnt /b92c56185f3371cb1f091679780d40797dd2c6124cd00cb8fe68da2b247363a8" at "/var/lib/docker/aufs/mnt/.../appl/dmaapMR1/etc/keyfile" caused "not a directory"""n""} Issue-ID: OOM-293 Change-Id: I348ffa14718bd6e89e99f2859cf6612c10370559 Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Diffstat (limited to 'kubernetes/oneclick')
-rwxr-xr-xkubernetes/oneclick/createAll.bash10
-rwxr-xr-xkubernetes/oneclick/deleteAll.bash14
2 files changed, 1 insertions, 23 deletions
diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash
index 5012a52d20..7be2e6a7de 100755
--- a/kubernetes/oneclick/createAll.bash
+++ b/kubernetes/oneclick/createAll.bash
@@ -39,14 +39,6 @@ create_registry_key() {
check_return_code $cmd
}
-create_certs_secret() {
- if [ -d $LOCATION/config/certs/$i/ ]; then
- printf "\nCreating certs and keys secret **********\n"
- _CERTS_FILES=$(find $LOCATION/config/certs/$2/ -type f | awk '$0="--from-file="$0' ORS=' ')
- kubectl create secret generic secret-$1-$2 $_CERTS_FILES -n $1-$2
- fi
-}
-
create_onap_helm() {
HELM_VALUES_ADDITION=""
if [[ ! -z $HELM_VALUES_FILEPATH ]]; then
@@ -140,8 +132,6 @@ for i in ${HELM_APPS[@]}; do
printf "\nCreating registry secret **********\n"
create_registry_key $NS $i ${NS}-docker-registry-key $ONAP_DOCKER_REGISTRY $DU $DP $ONAP_DOCKER_MAIL
- create_certs_secret $NS $i
-
printf "\nCreating deployments and services **********\n"
create_onap_helm $NS $i $start
diff --git a/kubernetes/oneclick/deleteAll.bash b/kubernetes/oneclick/deleteAll.bash
index f7c48fd18d..40d070124a 100755
--- a/kubernetes/oneclick/deleteAll.bash
+++ b/kubernetes/oneclick/deleteAll.bash
@@ -16,13 +16,6 @@ delete_registry_key() {
kubectl --namespace $1-$2 delete secret ${1}-docker-registry-key
}
-delete_certs_secret() {
- if [ -d $LOCATION/config/certs/$i/ ]; then
- kubectl delete secret secret-$1-$2 -n $1-$2
- fi
-}
-
-
delete_app_helm() {
helm delete $1-$2 --purge
}
@@ -43,9 +36,8 @@ EOF
NS=
INCL_SVC=false
APP=
-LOCATION="../"
-while getopts ":n:u:s:a:l:" PARAM; do
+while getopts ":n:u:s:a:" PARAM; do
case $PARAM in
u)
usage
@@ -61,9 +53,6 @@ while getopts ":n:u:s:a:l:" PARAM; do
exit 1
fi
;;
- l)
- LOCATION=${OPTARG}
- ;;
?)
usage
exit
@@ -85,7 +74,6 @@ printf "\n********** Cleaning up ONAP: ${ONAP_APPS[*]}\n"
for i in ${HELM_APPS[@]}; do
- delete_certs_secret $NS $i
delete_app_helm $NS $i
delete_namespace $NS $i