diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-12-12 06:15:48 -0800 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-12-12 06:15:48 -0800 |
| commit | 438cecd39ecc3e5a9302858010d2c7d3e96fd7f3 (patch) | |
| tree | 1afc9da5efc7ce41763099b931e5df07501267e9 /deployment/heat/onap-oom | |
| parent | 92348e5ec8f672790b19927b13d7c2bf84c9a2d4 (diff) | |
Upgrade Rancher and k8s versions
Upgrade Rancher and k8s versions to address k8s vulnerability
CVE-2018-1002105.
Change-Id: I0d6c937f0d30578f2904ccf620fbdae64d8b5d7c
Issue-ID: INT-776
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat/onap-oom')
| -rw-r--r-- | deployment/heat/onap-oom/onap-oom.yaml | 4 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/parts/onap-oom-1.yaml | 4 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/rancher_vm_entrypoint.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index bd3970f52..f10fb79d5 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -73,7 +73,7 @@ parameters: rancher_version: type: string - default: "1.6.22" + default: "1.6.25" rancher_agent_version: type: string @@ -81,7 +81,7 @@ parameters: kubectl_version: type: string - default: "1.11.2" + default: "1.11.5" helm_version: type: string diff --git a/deployment/heat/onap-oom/parts/onap-oom-1.yaml b/deployment/heat/onap-oom/parts/onap-oom-1.yaml index 242bbe886..b79bb1b5e 100644 --- a/deployment/heat/onap-oom/parts/onap-oom-1.yaml +++ b/deployment/heat/onap-oom/parts/onap-oom-1.yaml @@ -70,7 +70,7 @@ parameters: rancher_version: type: string - default: "1.6.22" + default: "1.6.25" rancher_agent_version: type: string @@ -78,7 +78,7 @@ parameters: kubectl_version: type: string - default: "1.11.2" + default: "1.11.5" helm_version: type: string diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh index 8e6a36ba4..f13e63964 100644 --- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh @@ -166,7 +166,7 @@ curl -s -u "${CATTLE_ACCESS_KEY}:${CATTLE_SECRET_KEY}" \ -X PUT \ -H 'Accept: application/json' \ -H 'Content-Type: application/json' \ --d '{"stacks":[{"type":"catalogTemplate", "answers":{"CONSTRAINT_TYPE":"required"}, "name":"kubernetes", "templateVersionId":"library:infra*k8s:52"}, {"type":"catalogTemplate", "name":"network-services", "templateId":"library:infra*network-services"}, {"type":"catalogTemplate", "name":"ipsec", "templateId":"library:infra*ipsec", "answers":{"MTU":"__mtu__"}}, {"type":"catalogTemplate", "name":"healthcheck", "templateId":"library:infra*healthcheck"}]}' \ +-d '{"stacks":[{"type":"catalogTemplate", "answers":{"CONSTRAINT_TYPE":"required"}, "name":"kubernetes", "templateVersionId":"library:infra*k8s:53"}, {"type":"catalogTemplate", "name":"network-services", "templateId":"library:infra*network-services"}, {"type":"catalogTemplate", "name":"ipsec", "templateId":"library:infra*ipsec", "answers":{"MTU":"__mtu__"}}, {"type":"catalogTemplate", "name":"healthcheck", "templateId":"library:infra*healthcheck"}]}' \ "http://$RANCHER_IP:8080/v2-beta/projecttemplates/$TEMPLATE_ID" curl -s -u "${CATTLE_ACCESS_KEY}:${CATTLE_SECRET_KEY}" -X POST -H 'Content-Type: application/json' -d '{ "name":"oom", "projectTemplateId":"'$TEMPLATE_ID'" }' "http://$RANCHER_IP:8080/v2-beta/projects" > project.json |