diff options
author | 2018-12-07 12:15:11 -0500 | |
---|---|---|
committer | 2018-12-07 12:16:00 -0500 | |
commit | b2bb34eba1adece6b7238ee21a5f9f4fe2959b8a (patch) | |
tree | 5ba60860211bdf4c8ffb3062cc8830afed8ac33d /deploy/rancher | |
parent | 12c57ca0cfbe70308242913f396e3653380697e8 (diff) |
upgrade rancher/k8s to 1.6.25
Change-Id: I086ceeebe78c2782cb0f752f1e214794e4f8ca46
Issue-ID: LOG-895
Signed-off-by: root <frank.obrien@amdocs.com>
Diffstat (limited to 'deploy/rancher')
-rwxr-xr-x | deploy/rancher/oom_entrypoint.sh | 6 | ||||
-rwxr-xr-x | deploy/rancher/oom_rancher_setup.sh | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/deploy/rancher/oom_entrypoint.sh b/deploy/rancher/oom_entrypoint.sh index 91eacf0..006f3a0 100755 --- a/deploy/rancher/oom_entrypoint.sh +++ b/deploy/rancher/oom_entrypoint.sh @@ -23,10 +23,8 @@ # source from https://jira.onap.org/browse/LOG-325 # Michael O'Brien # -# Amsterdam -# Rancher 1.6.10, Kubernetes 1.7.7, Kubectl 1.7.7, Helm 2.3.0, Docker 1.12 -# master (casablanca : RC2) -# Rancher 1.6.22, Kubernetes 1.11.2, Kubectl 1.11.2, Helm 2.9.2, Docker 17.03 +# master/dublin - LOG-895 +# Rancher 1.6.25, Kubernetes 1.11.3, kubectl 1.11.3, Helm 2.9.2, Docker 17.03 # run as root - because of the logout that would be required after the docker user set usage() { diff --git a/deploy/rancher/oom_rancher_setup.sh b/deploy/rancher/oom_rancher_setup.sh index 42b1428..b9366fb 100755 --- a/deploy/rancher/oom_rancher_setup.sh +++ b/deploy/rancher/oom_rancher_setup.sh @@ -26,10 +26,12 @@ # Rancher 1.6.10, Kubernetes 1.7.7, Kubectl 1.7.7, Helm 2.3.0, Docker 1.12 # beijing # Rancher 1.6.14, Kubernetes 1.8.10, Kubectl 1.8.10, Helm 2.8.2, Docker 17.03 -# master/casablanca (until RC1) +# casablanca (until RC1) # Rancher 1.6.18, Kubernetes 1.10.3, Kubectl 1.10.3, Helm 2.9.2, Docker 17.03 -# master/casablanca (post RC2) - integration change alignment for INT-586 - 29th Oct via LOG-806 +# casablanca - integration change alignment for INT-586 - 29th Oct via LOG-806 # Rancher 1.6.22, Kubernetes 1.11.2, kubectl 1.11.2, Helm 2.9.2, Docker 17.03 +# master/dublin - LOG-895 +# Rancher 1.6.25, Kubernetes 1.11.3, kubectl 1.11.3, Helm 2.9.2, Docker 17.03 usage() { cat <<EOF @@ -70,8 +72,8 @@ install_onap() { DOCKER_VERSION=17.03 AGENT_VERSION=1.2.11 else - RANCHER_VERSION=1.6.22 - KUBECTL_VERSION=1.11.2 + RANCHER_VERSION=1.6.25 + KUBECTL_VERSION=1.11.3 HELM_VERSION=2.9.1 DOCKER_VERSION=17.03 AGENT_VERSION=1.2.11 |