Commit 10944e87 authored by garciadeblas's avatar garciadeblas
Browse files

Fix sops client installation and minio during setup of mgmt and aux cluster



Change-Id: I0a815a3818d1e1ae7a1957d6db0602cec133a491
Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>
parent 8d8cd99f
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -76,8 +76,6 @@ m "\n#####################################################################" "${C
m "(3/3) Installing Minio..." "${CYAN}"
m "#####################################################################\n" "${CYAN}"

export INSTALL_MINIO=${INSTALL_MINIO:-"y"}

if [ -n "${INSTALL_MINIO}" ]; then
    # Enter the Minio folder
    pushd minio > /dev/null
+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@
# Transitent file to be sourced to bootstrap some key variables

# Random passwords
export GITEA_ADMINISTRATOR_PASSWORD=$(apg -a 1 -M sncl -n 1 -m 12 -x 12 -E \\\*\'\"\`\$\<\{\})
export GITEA_STD_USER_PASS=$(apg -a 1 -M sncl -n 1 -m 10 -x 10 -E \\\*\'\"\`\$\<\{\})
export GITEA_ADMINISTRATOR_PASSWORD=$(apg -a 1 -M sncl -n 1 -m 12 -x 12 -E \\\*\'\"\`\$\<\>\{\})
export GITEA_STD_USER_PASS=$(apg -a 1 -M sncl -n 1 -m 10 -x 10 -E \\\*\'\"\`\$\<\>\{\})

# Uncomment to deploy Gitea only as ClusterIP service (i.e., no LoadBalancer)
# export GITEA_CHART_VALUES_FILE=values-all.yaml
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
# limitations under the License.
#######################################################################################

set -e
set -ex

export HERE=$(dirname "$(readlink --canonicalize "$BASH_SOURCE")")
source "${HERE}/library/functions.sh"
+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ helm upgrade --install gitea gitea-charts/gitea \
    --namespace=gitea \
    --values "${HERE}/${GITEA_CHART_VALUES_FILE}" \
    --set=gitea.admin.username="${GITEA_ADMINISTRATOR_USERNAME}" \
    --set=gitea.admin.password="${GITEA_ADMINISTRATOR_PASSWORD}" \
    --set=gitea.admin.password="${GITEA_ADMINISTRATOR_PASSWORD@Q}" \
    --set=gitea.config.server.DOMAIN="${GITEA_SSH_SERVER}" \
    --set=gitea.config.server.ROOT_URL="${GITEA_HTTP_URL}" \
    --set=ingress.hosts[0].host="${GITEA_HTTP_HOST_DOMAIN}" \
+10 −8
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ KUBECONFIG_AUX_CLUSTER=${KUBECONFIG_AUX_CLUSTER:-"$HOME/.kube/config"}
KUBECONFIG_OLD=${KUBECONFIG:-"$HOME/.kube/config"}
export CREDENTIALS_DIR="${OSM_HOME_DIR}/.credentials"
export WORK_REPOS_DIR="${OSM_HOME_DIR}/repos"
export INSTALL_MINIO=${INSTALL_MINIO:-""}
export INSTALL_MINIO=${INSTALL_MINIO:-"y"}
echo "DEBUG_INSTALL=$DEBUG_INSTALL"
echo "OSM_DEVOPS=$OSM_DEVOPS"
echo "OSM_HOME_DIR=$OSM_HOME_DIR"
@@ -84,7 +84,7 @@ pushd $OSM_MGMTCLUSTER_BASE_FOLDER
if [ -n "${INSTALL_AUX_CLUSTER}" ] || [ -n "${INSTALL_MGMT_CLUSTER}" ]; then

    echo "Setup CLI tools for mgmt and aux cluster"
    ./setup-cli-tools.sh
    ./setup-cli-tools.sh || FATAL_TRACK mgmtcluster "setup-cli-tools.sh failed"
    track mgmtcluster setupclitools_ok

    echo "Creating folders under ${OSM_HOME_DIR} for credentials and repos"
@@ -94,9 +94,9 @@ if [ -n "${INSTALL_AUX_CLUSTER}" ] || [ -n "${INSTALL_MGMT_CLUSTER}" ]; then

    # Test if the user exists. Otherwise, create a git user
    echo "Test if there is a git user. Otherwise, create it."
    if [ -n "$(git config user.name)" ]; then
        git -C $WORK_REPOS_DIR config --local user.name osm_user
        git -C $WORK_REPOS_DIR config --local user.email osm_user@mydomain.com
    if [ ! -n "$(git config user.name)" ]; then
        git config --global user.name osm_user
        git config --global user.email osm_user@mydomain.com
    fi

    # Test if the user exists. Otherwise, create a git user
@@ -111,14 +111,16 @@ if [ -n "${INSTALL_AUX_CLUSTER}" ] || [ -n "${INSTALL_MGMT_CLUSTER}" ]; then

fi

set +x

# "aux-svc" cluster
if [ -n "${INSTALL_AUX_CLUSTER}" ]; then
    echo "Provisioning auxiliary cluster with Gitea"
    export KUBECONFIG="${KUBECONFIG_AUX_CLUSTER}"
    ./01-provision-aux-svc.sh
    ./01-provision-aux-svc.sh || FATAL_TRACK mgmtcluster "provision-aux-svc.sh failed"
    track mgmtcluster aux_cluster_ok

    ./02-provision-local-git-user.sh
    ./02-provision-local-git-user.sh || FATAL_TRACK mgmtcluster "provision-local-git-user.sh failed"
    track mgmtcluster local_git_user_ok
fi

@@ -126,7 +128,7 @@ fi
if [ -n "${INSTALL_MGMT_CLUSTER}" ]; then
    echo "Provisioning mgmt cluster"
    export KUBECONFIG="${KUBECONFIG_MGMT_CLUSTER}"
    ./03-provision-mgmt-cluster.sh
    ./03-provision-mgmt-cluster.sh || FATAL_TRACK mgmtcluster "provision-mgmt-cluster.sh failed"
    track mgmtcluster mgmt_cluster_ok
fi

Loading