summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomáš Levora <t.levora@partner.samsung.com>2020-05-11 13:50:06 +0200
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2020-05-28 08:01:14 +0000
commit8370ac160a97b856a994c4a0b8a178675df195a1 (patch)
tree3f1f4d38f2e0dca8e562d7dde590dfe6816efdd9
parent38cf0fdbf2f27a3b046c11bbd01331e4f609819e (diff)
Updating RKE version to Frankfurt6.0.0-ONAP
Updating RKE to v1.0.4 for Kubernetes 1.15.9 Issue-ID: OOM-2403 Signed-off-by: Tomáš Levora <t.levora@partner.samsung.com> Change-Id: I87c3f9f4800aa40f62d7569b4ecf3fa373a16796
-rw-r--r--ansible/roles/rke/defaults/main.yml18
-rw-r--r--ansible/test/roles/prepare-rke/defaults/main.yml2
-rw-r--r--build/data_lists/infra_bin_utils.list2
-rw-r--r--build/data_lists/rke_docker_images.list9
4 files changed, 17 insertions, 14 deletions
diff --git a/ansible/roles/rke/defaults/main.yml b/ansible/roles/rke/defaults/main.yml
index 1077ee80..c9d82d93 100644
--- a/ansible/roles/rke/defaults/main.yml
+++ b/ansible/roles/rke/defaults/main.yml
@@ -54,26 +54,28 @@ rke_etcd:
rke:
# rke (rancher) images
etcd: "rancher/coreos-etcd:v3.3.10-rancher1"
- alpine: "rancher/rke-tools:v0.1.50"
- nginx_proxy: "rancher/rke-tools:v0.1.50"
- cert_downloader: "rancher/rke-tools:v0.1.50"
- kubernetes_services_sidecar: "rancher/rke-tools:v0.1.50"
+ alpine: "rancher/rke-tools:v0.1.52"
+ nginx_proxy: "rancher/rke-tools:v0.1.52"
+ cert_downloader: "rancher/rke-tools:v0.1.52"
+ kubernetes_services_sidecar: "rancher/rke-tools:v0.1.52"
kubedns: "rancher/k8s-dns-kube-dns:1.15.0"
dnsmasq: "rancher/k8s-dns-dnsmasq-nanny:1.15.0"
kubedns_sidecar: "rancher/k8s-dns-sidecar:1.15.0"
- kubedns_autoscaler: "rancher/cluster-proportional-autoscaler:1.3.0"
- coredns: "rancher/coredns-coredns:1.3.1"
- coredns_autoscaler: "rancher/cluster-proportional-autoscaler:1.3.0"
- kubernetes: "rancher/hyperkube:v1.15.4-rancher1"
+ kubedns_autoscaler: "rancher/cluster-proportional-autoscaler:1.7.1"
+ coredns: "rancher/coredns-coredns:1.6.2"
+ coredns_autoscaler: "rancher/cluster-proportional-autoscaler:1.7.1"
+ kubernetes: "rancher/hyperkube:v1.15.9-rancher1"
flannel: "rancher/coreos-flannel:v0.11.0-rancher1"
flannel_cni: "rancher/flannel-cni:v0.3.0-rancher5"
calico_node: "rancher/calico-node:v3.7.4"
calico_cni: "rancher/calico-cni:v3.7.4"
calico_controllers: "rancher/calico-kube-controllers:v3.7.4"
calico_ctl: "rancher/calico-ctl:v2.0.0"
+ calico_flexvol: "rancher/calico-pod2daemon-flexvol:v3.10.2"
canal_node: "rancher/calico-node:v3.7.4"
canal_cni: "rancher/calico-cni:v3.7.4"
canal_flannel: "rancher/coreos-flannel:v0.11.0"
+ canal_flexvol: "rancher/calico-pod2daemon-flexvol:v3.10.2"
weave_node: "weaveworks/weave-kube:2.5.2"
weave_cni: "weaveworks/weave-npc:2.5.2"
pod_infra_container: "rancher/pause:3.1"
diff --git a/ansible/test/roles/prepare-rke/defaults/main.yml b/ansible/test/roles/prepare-rke/defaults/main.yml
index 59ea2667..2cb05679 100644
--- a/ansible/test/roles/prepare-rke/defaults/main.yml
+++ b/ansible/test/roles/prepare-rke/defaults/main.yml
@@ -1,5 +1,5 @@
---
#The rke version.
-rke_version: 0.3.0
+rke_version: 1.0.4
#The kubectl version.
kubectl_version: 1.15.11
diff --git a/build/data_lists/infra_bin_utils.list b/build/data_lists/infra_bin_utils.list
index b723d7c6..a82d0560 100644
--- a/build/data_lists/infra_bin_utils.list
+++ b/build/data_lists/infra_bin_utils.list
@@ -1,3 +1,3 @@
https://storage.googleapis.com/kubernetes-release/release/v1.15.11/bin/linux/amd64/kubectl
https://storage.googleapis.com/kubernetes-helm/helm-v2.16.6-linux-amd64.tar.gz
-https://github.com/rancher/rke/releases/download/v0.3.0/rke_linux-amd64
+https://github.com/rancher/rke/releases/download/v1.0.4/rke_linux-amd64
diff --git a/build/data_lists/rke_docker_images.list b/build/data_lists/rke_docker_images.list
index 91b58b1e..2f1a1b32 100644
--- a/build/data_lists/rke_docker_images.list
+++ b/build/data_lists/rke_docker_images.list
@@ -2,13 +2,14 @@ rancher/calico-cni:v3.7.4
rancher/calico-ctl:v2.0.0
rancher/calico-kube-controllers:v3.7.4
rancher/calico-node:v3.7.4
-rancher/cluster-proportional-autoscaler:1.3.0
-rancher/coredns-coredns:1.3.1
+rancher/calico-pod2daemon-flexvol:v3.10.2
+rancher/cluster-proportional-autoscaler:1.7.1
+rancher/coredns-coredns:1.6.2
rancher/coreos-etcd:v3.3.10-rancher1
rancher/coreos-flannel:v0.11.0
rancher/coreos-flannel:v0.11.0-rancher1
rancher/flannel-cni:v0.3.0-rancher5
-rancher/hyperkube:v1.15.4-rancher1
+rancher/hyperkube:v1.15.9-rancher1
rancher/k8s-dns-dnsmasq-nanny:1.15.0
rancher/k8s-dns-kube-dns:1.15.0
rancher/k8s-dns-sidecar:1.15.0
@@ -16,6 +17,6 @@ rancher/metrics-server:v0.3.3
rancher/nginx-ingress-controller-defaultbackend:1.5-rancher1
rancher/nginx-ingress-controller:nginx-0.25.1-rancher1
rancher/pause:3.1
-rancher/rke-tools:v0.1.50
+rancher/rke-tools:v0.1.52
weaveworks/weave-kube:2.5.2
weaveworks/weave-npc:2.5.2