Commit 3f37a3f2 authored by garciadeblas's avatar garciadeblas
Browse files

Fix token names in gitea provisioning 



Change-Id: I27e3fbc8de428ab6a88058980f481ebcb117b4b5
Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>
parent 2efb98b6

installers/install_cluster_addons.sh

+0 −1
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ function install_helm_nginx() { 
    echo "Installing nginx"

    NGINX_VERSION="4.10.0"

    ANNOTATIONS='--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz'

    ANNOTATIONS=${ANNOTATIONS:-""}

    helm upgrade --install ingress-nginx ingress-nginx \

        --repo https://kubernetes.github.io/ingress-nginx --version ${NGINX_VERSION} \

        --namespace ingress-nginx --create-namespace ${ANNOTATIONS}

installers/mgmt-cluster/00-base-config.rc

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,14 @@ export REMOVE_LOCAL_DIR_BEFORE_CLONING=${REMOVE_LOCAL_DIR_BEFORE_CLONING:-"true" 
# Gitea's default values file

export GITEA_CHART_VALUES_FILE=values-standalone-ingress-ssh2222.yaml



# Gitea's admin user

export GITEA_ADMINISTRATOR_USERNAME=${GITEA_ADMINISTRATOR_USERNAME:-osm-admin}

export GITEA_ADMINISTRATOR_TOKEN_NAME=${GITEA_ADMINISTRATOR_TOKEN_NAME:-admin-token}



# Gitea's regular user

export GITEA_STD_USERNAME=${GITEA_STD_USERNAME:-osm-developer}

export GITEA_STD_TOKEN_NAME=${GITEA_STD_TOKEN_NAME:-developer-token}



# Base name for age keys for management cluster

export AGE_KEY_NAME_MGMT=${AGE_KEY_NAME_MGMT:-age.mgmt}

installers/mgmt-cluster/01-provision-aux-svc.sh

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
# limitations under the License.

#######################################################################################



set -e -o pipefail

set -ex -o pipefail



# Warning!!!: Remember to select the desired kubeconfig profile before launching this script
@@ -34,7 +34,6 @@ m "#####################################################################\n" "${C 
## Uncomment for AKS:

NGINX_VERSION="4.10.0"

ANNOTATIONS='--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz'

ANNOTATIONS=${ANNOTATIONS:-""}

helm upgrade --install ingress-nginx ingress-nginx \

  --repo https://kubernetes.github.io/ingress-nginx --version ${NGINX_VERSION} \

  --namespace ingress-nginx --create-namespace ${ANNOTATIONS}

installers/mgmt-cluster/gitea/90-provision-gitea-for-osm.sh

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
# limitations under the License.

#######################################################################################



set -e -o pipefail

set -ex -o pipefail



export HERE=$(dirname "$(readlink --canonicalize "$BASH_SOURCE")")

source "${HERE}/library/functions.sh"

installers/mgmt-cluster/gitea/ALL-IN-ONE-Gitea-install.sh

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
# limitations under the License.

#######################################################################################



set -e -o pipefail

set -ex -o pipefail



export HERE=$(dirname "$(readlink --canonicalize "$BASH_SOURCE")")

source "${HERE}/library/functions.sh"