Commit 8d8cd99f authored by garciadeblas's avatar garciadeblas
Browse files

Features 11017 and 11018: setup of mgmt cluster and git repo 



This change incorporates the changes to setup a mgmt cluster for
cloud-native operations in OSM following a GitOps model, which includes
the setup of an internal git repository.

Change-Id: If828d18ad64d852a9a89ec9ba7c2d3a96d281565
Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>
parent 90344b6b

installers/full_install_osm.sh

+44 −12
Original line number Diff line number Diff line
@@ -26,6 +26,12 @@ function usage(){ 
    echo -e "     -k <repo key>:  use specified repository public key url"

    echo -e "     -a <apt proxy url>: use this apt proxy url when downloading apt packages (air-gapped installation)"

    echo -e "     -c <kubernetes engine>: use a specific kubernetes engine (options: kubeadm, k3s), default is kubeadm"

    echo -e "     -t <docker tag> specify osm docker tag (default is latest)"

    echo -e "     -M <KUBECONFIG_FILE>: Kubeconfig of an existing cluster to be used as mgmt cluster instead of OSM cluster"

    echo -e "     -G <KUBECONFIG_FILE>: Kubeconfig of an existing cluster to be used as auxiliary cluster instead of OSM cluster"

    echo -e "     --no-mgmt-cluster: Do not provision a mgmt cluster for cloud-native gitops operations in OSM (NEW in Release SIXTEEN) (by default, it is installed)"

    echo -e "     --no-aux-cluster: Do not provision an auxiliary cluster for cloud-native gitops operations in OSM (NEW in Release SIXTEEN) (by default, it is installed)"

    echo -e "     -D <devops path>:   use local devops installation path"

    echo -e "     -s <namespace>  namespace when installed using k8s, default is osm"

    echo -e "     -H <VCA host>   use specific juju host controller IP"

    echo -e "     -S <VCA secret> use VCA/juju secret key"
@@ -35,13 +41,11 @@ function usage(){ 
    echo -e "     --old-sa:       install old Service Assurance framework (MON, POL); do not install Airflow and Pushgateway"

    echo -e "     --ng-sa:        install new Service Assurance framework (Airflow, AlertManager and Pushgateway) (enabled by default)"

    echo -e "     -o <COMPONENT>: ONLY installs the specified component (k8s_monitor, ng-sa, k8scluster, docker, deploy-osm)"

    echo -e "     -O <openrc file path/cloud name>: Install OSM to an OpenStack infrastructure. <openrc file/cloud name> is required. If a <cloud name> is used, the clouds.yaml file should be under ~/.config/openstack/ or /etc/openstack/"

    echo -e "     -N <openstack public network name/ID>: Public network name required to setup OSM to OpenStack"

    echo -e "     -f <path to SSH public key>: Public SSH key to use to deploy OSM to OpenStack"

    echo -e "     -F <path to cloud-init file>: Cloud-Init userdata file to deploy OSM to OpenStack"

    echo -e "     -D <devops path> use local devops installation path"

    echo -e "     -w <work dir>   Location to store runtime installation"

    echo -e "     -t <docker tag> specify osm docker tag (default is latest)"

    echo -e "     -O <openrc file path/cloud name>: install OSM to an OpenStack infrastructure. <openrc file/cloud name> is required. If a <cloud name> is used, the clouds.yaml file should be under ~/.config/openstack/ or /etc/openstack/"

    echo -e "     -N <openstack public network name/ID>: public network name required to setup OSM to OpenStack"

    echo -e "     -f <path to SSH public key>: public SSH key to use to deploy OSM to OpenStack"

    echo -e "     -F <path to cloud-init file>: cloud-init userdata file to deploy OSM to OpenStack"

    echo -e "     -w <work dir>:   Location to store runtime installation"

    echo -e "     -l:             LXD cloud yaml file"

    echo -e "     -L:             LXD credentials yaml file"

    echo -e "     -K:             Specifies the name of the controller to use - The controller must be already bootstrapped"
@@ -222,6 +226,7 @@ EOF" 
    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}"

    [ -z "${INSTALL_MGMT_CLUSTER}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.gitops.enabled=false}"



    if [ -n "${INSTALL_JUJU}" ]; then

        OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.enabled=true"
@@ -497,14 +502,18 @@ function install_osm() { 
    fi

    track docker_ce docker_ce_ok



    echo "Installing helm client ..."

    $OSM_DEVOPS/installers/install_helm_client.sh -D ${OSM_DEVOPS} ${DEBUG_INSTALL} || \

    FATAL_TRACK k8scluster "install_helm_client.sh failed"

    track helm_client install_helm_client_ok



    echo "Installing K8s cluster ..."

    install_k8s_cluster

    kubectl create namespace ${OSM_NAMESPACE}

    track k8scluster k8scluster_ok



    if [ -n "${INSTALL_JUJU}" ]; then

        echo "Installing Juju ..."

        JUJU_OPTS="-D ${OSM_DEVOPS} -s ${OSM_NAMESPACE} -i ${OSM_DEFAULT_IP} ${DEBUG_INSTALL} ${INSTALL_CACHELXDIMAGES}"

        [ -n "${OSM_VCA_HOST}" ] && JUJU_OPTS="$JUJU_OPTS -H ${OSM_VCA_HOST}"

        [ -n "${LXD_CLOUD_FILE}" ] && JUJU_OPTS="$JUJU_OPTS -l ${LXD_CLOUD_FILE}"
@@ -519,7 +528,22 @@ function install_osm() { 
    # This track is maintained for backwards compatibility

    track docker_images docker_images_ok



    # Install mgmt cluster

    echo "Installing mgmt cluster ..."

    MGMTCLUSTER_INSTALL_OPTS="-D ${OSM_DEVOPS} ${DEBUG_INSTALL}"

    [ -n "${INSTALL_MGMT_CLUSTER}" ] || MGMTCLUSTER_INSTALL_OPTS="${MGMTCLUSTER_INSTALL_OPTS} --no-mgmt-cluster"

    [ -n "${INSTALL_AUX_CLUSTER}" ] || MGMTCLUSTER_INSTALL_OPTS="${MGMTCLUSTER_INSTALL_OPTS} --no-aux-cluster"

    export KUBECONFIG_MGMT_CLUSTER=${KUBECONFIG_MGMT_CLUSTER:-"$HOME/.kube/config"}

    export KUBECONFIG_AUX_CLUSTER=${KUBECONFIG_AUX_CLUSTER:-"$HOME/.kube/config"}

    MGMTCLUSTER_INSTALL_OPTS="${MGMTCLUSTER_INSTALL_OPTS} -M ${KUBECONFIG_MGMT_CLUSTER}"

    MGMTCLUSTER_INSTALL_OPTS="${MGMTCLUSTER_INSTALL_OPTS} -G ${KUBECONFIG_AUX_CLUSTER}"

    echo "Options: ${MGMTCLUSTER_INSTALL_OPTS}"

    $OSM_DEVOPS/installers/mgmt-cluster/install_mgmt_cluster.sh ${MGMTCLUSTER_INSTALL_OPTS} || \

    FATAL_TRACK mgmtcluster "install_mgmt_cluster.sh failed"

    track mgmtcluster mgmt_and_aux_cluster_ok



    # Deploy OSM (mongodb, OSM helm chart, NGSA)

    echo "Deploying OSM in the K8s cluster ..."

    deploy_osm



    if [ -n "$INSTALL_K8S_MONITOR" ]; then
@@ -528,7 +552,7 @@ function install_osm() { 
        track deploy_osm install_k8s_monitoring_ok

    fi



    [ -z "$INSTALL_NOHOSTCLIENT" ] && install_osmclient

    [ -z "$INSTALL_NOHOSTCLIENT" ] && echo "Installing osmclient ..." && install_osmclient

    track osmclient osmclient_ok



    echo -e "Checking OSM health state..."
@@ -538,6 +562,7 @@ function install_osm() { 
    track healthchecks osm_unhealthy didnotconverge)

    track healthchecks after_healthcheck_ok



    echo -e "Adding local K8s cluster _system-osm-k8s to OSM ..."

    add_local_k8scluster

    track final_ops add_local_k8scluster_ok
@@ -643,7 +668,6 @@ function dump_vars(){ 
    echo "INSTALL_PLA=$INSTALL_PLA"

    echo "INSTALL_TO_OPENSTACK=$INSTALL_TO_OPENSTACK"

    echo "INSTALL_VIMEMU=$INSTALL_VIMEMU"

    echo "NO_HOST_PORTS=$NO_HOST_PORTS"

    echo "OPENSTACK_PUBLIC_NET_NAME=$OPENSTACK_PUBLIC_NET_NAME"

    echo "OPENSTACK_OPENRC_FILE_OR_CLOUD=$OPENSTACK_OPENRC_FILE_OR_CLOUD"

    echo "OPENSTACK_ATTACH_VOLUME=$OPENSTACK_ATTACH_VOLUME"
@@ -721,6 +745,8 @@ INSTALL_DOCKER="" 
INSTALL_JUJU=""

INSTALL_NOHOSTCLIENT=""

INSTALL_CACHELXDIMAGES=""

INSTALL_AUX_CLUSTER="y"

INSTALL_MGMT_CLUSTER="y"

OSM_DEVOPS=

OSM_VCA_HOST=

OSM_VCA_SECRET=
@@ -728,7 +754,6 @@ OSM_VCA_PUBKEY= 
OSM_VCA_CLOUDNAME="localhost"

OSM_VCA_K8S_CLOUDNAME="k8scloud"

OSM_NAMESPACE=osm

NO_HOST_PORTS=""

REPOSITORY_KEY="OSM%20ETSI%20Release%20Key.gpg"

REPOSITORY_BASE="https://osm-download.etsi.org/repository/osm/debian"

OSM_WORK_DIR="/etc/osm"
@@ -756,7 +781,7 @@ DOCKER_PROXY_URL= 
MODULE_DOCKER_TAG=

OSM_INSTALLATION_TYPE="Default"



while getopts ":a:c:r:n:k:u:R:D:o:O:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o; do

while getopts ":a:c:r:n:k:u:R:D:o:O:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:G:M:-: hy" o; do

    case "${o}" in

        a)

            APT_PROXY_URL=${OPTARG}
@@ -853,10 +878,18 @@ while getopts ":a:c:r:n:k:u:R:D:o:O:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o; do 
        T)

            MODULE_DOCKER_TAG="${OPTARG}"

            ;;

        M)

            KUBECONFIG_MGMT_CLUSTER="${OPTARG}"

            ;;

        G)

            KUBECONFIG_AUX_CLUSTER="${OPTARG}"

            ;;

        -)

            [ "${OPTARG}" == "help" ] && usage && exit 0

            [ "${OPTARG}" == "debug" ] && DEBUG_INSTALL="--debug" && continue

            [ "${OPTARG}" == "uninstall" ] && UNINSTALL="y" && continue

            [ "${OPTARG}" == "no-mgmt-cluster" ] && INSTALL_MGMT_CLUSTER="" && continue

            [ "${OPTARG}" == "no-aux-cluster" ] && INSTALL_AUX_CLUSTER="" && continue

            [ "${OPTARG}" == "update" ] && UPDATE="y" && continue

            [ "${OPTARG}" == "reconfigure" ] && RECONFIGURE="y" && continue

            [ "${OPTARG}" == "test" ] && TEST_INSTALLER="y" && continue
@@ -866,7 +899,6 @@ while getopts ":a:c:r:n:k:u:R:D:o:O:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o; do 
            [ "${OPTARG}" == "docker" ] && INSTALL_DOCKER="y" && continue

            [ "${OPTARG}" == "nodocker" ] && INSTALL_DOCKER="" && continue

            [ "${OPTARG}" == "showopts" ] && SHOWOPTS="y" && continue

            [ "${OPTARG}" == "nohostports" ] && NO_HOST_PORTS="y" && continue

            [ "${OPTARG}" == "juju" ] && INSTALL_JUJU="y" && continue

            [ "${OPTARG}" == "nojuju" ] && INSTALL_JUJU="" && continue

            [ "${OPTARG}" == "nohostclient" ] && INSTALL_NOHOSTCLIENT="y" && continue

installers/helm/osm/templates/lcm/lcm-deployment.yaml

+15 −0
Original line number Diff line number Diff line
@@ -119,6 +119,12 @@ spec: 
            - mountPath: /etc/ssl/lcm-client/

              name: lcm-client-cert

              readOnly: true

            {{- if .Values.global.gitops.enabled }}

            - mountPath: /etc/osm/mgmtcluster-kubeconfig.yaml

              name: mgmtcluster-kubeconfig

              readOnly: true

              subPath: mgmtcluster-kubeconfig.yaml

            {{- end }}

      volumes:

        - name: osm-ca

          secret:
@@ -131,6 +137,15 @@ spec: 
          secret:

            defaultMode: 420

            secretName: lcm-client-cert

        {{- if .Values.global.gitops.enabled }}

        - name: mgmtcluster-kubeconfig

          secret:

            defaultMode: 420

            items:

            - key: kubeconfig

              path: mgmtcluster-kubeconfig.yaml

            secretName: mgmtcluster-secret

        {{- end }}

      {{- with .Values.global.nodeSelector }}

      nodeSelector:

        {{- toYaml . | nindent 8 }}

installers/helm/osm/values.yaml

+9 −0
Original line number Diff line number Diff line
@@ -54,6 +54,15 @@ global: 
        # secretName: mongodb-k8s

        # secretKeyRootPassword: mongodb-root-password



  gitops:

    enabled: true

    auxcluster:

      secretName: auxcluster-secret

      secretKey: kubeconfig

    mgmtcluster:

      secretName: mgmtcluster-secret

      secretKey: kubeconfig



  podAnnotations: {}



  podSecurityContext:

installers/install_kubeadm_cluster.sh

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ check_and_track_k8s_ready_before_helm 


install_k8s_metrics



# Clean existing namespace (idempotent installation)

remove_k8s_namespace osm



# install_helm has been moved to install_helm_client.sh, run from full_install_osm.sh,

installers/install_osm.sh

+14 −8
Original line number Diff line number Diff line
@@ -29,6 +29,13 @@ function usage(){ 
    echo -e "     -u <repo base>: use specified repository url for osm packages"

    echo -e "     -k <repo key>:  use specified repository public key url"

    echo -e "     -a <apt proxy url>: use this apt proxy url when downloading apt packages (air-gapped installation)"

    echo -e "     -c <kubernetes engine>: use a specific kubernetes engine (options: kubeadm, k3s), default is kubeadm"

    echo -e "     -t <docker tag> specify osm docker tag (default is latest)"

    echo -e "     -M <KUBECONFIG_FILE>: Kubeconfig of an existing cluster to be used as mgmt cluster instead of OSM cluster"

    echo -e "     -G <KUBECONFIG_FILE>: Kubeconfig of an existing cluster to be used as auxiliary cluster instead of OSM cluster"

    echo -e "     --no-mgmt-cluster: Do not provision a mgmt cluster for cloud-native gitops operations in OSM (NEW in Release SIXTEEN) (by default, it is installed)"

    echo -e "     --no-aux-cluster: Do not provision an auxiliary cluster for cloud-native gitops operations in OSM (NEW in Release SIXTEEN) (by default, it is installed)"

    echo -e "     -D <devops path>:   use local devops installation path"

    echo -e "     -s <namespace>  namespace when installed using k8s, default is osm"

    echo -e "     -H <VCA host>   use specific juju host controller IP"

    echo -e "     -S <VCA secret> use VCA/juju secret key"
@@ -38,13 +45,11 @@ function usage(){ 
    echo -e "     --old-sa:       install old Service Assurance framework (MON, POL); do not install Airflow and Pushgateway"

    echo -e "     --ng-sa:        install new Service Assurance framework (Airflow, AlertManager and Pushgateway) (enabled by default)"

    echo -e "     -o <COMPONENT>: ONLY installs the specified component (k8s_monitor, ng-sa, k8scluster, docker, deploy-osm)"

    echo -e "     -O <openrc file path/cloud name>: Install OSM to an OpenStack infrastructure. <openrc file/cloud name> is required. If a <cloud name> is used, the clouds.yaml file should be under ~/.config/openstack/ or /etc/openstack/"

    echo -e "     -N <openstack public network name/ID>: Public network name required to setup OSM to OpenStack"

    echo -e "     -f <path to SSH public key>: Public SSH key to use to deploy OSM to OpenStack"

    echo -e "     -F <path to cloud-init file>: Cloud-Init userdata file to deploy OSM to OpenStack"

    echo -e "     -D <devops path> use local devops installation path"

    echo -e "     -w <work dir>   Location to store runtime installation"

    echo -e "     -t <docker tag> specify osm docker tag (default is latest)"

    echo -e "     -O <openrc file path/cloud name>: install OSM to an OpenStack infrastructure. <openrc file/cloud name> is required. If a <cloud name> is used, the clouds.yaml file should be under ~/.config/openstack/ or /etc/openstack/"

    echo -e "     -N <openstack public network name/ID>: public network name required to setup OSM to OpenStack"

    echo -e "     -f <path to SSH public key>: public SSH key to use to deploy OSM to OpenStack"

    echo -e "     -F <path to cloud-init file>: cloud-init userdata file to deploy OSM to OpenStack"

    echo -e "     -w <work dir>:   Location to store runtime installation"

    echo -e "     -l:             LXD cloud yaml file"

    echo -e "     -L:             LXD credentials yaml file"

    echo -e "     -K:             Specifies the name of the controller to use - The controller must be already bootstrapped"
@@ -130,7 +135,8 @@ EOF" 
    [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function

}



while getopts ":a:b:r:n:k:u:R:D:o:O:m:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o; do

while getopts ":a:c:r:n:k:u:R:D:o:O:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:G:M:-: hy" o; do



    case "${o}" in

        D)

            DEVOPS_PATH="${OPTARG}"