From b2bb34eba1adece6b7238ee21a5f9f4fe2959b8a Mon Sep 17 00:00:00 2001
From: root <frank.obrien@amdocs.com>
Date: Fri, 7 Dec 2018 12:15:11 -0500
Subject: upgrade rancher/k8s to 1.6.25

Change-Id: I086ceeebe78c2782cb0f752f1e214794e4f8ca46
Issue-ID: LOG-895
Signed-off-by: root <frank.obrien@amdocs.com>
---
 deploy/aws/oom_cluster_host_install.sh |  5 ++++-
 deploy/azure/oom_deployment.sh         | 14 ++++++++++----
 deploy/cd.sh                           |  9 ++++++---
 deploy/rancher/oom_entrypoint.sh       |  6 ++----
 deploy/rancher/oom_rancher_setup.sh    | 10 ++++++----
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/deploy/aws/oom_cluster_host_install.sh b/deploy/aws/oom_cluster_host_install.sh
index bf3c4da..25a8734 100755
--- a/deploy/aws/oom_cluster_host_install.sh
+++ b/deploy/aws/oom_cluster_host_install.sh
@@ -15,12 +15,15 @@
 # limitations under the License.
 #
 #############################################################################
-# v20181105
+# v20181207
 # 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
+# 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
diff --git a/deploy/azure/oom_deployment.sh b/deploy/azure/oom_deployment.sh
index 6093563..bdd2a01 100755
--- a/deploy/azure/oom_deployment.sh
+++ b/deploy/azure/oom_deployment.sh
@@ -22,12 +22,18 @@
 # https://wiki.onap.org/display/DW/ONAP+on+Kubernetes
 # source from https://jira.onap.org/browse/OOM-715
 # Michael O'Brien
-# Amsterdam
+# amsterdam
 #     Rancher 1.6.10, Kubernetes 1.7.7, Kubectl 1.7.7, Helm 2.3.0, Docker 1.12
-# master
-#     Rancher 1.6.22, Kubernetes 1.11.2, Kubectl 1.11.2, Helm 2.9.2, Docker 17.03
+# beijing
+#     Rancher 1.6.14, Kubernetes 1.8.10, Kubectl 1.8.10, Helm 2.8.2, Docker 17.03
+# casablanca (until RC1)
+#     Rancher 1.6.18, Kubernetes 1.10.3, Kubectl 1.10.3, Helm 2.9.2, Docker 17.03
+# 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
 # run as root - because of the logout that would be required after the docker user set
-# 10249-10255 security is provided by rancher oauth via github - use this instead of port level control in the NSG
+# 10249-10255 security is provided by rancher oauth RBAC via github - use this instead of port level control in the NSG
 # https://wiki.onap.org/display/DW/Cloud+Native+Deployment#CloudNativeDeployment-Security
 usage() {
 cat <<EOF
diff --git a/deploy/cd.sh b/deploy/cd.sh
index 295ef01..6d0ac80 100755
--- a/deploy/cd.sh
+++ b/deploy/cd.sh
@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 #############################################################################
-# v20180318
+# v20181207
 # https://wiki.onap.org/display/DW/ONAP+on+Kubernetes
-# source from https://jira.onap.org/browse/OOM-715, 716, 711
+# source from https://jira.onap.org/browse/OOM-320, 326, 321
 # Michael O'Brien
 #
 
@@ -28,6 +28,7 @@ example
 ./cd.sh -b amsterdam -e onap (will rerun onap in the onap namespace, no new repo, no deletion of existing repo, no sdnc workaround, no onap removal at the end
 ./cd.sh -b master -e onap -c true -d true -w true -r true (run as cd server, new oom, delete prev oom, run workarounds, clean onap at the end of the script
 ./cd.sh -b master -e onap -c true -d false -w true -r false (standard new server/dev environment - use this as the default)
+provide a dev.yaml override - copy from https://git.onap.org/oom/tree/kubernetes/onap/resources/environments/dev.yaml
 
 -u                  : Display usage
 -b [branch]         : branch = master/beijing or amsterdam (required)
@@ -44,6 +45,7 @@ deploy_onap() {
   echo "$(date)"
   echo "running with: -b $BRANCH -e $ENVIRON -c $CLONE_NEW_OOM -d $DELETE_PREV_OOM -w $APPLY_WORKAROUNDS -r $REMOVE_OOM_AT_END"
   echo "provide onap-parameters.yaml(amsterdam) or values.yaml(master) and aai-cloud-region-put.json"
+  echo "provide a dev.yaml override - copy from https://git.onap.org/oom/tree/kubernetes/onap/resources/environments/dev.yaml"
   #exit 0
   # fix virtual memory for onap-log:elasticsearch under Rancher 1.6.11 - OOM-431
   sudo sysctl -w vm.max_map_count=262144
@@ -73,6 +75,7 @@ deploy_onap() {
     # delete potential hanging clustered pods
     #kubectl delete pod $ENVIRON-aaf-sms-vault-0 -n $ENVIRON --grace-period=0 --force
     # specific to when there is no helm release
+    # see https://wiki.onap.org/display/DW/Cloud+Native+Deployment#CloudNativeDeployment-RemoveaDeployment
     kubectl delete pv --all
     kubectl delete pvc --all
     kubectl delete secrets --all
@@ -136,7 +139,7 @@ deploy_onap() {
     sudo make all
     sudo make $ENVIRON
     #sudo helm install local/onap -n onap --namespace $ENVIRON
-    sudo helm deploy onap local/onap --namespace $ENVIRON
+    sudo helm deploy onap local/onap --namespace $ENVIRON -f ../../dev.yaml
     cd ../../
   fi
 
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
-- 
cgit 1.2.3-korg