Feature 11037 Installation of ingress controller in OSM community installer

[osm/devops.git] / installers / full_install_osm.sh

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index a150839..472c70b 100755 (executable)
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -195,7 +195,7 @@ function install_osmclient(){
     echo -e "\nOSM client installed"
     echo -e "OSM client assumes that OSM host is running in localhost (127.0.0.1)."
     echo -e "In case you want to interact with a different OSM host, you will have to configure this env variable in your .bashrc file:"
-    echo "     export OSM_HOSTNAME=https://nbi.${OSM_DEFAULT_IP}.nip.io"
+    echo "     export OSM_HOSTNAME=nbi.${OSM_DEFAULT_IP}.nip.io"
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
     return 0
 }
@@ -275,6 +275,11 @@ EOF"
     [ ! "$OSM_DOCKER_TAG" == "testing-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set-string global.image.tag=${OSM_DOCKER_TAG}"
     [ ! "$OSM_DOCKER_TAG" == "testing-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set prometheus.server.sidecarContainers.prometheus-config-sidecar.image=${DOCKER_REGISTRY_URL}${DOCKER_USER}/prometheus:${OSM_DOCKER_TAG}"
 
+    OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.hostname=${OSM_DEFAULT_IP}.nip.io"
+    OSM_HELM_OPTS="${OSM_HELM_OPTS} --set grafana.ingress.hosts={grafana.${OSM_DEFAULT_IP}.nip.io}"
+    OSM_HELM_OPTS="${OSM_HELM_OPTS} --set prometheus.server.ingress.hosts={prometheus.${OSM_DEFAULT_IP}.nip.io}"
+    # OSM_HELM_OPTS="${OSM_HELM_OPTS} --set prometheus.alertmanager.ingress.hosts={alertmanager.${OSM_DEFAULT_IP}.nip.io}"
+
     if [ -n "${INSTALL_JUJU}" ]; then
         OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.enabled=true"
         OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.host=${OSM_VCA_HOST}"
@@ -282,6 +287,7 @@ EOF"
         OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.cacert=${OSM_VCA_CACERT}"
     fi
     [ -n "$OSM_VCA_APIPROXY" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set lcm.config.OSMLCM_VCA_APIPROXY=${OSM_VCA_APIPROXY}"
+
     [ -n "${INSTALL_NGSA}" ] || OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.oldServiceAssurance=true"
     if [ -n "${OSM_BEHIND_PROXY}" ]; then
         OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.behindHttpProxy=true"
@@ -328,7 +334,7 @@ function deploy_mongodb() {
 
 function install_osm_ngsa_service() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
-    NGSA_OPTS="-d ${OSM_HELM_WORK_DIR} -D ${OSM_DEVOPS} -t ${OSM_DOCKER_TAG} -U ${DOCKER_USER} ${DEBUG_INSTALL}"
+    NGSA_OPTS="-i ${OSM_DEFAULT_IP} -d ${OSM_HELM_WORK_DIR} -D ${OSM_DEVOPS} -t ${OSM_DOCKER_TAG} -U ${DOCKER_USER} ${DEBUG_INSTALL}"
     [ -n "${DOCKER_REGISTRY_URL}" ] && NGSA_OPTS="${NGSA_OPTS} -r ${DOCKER_REGISTRY_URL}"
     $OSM_DEVOPS/installers/install_ngsa.sh ${NGSA_OPTS} || \
     FATAL_TRACK install_osm_ngsa_service "install_ngsa.sh failed"
@@ -337,18 +343,20 @@ function install_osm_ngsa_service() {
 
 function add_local_k8scluster() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
-    /usr/bin/osm --all-projects vim-create \
+    # OSM_HOSTNAME=$(kubectl get --namespace osm -o jsonpath="{.spec.rules[0].host}" ingress nbi-ingress)
+    OSM_HOSTNAME="nbi.${OSM_DEFAULT_IP}.nip.io:443"
+    /usr/bin/osm --hostname ${OSM_HOSTNAME} --all-projects vim-create \
       --name _system-osm-vim \
       --account_type dummy \
       --auth_url http://dummy \
       --user osm --password osm --tenant osm \
       --description "dummy" \
       --config '{management_network_name: mgmt}'
-    /usr/bin/osm --all-projects k8scluster-add \
+    /usr/bin/osm --hostname ${OSM_HOSTNAME} --all-projects k8scluster-add \
       --creds ${HOME}/.kube/config \
       --vim _system-osm-vim \
       --k8s-nets '{"net1": null}' \
-      --version '1.15' \
+      --version '1.29' \
       --description "OSM Internal Cluster" \
       _system-osm-k8s
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
@@ -716,8 +724,8 @@ APT_PROXY_URL=""
 K8S_CLUSTER_ENGINE="kubeadm"
 INSTALL_FROM_SOURCE=""
 DEBUG_INSTALL=""
-RELEASE="ReleaseTEN"
-REPOSITORY="stable"
+RELEASE="testing-daily"
+REPOSITORY="testing"
 INSTALL_K8S_MONITOR=""
 INSTALL_NGSA="y"
 INSTALL_PLA=""