From 46feaa82928fb89d92be148c752f17ec8b5da5f9 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Fri, 20 Apr 2018 23:33:19 +0200 Subject: [PATCH] Update readme and cluster.yml with rke-tools --- README.md | 28 +++++++++++++++++++++++++++- cluster.yml | 8 ++++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bb83236e..7169b683 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,32 @@ There are extra options that can be specified for each network plugin: - **weave_node_image**: Weave Node Docker image - **weave_cni_image**: Weave CNI binary installer Docker image +### RKE System Images + +Prior to version `0.1.6`, RKE used the following list of images for deployment and cluster configuration: +``` +system_images: + etcd: rancher/etcd:v3.0.17 + kubernetes: rancher/k8s:v1.8.9-rancher1-1 + alpine: alpine:latest + nginx_proxy: rancher/rke-nginx-proxy:v0.1.1 + cert_downloader: rancher/rke-cert-deployer:v0.1.1 + kubernetes_services_sidecar: rancher/rke-service-sidekick:v0.1.0 + kubedns: rancher/k8s-dns-kube-dns-amd64:1.14.5 + dnsmasq: rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.5 + kubedns_sidecar: rancher/k8s-dns-sidecar-amd64:1.14.5 + kubedns_autoscaler: rancher/cluster-proportional-autoscaler-amd64:1.0.0 + flannel: rancher/coreos-flannel:v0.9.1 + flannel_cni: rancher/coreos-flannel-cni:v0.2.0 +``` +As of version `0.1.6`, we consolidated several of those images into a single image to simplify and speed the deployment process. + +The following images are no longer required, and can be replaced by `rancher/rke-tools:v0.1.2`: +- alpine:latest +- rancher/rke-nginx-proxy:v0.1.1 +- rancher/rke-cert-deployer:v0.1.1 +- rancher/rke-service-sidekick:v0.1.0 + ## Addons RKE supports pluggable addons on cluster bootstrap, user can specify the addon yaml in the cluster.yml file, and when running @@ -365,7 +391,7 @@ Depending how you want to manage your ssl certificates, there are 2 deployment o Once RKE execution finish, rancher is deployed at `cattle-system` namespace. You could access to your rancher instance by `https://` -By default, rancher deployment has just 1 replica, scale it to desired replicas. +By default, rancher deployment has just 1 replica, scale it to desired replicas. ``` kubectl -n cattle-system scale deployment cattle --replicas=3 diff --git a/cluster.yml b/cluster.yml index 93d9fb7c..17f75257 100644 --- a/cluster.yml +++ b/cluster.yml @@ -121,10 +121,10 @@ addons_include: system_images: etcd: rancher/etcd:v3.0.17 kubernetes: rancher/k8s:v1.8.9-rancher1-1 - alpine: alpine:latest - nginx_proxy: rancher/rke-nginx-proxy:v0.1.1 - cert_downloader: rancher/rke-cert-deployer:v0.1.1 - kubernetes_services_sidecar: rancher/rke-service-sidekick:v0.1.0 + alpine: rancher/rke-tools:v0.1.2 + nginx_proxy: rancher/rke-tools:v0.1.2 + cert_downloader: rancher/rke-tools:v0.1.2 + kubernetes_services_sidecar: rancher/rke-tools:v0.1.2 kubedns: rancher/k8s-dns-kube-dns-amd64:1.14.5 dnsmasq: rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.5 kubedns_sidecar: rancher/k8s-dns-sidecar-amd64:1.14.5