From dec32696e584e56017900c3878bea4b9d1edd25b Mon Sep 17 00:00:00 2001
From: Michael O'Brien <michael@obrienlabs.org>
Date: Tue, 6 Nov 2018 14:32:29 -0500
Subject: align Rancher/k8s with 1.6.22 post RC1

Change-Id: I17ebbd77dd92b88a20ae7936955a15a78fb11435
Issue-ID: LOG-806
Signed-off-by: Michael O'Brien <michael@obrienlabs.org>
---
 deploy/aws/oom_cluster_host_install.sh |  5 +++--
 deploy/rancher/oom_entrypoint.sh       |  6 +++---
 deploy/rancher/oom_rancher_setup.sh    | 18 +++++++++++++-----
 3 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'deploy')

diff --git a/deploy/aws/oom_cluster_host_install.sh b/deploy/aws/oom_cluster_host_install.sh
index bee4bef..bf3c4da 100755
--- a/deploy/aws/oom_cluster_host_install.sh
+++ b/deploy/aws/oom_cluster_host_install.sh
@@ -15,11 +15,12 @@
 # limitations under the License.
 #
 #############################################################################
-# v20180815
+# v20181105
 # Amazon AWS specific EFS/NFS share and rancher host join script for each cluster node
 # https://wiki.onap.org/display/DW/Cloud+Native+Deployment
 # source from https://jira.onap.org/browse/OOM-320
 # Michael O'Brien
+# LOG-806 upgrade for Rancher 1.6.22, kubernetes 1.11
 
 usage() {
 cat <<EOF
@@ -77,7 +78,7 @@ MASTER=
 TOKEN=
 AWS_REGION=
 AWS_EFS=
-AGENT_VER=1.2.10
+AGENT_VER=1.2.11
 COMPUTEADDRESS=true
 ADDRESS=
 VALIDATE=
diff --git a/deploy/rancher/oom_entrypoint.sh b/deploy/rancher/oom_entrypoint.sh
index 938901f..91eacf0 100755
--- a/deploy/rancher/oom_entrypoint.sh
+++ b/deploy/rancher/oom_entrypoint.sh
@@ -20,13 +20,13 @@
 # after this run the standard oom install
 # this installation can be run on amy ubuntu 16.04 VM or physical host
 # https://wiki.onap.org/display/DW/ONAP+on+Kubernetes
-# source from https://jira.onap.org/browse/OOM-715
+# 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
-#     Rancher 1.6.14, Kubernetes 1.8.10, Kubectl 1.8.10, Helm 2.8.2, Docker 17.03
+# master (casablanca : RC2)
+#     Rancher 1.6.22, Kubernetes 1.11.2, Kubectl 1.11.2, 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 776eb62..42b1428 100755
--- a/deploy/rancher/oom_rancher_setup.sh
+++ b/deploy/rancher/oom_rancher_setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #############################################################################
 #
-# Copyright © 2018 Amdocs, Bell.
+# Copyright © 2018 Amdocs.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,8 +26,10 @@
 #     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
+# master/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
+#     Rancher 1.6.22, Kubernetes 1.11.2, kubectl 1.11.2, Helm 2.9.2, Docker 17.03
 
 usage() {
 cat <<EOF
@@ -61,12 +63,18 @@ install_onap() {
     HELM_VERSION=2.8.2
     DOCKER_VERSION=17.03
     AGENT_VERSION=1.2.9
+  elif [ "$BRANCH" == "casablanca" ]; then
+    RANCHER_VERSION=1.6.22
+    KUBECTL_VERSION=1.11.2
+    HELM_VERSION=2.9.1
+    DOCKER_VERSION=17.03
+    AGENT_VERSION=1.2.11
   else
-    RANCHER_VERSION=1.6.18
-    KUBECTL_VERSION=1.10.3
+    RANCHER_VERSION=1.6.22
+    KUBECTL_VERSION=1.11.2
     HELM_VERSION=2.9.1
     DOCKER_VERSION=17.03
-    AGENT_VERSION=1.2.10
+    AGENT_VERSION=1.2.11
   fi
 
   echo "Installing on ${SERVER} for ${BRANCH}: Rancher: ${RANCHER_VERSION} Kubectl: ${KUBECTL_VERSION} Helm: ${HELM_VERSION} Docker: ${DOCKER_VERSION}"
-- 
cgit 1.2.3-korg