From 692eda26d4bb9aea2760f0c3d48d7a91c392afd9 Mon Sep 17 00:00:00 2001 From: Srinivasan Selvam Date: Thu, 7 Nov 2019 17:51:26 +0530 Subject: [PATCH 1/1] bug fixing uCPE Signed-off-by: Srinivasan Selvam Change-Id: I385213a7fc1c8d23d43e0d155705a34ad6ca5f6e --- blueprints/uCPE/{ => scripts}/cadvisorsetup.sh | 0 blueprints/uCPE/{ => scripts}/ci_management/cleanup_control.sh | 8 ++++---- blueprints/uCPE/{ => scripts}/ci_management/cleanup_edge.sh | 0 blueprints/uCPE/{ => scripts}/ci_management/cleanup_edge_final.sh | 0 blueprints/uCPE/{ => scripts}/ci_management/cleanup_master.sh | 0 .../uCPE/{ => scripts}/ci_management/cleanup_prom_cadvisor.sh | 2 +- blueprints/uCPE/{ => scripts}/ci_management/uninstall_cadvisor.sh | 0 .../uCPE/{ => scripts}/ci_management/uninstall_prometheus.sh | 0 blueprints/uCPE/{ => scripts}/cni/calico/calico.yaml | 0 blueprints/uCPE/{ => scripts}/cni/calico/rbac.yaml | 0 blueprints/uCPE/{ => scripts}/cni/calico/v38/calico.yaml | 0 blueprints/uCPE/{ => scripts}/common.sh | 0 blueprints/uCPE/{ => scripts}/common_centos.sh | 2 +- blueprints/uCPE/{ => scripts}/generatePromeyml.sh | 0 blueprints/uCPE/{ => scripts}/k8smaster.sh | 0 blueprints/uCPE/{ => scripts}/k8smaster_centos.sh | 2 +- blueprints/uCPE/{ => scripts}/k8sworker.sh | 0 blueprints/uCPE/{ => scripts}/kubernetes_cleanup.sh | 0 blueprints/uCPE/{ => scripts}/kubernetes_reset.sh | 0 blueprints/uCPE/{ => scripts}/nodelist | 0 blueprints/uCPE/{ => scripts}/prometheus.sh | 0 blueprints/uCPE/{ => scripts}/setup.sh | 8 ++++---- blueprints/uCPE/{ => scripts}/src/config_kubeedge | 0 blueprints/uCPE/{ => scripts}/src/kubeedge_setup.sh | 6 +++--- blueprints/uCPE/{ => scripts}/verifyk8s.sh | 0 25 files changed, 14 insertions(+), 14 deletions(-) rename blueprints/uCPE/{ => scripts}/cadvisorsetup.sh (100%) rename blueprints/uCPE/{ => scripts}/ci_management/cleanup_control.sh (81%) rename blueprints/uCPE/{ => scripts}/ci_management/cleanup_edge.sh (100%) rename blueprints/uCPE/{ => scripts}/ci_management/cleanup_edge_final.sh (100%) rename blueprints/uCPE/{ => scripts}/ci_management/cleanup_master.sh (100%) rename blueprints/uCPE/{ => scripts}/ci_management/cleanup_prom_cadvisor.sh (91%) rename blueprints/uCPE/{ => scripts}/ci_management/uninstall_cadvisor.sh (100%) rename blueprints/uCPE/{ => scripts}/ci_management/uninstall_prometheus.sh (100%) rename blueprints/uCPE/{ => scripts}/cni/calico/calico.yaml (100%) rename blueprints/uCPE/{ => scripts}/cni/calico/rbac.yaml (100%) rename blueprints/uCPE/{ => scripts}/cni/calico/v38/calico.yaml (100%) rename blueprints/uCPE/{ => scripts}/common.sh (100%) rename blueprints/uCPE/{ => scripts}/common_centos.sh (98%) rename blueprints/uCPE/{ => scripts}/generatePromeyml.sh (100%) rename blueprints/uCPE/{ => scripts}/k8smaster.sh (100%) rename blueprints/uCPE/{ => scripts}/k8smaster_centos.sh (98%) rename blueprints/uCPE/{ => scripts}/k8sworker.sh (100%) rename blueprints/uCPE/{ => scripts}/kubernetes_cleanup.sh (100%) rename blueprints/uCPE/{ => scripts}/kubernetes_reset.sh (100%) rename blueprints/uCPE/{ => scripts}/nodelist (100%) rename blueprints/uCPE/{ => scripts}/prometheus.sh (100%) rename blueprints/uCPE/{ => scripts}/setup.sh (94%) rename blueprints/uCPE/{ => scripts}/src/config_kubeedge (100%) rename blueprints/uCPE/{ => scripts}/src/kubeedge_setup.sh (93%) rename blueprints/uCPE/{ => scripts}/verifyk8s.sh (100%) diff --git a/blueprints/uCPE/cadvisorsetup.sh b/blueprints/uCPE/scripts/cadvisorsetup.sh similarity index 100% rename from blueprints/uCPE/cadvisorsetup.sh rename to blueprints/uCPE/scripts/cadvisorsetup.sh diff --git a/blueprints/uCPE/ci_management/cleanup_control.sh b/blueprints/uCPE/scripts/ci_management/cleanup_control.sh similarity index 81% rename from blueprints/uCPE/ci_management/cleanup_control.sh rename to blueprints/uCPE/scripts/ci_management/cleanup_control.sh index 3f14b02..7f3e506 100755 --- a/blueprints/uCPE/ci_management/cleanup_control.sh +++ b/blueprints/uCPE/scripts/ci_management/cleanup_control.sh @@ -21,17 +21,17 @@ kubectl delete -f $TESTYAML exec_edge_master(){ sshpass -p ${EDGENODEPASSWORD} \ - scp ${PATH_OF_ELIOTFOLDER}/scripts/ci_management/cleanup_edge.sh \ + scp ${PATH_OF_ELIOTFOLDER}/blueprints/uCPE/scripts/ci_management/cleanup_edge.sh \ ${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \ source cleanup_edge.sh - cd $PATH_OF_ELIOTFOLDER/scripts/ci_management + cd $PATH_OF_ELIOTFOLDER/blueprints/uCPE/scripts/ci_management source cleanup_master.sh - +f sshpass -p ${EDGENODEPASSWORD} \ - scp ${PATH_OF_ELIOTFOLDER}/scripts/ci_management/cleanup_edge_final.sh \ + scp ${PATH_OF_ELIOTFOLDER}/blueprints/uCPE/scripts/ci_management/cleanup_edge_final.sh \ ${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \ diff --git a/blueprints/uCPE/ci_management/cleanup_edge.sh b/blueprints/uCPE/scripts/ci_management/cleanup_edge.sh similarity index 100% rename from blueprints/uCPE/ci_management/cleanup_edge.sh rename to blueprints/uCPE/scripts/ci_management/cleanup_edge.sh diff --git a/blueprints/uCPE/ci_management/cleanup_edge_final.sh b/blueprints/uCPE/scripts/ci_management/cleanup_edge_final.sh similarity index 100% rename from blueprints/uCPE/ci_management/cleanup_edge_final.sh rename to blueprints/uCPE/scripts/ci_management/cleanup_edge_final.sh diff --git a/blueprints/uCPE/ci_management/cleanup_master.sh b/blueprints/uCPE/scripts/ci_management/cleanup_master.sh similarity index 100% rename from blueprints/uCPE/ci_management/cleanup_master.sh rename to blueprints/uCPE/scripts/ci_management/cleanup_master.sh diff --git a/blueprints/uCPE/ci_management/cleanup_prom_cadvisor.sh b/blueprints/uCPE/scripts/ci_management/cleanup_prom_cadvisor.sh similarity index 91% rename from blueprints/uCPE/ci_management/cleanup_prom_cadvisor.sh rename to blueprints/uCPE/scripts/ci_management/cleanup_prom_cadvisor.sh index fb563a2..86dca7d 100755 --- a/blueprints/uCPE/ci_management/cleanup_prom_cadvisor.sh +++ b/blueprints/uCPE/scripts/ci_management/cleanup_prom_cadvisor.sh @@ -15,7 +15,7 @@ source uninstall_prometheus.sh | tee uninstall_prometheus.log #stop cadvisor statement executed at ELIOT Edge Node -stop_cadvisor_atedge="cd eliot/scripts/ci_management && source uninstall_cadvisor.sh" +stop_cadvisor_atedge="cd eliot/blueprints/uCPE/scripts/ci_management && source uninstall_cadvisor.sh" # Read all the Worker Node details from nodelist file. while read line do diff --git a/blueprints/uCPE/ci_management/uninstall_cadvisor.sh b/blueprints/uCPE/scripts/ci_management/uninstall_cadvisor.sh similarity index 100% rename from blueprints/uCPE/ci_management/uninstall_cadvisor.sh rename to blueprints/uCPE/scripts/ci_management/uninstall_cadvisor.sh diff --git a/blueprints/uCPE/ci_management/uninstall_prometheus.sh b/blueprints/uCPE/scripts/ci_management/uninstall_prometheus.sh similarity index 100% rename from blueprints/uCPE/ci_management/uninstall_prometheus.sh rename to blueprints/uCPE/scripts/ci_management/uninstall_prometheus.sh diff --git a/blueprints/uCPE/cni/calico/calico.yaml b/blueprints/uCPE/scripts/cni/calico/calico.yaml similarity index 100% rename from blueprints/uCPE/cni/calico/calico.yaml rename to blueprints/uCPE/scripts/cni/calico/calico.yaml diff --git a/blueprints/uCPE/cni/calico/rbac.yaml b/blueprints/uCPE/scripts/cni/calico/rbac.yaml similarity index 100% rename from blueprints/uCPE/cni/calico/rbac.yaml rename to blueprints/uCPE/scripts/cni/calico/rbac.yaml diff --git a/blueprints/uCPE/cni/calico/v38/calico.yaml b/blueprints/uCPE/scripts/cni/calico/v38/calico.yaml similarity index 100% rename from blueprints/uCPE/cni/calico/v38/calico.yaml rename to blueprints/uCPE/scripts/cni/calico/v38/calico.yaml diff --git a/blueprints/uCPE/common.sh b/blueprints/uCPE/scripts/common.sh similarity index 100% rename from blueprints/uCPE/common.sh rename to blueprints/uCPE/scripts/common.sh diff --git a/blueprints/uCPE/common_centos.sh b/blueprints/uCPE/scripts/common_centos.sh similarity index 98% rename from blueprints/uCPE/common_centos.sh rename to blueprints/uCPE/scripts/common_centos.sh index 1fb51b3..d833198 100755 --- a/blueprints/uCPE/common_centos.sh +++ b/blueprints/uCPE/scripts/common_centos.sh @@ -12,7 +12,7 @@ # constants DOCKER_VERSION=18.09.6 -KUBE_VERSION=1.15.0-0 +KUBE_VERSION=1.16.0-0 MACHINE=$(uname -m) # start diff --git a/blueprints/uCPE/generatePromeyml.sh b/blueprints/uCPE/scripts/generatePromeyml.sh similarity index 100% rename from blueprints/uCPE/generatePromeyml.sh rename to blueprints/uCPE/scripts/generatePromeyml.sh diff --git a/blueprints/uCPE/k8smaster.sh b/blueprints/uCPE/scripts/k8smaster.sh similarity index 100% rename from blueprints/uCPE/k8smaster.sh rename to blueprints/uCPE/scripts/k8smaster.sh diff --git a/blueprints/uCPE/k8smaster_centos.sh b/blueprints/uCPE/scripts/k8smaster_centos.sh similarity index 98% rename from blueprints/uCPE/k8smaster_centos.sh rename to blueprints/uCPE/scripts/k8smaster_centos.sh index c78bc0d..69c3ef9 100755 --- a/blueprints/uCPE/k8smaster_centos.sh +++ b/blueprints/uCPE/scripts/k8smaster_centos.sh @@ -11,7 +11,7 @@ # constants POD_NETWORK_CIDR=192.168.0.0/16 -KUBE_VERSION=1.15.0-0 +KUBE_VERSION=1.16.0-0 KUBERNETES_CNI=0.7.5-0 # start diff --git a/blueprints/uCPE/k8sworker.sh b/blueprints/uCPE/scripts/k8sworker.sh similarity index 100% rename from blueprints/uCPE/k8sworker.sh rename to blueprints/uCPE/scripts/k8sworker.sh diff --git a/blueprints/uCPE/kubernetes_cleanup.sh b/blueprints/uCPE/scripts/kubernetes_cleanup.sh similarity index 100% rename from blueprints/uCPE/kubernetes_cleanup.sh rename to blueprints/uCPE/scripts/kubernetes_cleanup.sh diff --git a/blueprints/uCPE/kubernetes_reset.sh b/blueprints/uCPE/scripts/kubernetes_reset.sh similarity index 100% rename from blueprints/uCPE/kubernetes_reset.sh rename to blueprints/uCPE/scripts/kubernetes_reset.sh diff --git a/blueprints/uCPE/nodelist b/blueprints/uCPE/scripts/nodelist similarity index 100% rename from blueprints/uCPE/nodelist rename to blueprints/uCPE/scripts/nodelist diff --git a/blueprints/uCPE/prometheus.sh b/blueprints/uCPE/scripts/prometheus.sh similarity index 100% rename from blueprints/uCPE/prometheus.sh rename to blueprints/uCPE/scripts/prometheus.sh diff --git a/blueprints/uCPE/setup.sh b/blueprints/uCPE/scripts/setup.sh similarity index 94% rename from blueprints/uCPE/setup.sh rename to blueprints/uCPE/scripts/setup.sh index b13077f..a4b0b1d 100755 --- a/blueprints/uCPE/setup.sh +++ b/blueprints/uCPE/scripts/setup.sh @@ -56,9 +56,9 @@ setup_k8sworkers() # Install Docker on ELIOT Node SETUP_WORKER_COMMON="sudo rm -rf ~/eliot &&\ git clone ${ELIOT_REPO} &&\ - cd eliot/scripts/ && source common.sh" + cd eliot/blueprints/uCPE/scripts/ && source common.sh" #SETUP_WORKER_COMMON="cd eliot/scripts/ && source common.sh" - SETUP_WORKER="cd eliot/scripts/ && source k8sworker.sh" + SETUP_WORKER="cd eliot/blueprints/uCPE/scripts/ && source k8sworker.sh" KUBEADM_TOKEN=$(kubeadm token create --print-join-command) KUBEADM_JOIN="sudo ${KUBEADM_TOKEN}" @@ -100,7 +100,7 @@ setup_k8sworkers_centos() SETUP_WORKER_COMMON_CENTOS="sudo rm -rf ~/eliot &&\ git clone ${ELIOT_REPO} &&\ - cd eliot/scripts/ && source common_centos.sh" + cd eliot/blueprints/uCPE/scripts/ && source common_centos.sh" # SETUP_WORKER_COMMON_CENTOS="cd /root/eliot/scripts/ && source common_centos.sh" @@ -130,7 +130,7 @@ verify_k8s_status(){ install_cadvisor_edge(){ set -o xtrace - SETUP_CADVISOR_ATEDGE="cd eliot/scripts/ && source cadvisorsetup.sh" + SETUP_CADVISOR_ATEDGE="cd eliot/blueprints/uCPE/scripts/ && source cadvisorsetup.sh" while read line do nodeinfo="${line}" diff --git a/blueprints/uCPE/src/config_kubeedge b/blueprints/uCPE/scripts/src/config_kubeedge similarity index 100% rename from blueprints/uCPE/src/config_kubeedge rename to blueprints/uCPE/scripts/src/config_kubeedge diff --git a/blueprints/uCPE/src/kubeedge_setup.sh b/blueprints/uCPE/scripts/src/kubeedge_setup.sh similarity index 93% rename from blueprints/uCPE/src/kubeedge_setup.sh rename to blueprints/uCPE/scripts/src/kubeedge_setup.sh index 86f6bbc..de5b9e6 100755 --- a/blueprints/uCPE/src/kubeedge_setup.sh +++ b/blueprints/uCPE/scripts/src/kubeedge_setup.sh @@ -11,7 +11,7 @@ #Constants KUBEEDGE_SRC="$GOPATH/src/github.com/kubeedge/kubeedge" KUBEEDGE_BIN="$GOPATH/src/github.com/kubeedge/kubeedge/keadm" -VERIFY_K8S="$PATH_OF_ELIOTFOLDER/scripts/verifyk8s.sh" +VERIFY_K8S="$PATH_OF_ELIOTFOLDER/blueprints/uCPE/scripts/verifyk8s.sh" { set +x; } > /dev/null 2>&1 @@ -72,10 +72,10 @@ execute_keedge_controller(){ exec_edge(){ - cd $PATH_OF_ELIOTFOLDER/scripts/src + cd $PATH_OF_ELIOTFOLDER/blueprints/uCPE/scripts/src sshpass -p ${EDGENODEPASSWORD} \ - scp $PATH_OF_ELIOTFOLDER/scripts/src/config_kubeedge \ + scp $PATH_OF_ELIOTFOLDER/blueprints/uCPE/scripts/src/config_kubeedge \ ${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \ diff --git a/blueprints/uCPE/verifyk8s.sh b/blueprints/uCPE/scripts/verifyk8s.sh similarity index 100% rename from blueprints/uCPE/verifyk8s.sh rename to blueprints/uCPE/scripts/verifyk8s.sh -- 2.16.6