Fix default installer to make local cluster pull images from docker proxy
This change also reverts previous commit bc5422cf9fd9d21d7028d445fe1982080101611a.
Change-Id: Ia72ce8677a8ebe15f15e6f79d8b158654393f93a
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 3ca7db7..03439a1 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -216,22 +216,10 @@
[ -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"
- if [ -n "${DOCKER_REGISTRY_URL}" ]; then
- docker_login
- create_k8s_secret_registrycreds
- fi
+ [ -n "${DOCKER_REGISTRY_URL}" ] && docker_login
echo "Pulling non-OSM docker images"
if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q KAFKA ; then