From 3950556dd65fffedc42debcc7b1bfd9602b92814 Mon Sep 17 00:00:00 2001 From: Tomáš Levora Date: Thu, 3 Oct 2019 13:31:54 +0200 Subject: Update rke, kubectl and helm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit updates rke (implementing K8S 1.15.4), kubectl binary and helm binary with tiller image: rke 0.3.0 kubernetes 1.15.4 kubectl 1.15.4 helm 2.14.2 dashboard 2.0.0-beta4 Kubernetes dashboard is also updated to be compliant with the 1.15 K8S. Note 1: There is a new datalist to split rke only images from other K8S related images. Note 2: El Alto recommendation cannot be fullfilled to the letter, because rke does not have any release supporting 1.15.2 version of kubernetes (only experimental). Issue-ID: OOM-2122 Change-Id: I02cf0955158eca622bcac40ceed42588dbdd3499 Signed-off-by: Tomáš Levora Signed-off-by: Petr Ospalý Signed-off-by: Bartek Grzybowski --- build/build_nexus_blob.sh | 3 ++- build/data_lists/infra_bin_utils.list | 6 +++--- build/data_lists/k8s_docker_images.list | 3 +++ build/data_lists/rke_docker_images.list | 33 ++++++++++++++++----------------- 4 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 build/data_lists/k8s_docker_images.list (limited to 'build') diff --git a/build/build_nexus_blob.sh b/build/build_nexus_blob.sh index 1616386d..72dda540 100755 --- a/build/build_nexus_blob.sh +++ b/build/build_nexus_blob.sh @@ -264,6 +264,7 @@ NXS_SRC_PYPI_DIR="${DATA_DIR}/offline_data/pypi" NXS_INFRA_LIST="${LISTS_DIR}/infra_docker_images.list" NXS_DOCKER_IMG_LIST="${LISTS_DIR}/onap_docker_images.list" NXS_RKE_DOCKER_IMG_LIST="${LISTS_DIR}/rke_docker_images.list" +NXS_K8S_DOCKER_IMG_LIST="${LISTS_DIR}/k8s_docker_images.list" # Setup Nexus image used for build and install infra NEXUS_IMAGE="$(grep sonatype/nexus3 ${NXS_INFRA_LIST})" @@ -271,7 +272,7 @@ NEXUS_IMAGE_TAR="${DATA_DIR}/offline_data/docker_images_infra/$(sed 's/\//\_/ ; # Set default lists if nothing specific defined by user if [ ${#NXS_DOCKER_IMG_LISTS[@]} -eq 0 ]; then - NXS_DOCKER_IMG_LISTS=("${NXS_DOCKER_IMG_LIST}" "${NXS_RKE_DOCKER_IMG_LIST}") + NXS_DOCKER_IMG_LISTS=("${NXS_DOCKER_IMG_LIST}" "${NXS_RKE_DOCKER_IMG_LIST}" "${NXS_K8S_DOCKER_IMG_LIST}") fi # Backup /etc/hosts diff --git a/build/data_lists/infra_bin_utils.list b/build/data_lists/infra_bin_utils.list index 8de616e9..29051f0e 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.13.5/bin/linux/amd64/kubectl -https://storage.googleapis.com/kubernetes-helm/helm-v2.12.3-linux-amd64.tar.gz -https://github.com/rancher/rke/releases/download/v0.2.1/rke_linux-amd64 +https://storage.googleapis.com/kubernetes-release/release/v1.15.4/bin/linux/amd64/kubectl +https://storage.googleapis.com/kubernetes-helm/helm-v2.14.2-linux-amd64.tar.gz +https://github.com/rancher/rke/releases/download/v0.3.0/rke_linux-amd64 diff --git a/build/data_lists/k8s_docker_images.list b/build/data_lists/k8s_docker_images.list new file mode 100644 index 00000000..c08dee29 --- /dev/null +++ b/build/data_lists/k8s_docker_images.list @@ -0,0 +1,3 @@ +gcr.io/kubernetes-helm/tiller:v2.14.2 +kubernetesui/dashboard:v2.0.0-beta4 +kubernetesui/metrics-scraper:v1.0.1 diff --git a/build/data_lists/rke_docker_images.list b/build/data_lists/rke_docker_images.list index 75d35c72..91b58b1e 100644 --- a/build/data_lists/rke_docker_images.list +++ b/build/data_lists/rke_docker_images.list @@ -1,22 +1,21 @@ -coredns/coredns:1.2.6 -gcr.io/kubernetes-helm/tiller:v2.12.3 -k8s.gcr.io/kubernetes-dashboard-amd64:v1.10.1 -rancher/calico-cni:v3.4.0 +rancher/calico-cni:v3.7.4 rancher/calico-ctl:v2.0.0 -rancher/calico-node:v3.4.0 -rancher/cluster-proportional-autoscaler:1.0.0 -rancher/coreos-etcd:v3.2.24-rancher1 -rancher/coreos-flannel:v0.10.0 -rancher/coreos-flannel:v0.10.0-rancher1 -rancher/flannel-cni:v0.3.0-rancher1 -rancher/hyperkube:v1.13.5-rancher1 +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/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/k8s-dns-dnsmasq-nanny:1.15.0 rancher/k8s-dns-kube-dns:1.15.0 rancher/k8s-dns-sidecar:1.15.0 -rancher/metrics-server:v0.3.1 -rancher/nginx-ingress-controller-defaultbackend:1.4-rancher1 -rancher/nginx-ingress-controller:0.21.0-rancher3 +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.27 -weaveworks/weave-kube:2.5.0 -weaveworks/weave-npc:2.5.0 +rancher/rke-tools:v0.1.50 +weaveworks/weave-kube:2.5.2 +weaveworks/weave-npc:2.5.2 -- cgit 1.2.3-korg