From 7a04b3d35d26d45191a1afc080981401b55dbb92 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 15 Aug 2018 12:31:46 -0700 Subject: Upgrade helm version to 2.9.1 Change-Id: I7fe74f43ff76a33225fad6102be5d429fd30197f Issue-ID: OOM-1299 Signed-off-by: Gary Wu --- deployment/heat/onap-oom/k8s_vm_entrypoint.sh | 3 ++- deployment/heat/onap-oom/onap-oom.yaml | 30 ++++++++++++++++++++++ deployment/heat/onap-oom/parts/onap-oom-1.yaml | 20 +++++++++++++++ deployment/heat/onap-oom/parts/onap-oom-2.yaml | 1 + deployment/heat/onap-oom/rancher_vm_entrypoint.sh | 22 ++++++++++------ .../heat/onap-oom/scripts/gen-onap-oom-yaml.sh | 5 ++++ 6 files changed, 72 insertions(+), 9 deletions(-) (limited to 'deployment') diff --git a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh index 11d805799..54a674125 100644 --- a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh @@ -12,6 +12,7 @@ printenv mkdir -p /opt/config +echo "__docker_version__" > /opt/config/docker_version.txt echo "__rancher_ip_addr__" > /opt/config/rancher_ip_addr.txt echo "__rancher_private_ip_addr__" > /opt/config/rancher_private_ip_addr.txt HOST_IP=$(hostname -I) @@ -41,7 +42,7 @@ apt-get -y install linux-image-extra-$(uname -r) jq nfs-common cd ~ # install docker 17.03 -curl -s https://releases.rancher.com/install-docker/17.03.sh | sh +curl -s https://releases.rancher.com/install-docker/__docker_version__.sh | sh usermod -aG docker ubuntu # Fix virtual memory allocation for onap-log:elasticsearch: diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index 41bd31619..5c99bdb75 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -59,6 +59,26 @@ parameters: type: string default: "onap_key" + docker_version: + type: string + default: "17.03" + + rancher_version: + type: string + default: "1.6.18" + + rancher_agent_version: + type: string + default: "1.2.10" + + kubectl_version: + type: string + default: "1.8.10" + + helm_version: + type: string + default: "2.9.1" + resources: random-str: type: OS::Heat::RandomString @@ -166,6 +186,11 @@ resources: __oom_gerrit_branch__: { get_param: oom_gerrit_branch } __oom_gerrit_refspec__: { get_param: oom_gerrit_refspec } __docker_manifest__: { get_param: docker_manifest } + __docker_version__: { get_param: docker_version } + __rancher_version__: { get_param: rancher_version } + __rancher_agent_version__: { get_param: rancher_agent_version } + __kubectl_version__: { get_param: kubectl_version } + __helm_version__: { get_param: helm_version } __public_net_id__: { get_param: public_net_id } __oam_network_cidr__: { get_param: oam_network_cidr } __oam_network_id__: { get_resource: oam_network } @@ -214,6 +239,7 @@ resources: params: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } template: @@ -248,6 +274,7 @@ resources: params: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } template: @@ -282,6 +309,7 @@ resources: params: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } template: @@ -316,6 +344,7 @@ resources: params: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } template: @@ -350,6 +379,7 @@ resources: params: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } template: diff --git a/deployment/heat/onap-oom/parts/onap-oom-1.yaml b/deployment/heat/onap-oom/parts/onap-oom-1.yaml index ac0f6b409..8031505b7 100644 --- a/deployment/heat/onap-oom/parts/onap-oom-1.yaml +++ b/deployment/heat/onap-oom/parts/onap-oom-1.yaml @@ -56,6 +56,26 @@ parameters: type: string default: "onap_key" + docker_version: + type: string + default: "17.03" + + rancher_version: + type: string + default: "1.6.18" + + rancher_agent_version: + type: string + default: "1.2.10" + + kubectl_version: + type: string + default: "1.8.10" + + helm_version: + type: string + default: "2.9.1" + resources: random-str: type: OS::Heat::RandomString diff --git a/deployment/heat/onap-oom/parts/onap-oom-2.yaml b/deployment/heat/onap-oom/parts/onap-oom-2.yaml index f0a0a8bd0..463635b8a 100644 --- a/deployment/heat/onap-oom/parts/onap-oom-2.yaml +++ b/deployment/heat/onap-oom/parts/onap-oom-2.yaml @@ -27,6 +27,7 @@ params: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } template: diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh index 62f4e8277..6066396f1 100644 --- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh @@ -25,6 +25,11 @@ echo "__oom_gerrit_branch__" > /opt/config/oom_gerrit_branch.txt echo "__oom_gerrit_refspec__" > /opt/config/oom_gerrit_refspec.txt echo "__docker_manifest__" > /opt/config/docker_manifest.txt echo "__docker_proxy__" > /opt/config/docker_proxy.txt +echo "__docker_version__" > /opt/config/docker_version.txt +echo "__rancher_version__" > /opt/config/rancher_version.txt +echo "__rancher_agent_version__" > /opt/config/rancher_agent_version.txt +echo "__kubectl_version__" > /opt/config/kubectl_version.txt +echo "__helm_version__" > /opt/config/helm_version.txt cat < /opt/config/integration-override.yaml __integration_override_yaml__ @@ -86,21 +91,22 @@ systemctl restart nfs-kernel-server cd ~ -# install docker 17.03 -curl -s https://releases.rancher.com/install-docker/17.03.sh | sh +# install docker __docker_version__ +curl -s https://releases.rancher.com/install-docker/__docker_version__.sh | sh usermod -aG docker ubuntu -docker run --restart unless-stopped -d -p 8080:8080 -e CATTLE_BOOTSTRAP_REQUIRED_IMAGE=__docker_proxy__/rancher/agent:v1.2.9 __docker_proxy__/rancher/server:v1.6.14 +# install rancher __rancher_version__ +docker run --restart unless-stopped -d -p 8080:8080 -e CATTLE_BOOTSTRAP_REQUIRED_IMAGE=__docker_proxy__/rancher/agent:v__rancher_agent_version__ __docker_proxy__/rancher/server:v__rancher_version__ -# install kubernetes 1.8.10 -curl -s -LO https://storage.googleapis.com/kubernetes-release/release/v1.8.10/bin/linux/amd64/kubectl +# install kubectl __kubectl_version__ +curl -s -LO https://storage.googleapis.com/kubernetes-release/release/v__kubectl_version__/bin/linux/amd64/kubectl chmod +x ./kubectl sudo mv ./kubectl /usr/local/bin/kubectl mkdir ~/.kube -# install helm -wget -q http://storage.googleapis.com/kubernetes-helm/helm-v2.8.2-linux-amd64.tar.gz -tar -zxvf helm-v2.8.2-linux-amd64.tar.gz +# install helm __helm_version__ +wget -q http://storage.googleapis.com/kubernetes-helm/helm-v__helm_version__-linux-amd64.tar.gz +tar -zxvf helm-v__helm_version__-linux-amd64.tar.gz sudo mv linux-amd64/helm /usr/local/bin/helm echo export RANCHER_IP=__rancher_private_ip_addr__ > api-keys-rc diff --git a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh index 408f778e9..092b2a1fc 100755 --- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh +++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh @@ -56,6 +56,11 @@ cat <