From b63447c19545e60d376e161ea1fedcc0f294f605 Mon Sep 17 00:00:00 2001 From: Pawel Wieczorek Date: Fri, 15 Jan 2021 10:28:11 +0100 Subject: Update Vagrant-based minimal ONAP deployment to Guilin This patch updates infrastructure tools to the versions recommended for Guilin release [1][2]. [1] https://docs.onap.org/projects/onap-oom/en/guilin/oom_cloud_setup_guide.html#software-requirements [2] https://docs.onap.org/projects/onap-oom/en/guilin/oom_setup_kubernetes_rancher.html#configure-rancher-kubernetes-engine-rke Issue-ID: ONAPARC-551 Change-Id: Ie9afc481c6376f0990cd09d447bd19c9b05ddf4c Signed-off-by: Pawel Wieczorek --- bootstrap/vagrant-minimal-onap/Vagrantfile | 2 +- bootstrap/vagrant-minimal-onap/config/cluster.yml | 2 +- bootstrap/vagrant-minimal-onap/tools/get_helm.sh | 2 +- bootstrap/vagrant-minimal-onap/tools/get_rke.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bootstrap') diff --git a/bootstrap/vagrant-minimal-onap/Vagrantfile b/bootstrap/vagrant-minimal-onap/Vagrantfile index a8a02d12a..fb1e40217 100644 --- a/bootstrap/vagrant-minimal-onap/Vagrantfile +++ b/bootstrap/vagrant-minimal-onap/Vagrantfile @@ -184,7 +184,7 @@ $rke_up = "rke up" $rke_down = "rke remove --force || true" # best effort $get_oom = <<-SCRIPT - BRANCH="${1:-5.0.1-ONAP}" + BRANCH="${1:-7.0.0-ONAP}" REPO="${2:-https://git.onap.org/oom}" git clone -b "$BRANCH" "$REPO" --recurse-submodules SCRIPT diff --git a/bootstrap/vagrant-minimal-onap/config/cluster.yml b/bootstrap/vagrant-minimal-onap/config/cluster.yml index e4eef11cd..45ca6b6d5 100644 --- a/bootstrap/vagrant-minimal-onap/config/cluster.yml +++ b/bootstrap/vagrant-minimal-onap/config/cluster.yml @@ -36,7 +36,7 @@ ssh_agent_auth: false authorization: mode: rbac ignore_docker_version: false -kubernetes_version: "v1.13.5-rancher1-2" +kubernetes_version: "v1.15.11-rancher1-2" private_registries: - url: nexus3.onap.org:10001 user: docker diff --git a/bootstrap/vagrant-minimal-onap/tools/get_helm.sh b/bootstrap/vagrant-minimal-onap/tools/get_helm.sh index af3548a87..1cd2fc42e 100644 --- a/bootstrap/vagrant-minimal-onap/tools/get_helm.sh +++ b/bootstrap/vagrant-minimal-onap/tools/get_helm.sh @@ -22,7 +22,7 @@ BINARY='helm' INSTALL_DIR='/usr/local/bin/' -DEFAULT_VERSION='v2.16.6' +DEFAULT_VERSION='v2.16.10' DEFAULT_ARCH='amd64' DEFAULT_SYSTEM='linux' diff --git a/bootstrap/vagrant-minimal-onap/tools/get_rke.sh b/bootstrap/vagrant-minimal-onap/tools/get_rke.sh index 01dd20a96..1aed2dc02 100755 --- a/bootstrap/vagrant-minimal-onap/tools/get_rke.sh +++ b/bootstrap/vagrant-minimal-onap/tools/get_rke.sh @@ -18,7 +18,7 @@ # # Constants -DEFAULT_VERSION='v0.2.1' +DEFAULT_VERSION='v1.0.6' DEFAULT_ARCH='amd64' DEFAULT_SYSTEM='linux' -- cgit 1.2.3-korg