From 8eedd0941de306b85c06f22db430f23d62a70c0b Mon Sep 17 00:00:00 2001 From: zamre Date: Mon, 20 Nov 2023 10:48:56 +0000 Subject: [PATCH 1/6] Added instructions to deploy mongodb using helm chart instead of juju charm --- 03-installing-osm.md | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/03-installing-osm.md b/03-installing-osm.md index dfa95d1..c0def62 100644 --- a/03-installing-osm.md +++ b/03-installing-osm.md @@ -576,14 +576,25 @@ zookeeper-0 1/1 Running 1 (2d20h Assuming that you have a Kubernetes cluster, and you have bootstrapped a Juju controller there, it is possible to deploy OSM on top of that cluster. -### Deploy MongoDB charm +### Deploy MongoDB using helm chart -``` -# The following instructions assume that juju client is installed, -# the cloud "k8scloud" pointing to the K8s cluster has been added to juju, -# and a Juju controller "osm" has been bootstrapped there -juju add-model osm k8scloud -juju deploy ch:mongodb-k8s -m osm +```bash +# The following instructions assume that helm is installed and +# default storage class is available in kubernets cluster. + +git clone "https://osm.etsi.org/gerrit/osm/devops" +cd devops +# Optionally check out a specific version +# DESIRED_OSM_VERSION="14.0.0" +# git checkout $DESIRED_OSM_VERSION + +MONGODB_HELM_VERSION="13.9.4" +helm repo add bitnami https://charts.bitnami.com/bitnami +helm repo update +# Check that there are no errors and deploy +helm template mongodb-k8s bitnami/mongodb -n osm -f installers/helm/values/mongodb-values.yaml --version ${MONGODB_HELM_VERSION} +# install mongodb +helm install mongodb-k8s bitnami/mongodb -n osm --create-namespace -f installers/helm/values/mongodb-values.yaml --version ${MONGODB_HELM_VERSION} ``` ### Deploy Cert-manager @@ -633,11 +644,7 @@ OSM_VCA_PUBKEY=$(cat $HOME/.local/share/juju/ssh/juju_id_rsa.pub) Deploy OSM Helm chart: ```bash -git clone "https://osm.etsi.org/gerrit/osm/devops" -cd devops -# Optionally check out a specific version -# DESIRED_OSM_VERSION="14.0.0" -#git checkout $DESIRED_OSM_VERSION +# Make sure you are in devops directory # Check default values helm -n osm show values installers/helm/osm -- GitLab From cbff74464c63995f2683e65592252bcb2ce4ec4a Mon Sep 17 00:00:00 2001 From: zamre Date: Mon, 20 Nov 2023 10:52:22 +0000 Subject: [PATCH 2/6] Added instructions to deploy mongodb using helm chart instead of juju charm --- 03-installing-osm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/03-installing-osm.md b/03-installing-osm.md index c0def62..e30be9f 100644 --- a/03-installing-osm.md +++ b/03-installing-osm.md @@ -580,7 +580,7 @@ Assuming that you have a Kubernetes cluster, and you have bootstrapped a Juju co ```bash # The following instructions assume that helm is installed and -# default storage class is available in kubernets cluster. +# default storage class is available in kubernetes cluster. git clone "https://osm.etsi.org/gerrit/osm/devops" cd devops -- GitLab From a96d47d5d289a27e3fe9ac393cb6711130804626 Mon Sep 17 00:00:00 2001 From: zamre Date: Mon, 20 Nov 2023 10:55:46 +0000 Subject: [PATCH 3/6] Added instructions to deploy mongodb using helm chart instead of juju charm --- 03-installing-osm.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/03-installing-osm.md b/03-installing-osm.md index e30be9f..9d8c05d 100644 --- a/03-installing-osm.md +++ b/03-installing-osm.md @@ -506,7 +506,7 @@ For additional options, see `osm --help` for more info, and check our OSM client ## Reference. Helm-based OSM installation -With Release FOURTEEN, the deployment of OSM services (LCM, RO, NBI, NG-UI, etc.) in the community installer is done with a Helm chart. +With Release FIFTEEN, the deployment of OSM services (LCM, RO, NBI, NG-UI, etc.) in the community installer is done with a Helm chart. When OSM is installed, behind the scenes the following steps are done: @@ -585,7 +585,7 @@ Assuming that you have a Kubernetes cluster, and you have bootstrapped a Juju co git clone "https://osm.etsi.org/gerrit/osm/devops" cd devops # Optionally check out a specific version -# DESIRED_OSM_VERSION="14.0.0" +# DESIRED_OSM_VERSION="15.0.0" # git checkout $DESIRED_OSM_VERSION MONGODB_HELM_VERSION="13.9.4" -- GitLab From de44e1325c53a3ee5c1df8dc0de64db954f46202 Mon Sep 17 00:00:00 2001 From: zamre Date: Mon, 20 Nov 2023 11:46:20 +0000 Subject: [PATCH 4/6] Added command to build helm dependencies for feature 11008 Signed-off-by: zamre --- 03-installing-osm.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/03-installing-osm.md b/03-installing-osm.md index 9d8c05d..df70a21 100644 --- a/03-installing-osm.md +++ b/03-installing-osm.md @@ -663,6 +663,9 @@ OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.cacert=${OSM_VCA_CACERT}" # OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.repositoryBase=opensourcemano" # OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.tag=14" +# Build the depedencies +helm dependency build installers/helm/osm + # Check that there are no errors helm -n osm template osm installers/helm/osm -f osm-values.yaml ${OSM_HELM_OPTS} -- GitLab From c27e8ec2ad0ff545f1181bdf0356dc33763efffb Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 21 Dec 2023 11:13:27 +0000 Subject: [PATCH 5/6] Update 03-installing-osm.md --- 03-installing-osm.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/03-installing-osm.md b/03-installing-osm.md index df70a21..1dd8bce 100644 --- a/03-installing-osm.md +++ b/03-installing-osm.md @@ -506,7 +506,7 @@ For additional options, see `osm --help` for more info, and check our OSM client ## Reference. Helm-based OSM installation -With Release FIFTEEN, the deployment of OSM services (LCM, RO, NBI, NG-UI, etc.) in the community installer is done with a Helm chart. +Since Release FOURTEEN, the deployment of OSM services (LCM, RO, NBI, NG-UI, etc.) in the community installer is done with a Helm chart. When OSM is installed, behind the scenes the following steps are done: @@ -578,10 +578,9 @@ Assuming that you have a Kubernetes cluster, and you have bootstrapped a Juju co ### Deploy MongoDB using helm chart -```bash -# The following instructions assume that helm is installed and -# default storage class is available in kubernetes cluster. +The following instructions assume that helm is installed and default storage class is available in kubernetes cluster. +```bash git clone "https://osm.etsi.org/gerrit/osm/devops" cd devops # Optionally check out a specific version @@ -645,6 +644,10 @@ Deploy OSM Helm chart: ```bash # Make sure you are in devops directory +cd devops +# Optionally check out a specific version +# DESIRED_OSM_VERSION="15.0.0" +# git checkout $DESIRED_OSM_VERSION # Check default values helm -n osm show values installers/helm/osm -- GitLab From 92cb965d8073ead1426069101e7b1900733458f4 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 21 Dec 2023 11:14:14 +0000 Subject: [PATCH 6/6] Update 03-installing-osm.md --- 03-installing-osm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/03-installing-osm.md b/03-installing-osm.md index 1dd8bce..8c554b8 100644 --- a/03-installing-osm.md +++ b/03-installing-osm.md @@ -666,7 +666,7 @@ OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.cacert=${OSM_VCA_CACERT}" # OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.repositoryBase=opensourcemano" # OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.tag=14" -# Build the depedencies +# Build the helm chart dependencies helm dependency build installers/helm/osm # Check that there are no errors -- GitLab