Fix errors in installation tracking related to proxy_ok and install_k8s_ok

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

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index f3d8923..3ca7db7 100755 (executable)
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -216,10 +216,22 @@ function docker_login() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
 
+function create_k8s_secret_regcred() {
+    [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
+    echo "Creating K8s secret regcred with the docker registry credentials from $HOME/.docker/config.json"
+    kubectl -n osm create secret generic regcred \
+        --from-file=.dockerconfigjson=$HOME/.docker/config.json \
+        --type=kubernetes.io/dockerconfigjson
+    [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
+}
+
 function pull_docker_images() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
     echo "Pulling docker images"
-    [ -n "${DOCKER_REGISTRY_URL}" ] && docker_login
+    if [ -n "${DOCKER_REGISTRY_URL}" ]; then
+        docker_login
+        create_k8s_secret_registrycreds
+    fi
 
     echo "Pulling non-OSM docker images"
     if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q KAFKA ; then
@@ -483,7 +495,6 @@ function install_osm() {
     [ -n "$DOCKER_REGISTRY_URL" ] && parse_docker_registry_url
 
     check_osm_behind_proxy
-    track checks proxy_ok
 
     check_packages "git wget curl tar snapd"
 
@@ -554,7 +565,7 @@ function install_osm() {
     track docker_images docker_images_ok
 
     deploy_charmed_services
-    track deploy_osm deploy_charmed_services_ok
+    track deploy_osm deploy_mongodb_ok
     deploy_osm_services
     track deploy_osm deploy_osm_services_k8s_ok
     if [ -n "$INSTALL_K8S_MONITOR" ]; then