From fcebb5443c7af3e8b5aafad7bad5046d1473ff18 Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Thu, 20 Sep 2018 21:24:31 +0200 Subject: [PATCH 1/3] Add default private registry docs --- .../config-options/private-registries/_index.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/content/rke/v0.1.x/en/config-options/private-registries/_index.md b/content/rke/v0.1.x/en/config-options/private-registries/_index.md index 05a50dc2d77..b96086fbefa 100644 --- a/content/rke/v0.1.x/en/config-options/private-registries/_index.md +++ b/content/rke/v0.1.x/en/config-options/private-registries/_index.md @@ -17,6 +17,19 @@ private_registries: > **Note:** If you are using a Docker Hub registry, you can omit the `url` or set it to `docker.io`. +### Default Registry + +RKE v0.1.10-rc2 supports specifying a default registry from the list of private registries to be used with all system images by default, for example: + +```yaml +private_registries: + - url: registry.com + user: Username + password: password + is_default: true +``` +This way RKE will use `registry.com` as the default registry for all system images used, so for example `rancher/rke-tools:v0.1.14` will become `registry.com/rancher/rke-tools:v0.1.14`. + ### Air-gapped Setups -If you are in an air-gapped setup, you will need to not only configure your private registry credentials, but you will need to also update all your [system images]({{< baseurl >}}/rke/v0.1.x/en/config-options/system-images/) so they are going to pull from the private registry. By default, these system images are pulling from `docker.io`. +If you are in an air-gapped setup, before version v0.1.10-rc2 you will need to not only configure your private registry credentials, but you will need to also update all your [system images]({{< baseurl >}}/rke/v0.1.x/en/config-options/system-images/) so they are going to pull from the private registry, however after version v0.1.10-rc2 you can specify the default registry described in the previous section. By default, these system images are pulling from `docker.io`. From a6cc5a408049955ae9bcd1a8ca739378a0244968 Mon Sep 17 00:00:00 2001 From: Denise Date: Thu, 27 Sep 2018 20:29:35 -0700 Subject: [PATCH 2/3] Update _index.md --- .../en/config-options/private-registries/_index.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/content/rke/v0.1.x/en/config-options/private-registries/_index.md b/content/rke/v0.1.x/en/config-options/private-registries/_index.md index b96086fbefa..e8db65499af 100644 --- a/content/rke/v0.1.x/en/config-options/private-registries/_index.md +++ b/content/rke/v0.1.x/en/config-options/private-registries/_index.md @@ -19,17 +19,21 @@ private_registries: ### Default Registry -RKE v0.1.10-rc2 supports specifying a default registry from the list of private registries to be used with all system images by default, for example: +As of v0.1.10, RKE supports specifying a default registry from the list of private registries to be used with all [system images]({{< baseurl >}}/rke/v0.1.x/en/config-options/system-images/) . In this example .RKE will use `registry.com` as the default registry for all system images, e.g. `rancher/rke-tools:v0.1.14` will become `registry.com/rancher/rke-tools:v0.1.14`. ```yaml private_registries: - url: registry.com user: Username password: password - is_default: true + is_default: true # All system images will be pulled using this registry. ``` -This way RKE will use `registry.com` as the default registry for all system images used, so for example `rancher/rke-tools:v0.1.14` will become `registry.com/rancher/rke-tools:v0.1.14`. ### Air-gapped Setups -If you are in an air-gapped setup, before version v0.1.10-rc2 you will need to not only configure your private registry credentials, but you will need to also update all your [system images]({{< baseurl >}}/rke/v0.1.x/en/config-options/system-images/) so they are going to pull from the private registry, however after version v0.1.10-rc2 you can specify the default registry described in the previous section. By default, these system images are pulling from `docker.io`. +By default, all system images are being pulled from DockerHub. If you are on a system that does not have access to DockerHub, you will need to create a private registry that is populated with all the required [system images]({{< baseurl >}}/rke/v0.1.x/en/config-options/system-images/). + +As of v0.1.10, you can specify a default registry so that all [system images]({{< baseurl >}}/rke/v0.1.x/en/config-options/system-images/) are pulled from the designated private registry. You can use the command `rke config --system-images` to get the list of default system images to populate your private registry. + +Prior to v0.1.10, you would have had to configure your private registry credentials and update the names of all the [system images]({{< baseurl >}}/rke/v0.1.x/en/config-options/system-images/) in the cluster.yml so that they would have the private registry url appended before the image name. + From f137b734c460538c3fbc9076f3da516de17eb075 Mon Sep 17 00:00:00 2001 From: Denise Date: Fri, 28 Sep 2018 15:40:26 -0700 Subject: [PATCH 3/3] Update _index.md --- .../rke/v0.1.x/en/config-options/private-registries/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/rke/v0.1.x/en/config-options/private-registries/_index.md b/content/rke/v0.1.x/en/config-options/private-registries/_index.md index e8db65499af..b28e51f7388 100644 --- a/content/rke/v0.1.x/en/config-options/private-registries/_index.md +++ b/content/rke/v0.1.x/en/config-options/private-registries/_index.md @@ -33,7 +33,7 @@ private_registries: By default, all system images are being pulled from DockerHub. If you are on a system that does not have access to DockerHub, you will need to create a private registry that is populated with all the required [system images]({{< baseurl >}}/rke/v0.1.x/en/config-options/system-images/). -As of v0.1.10, you can specify a default registry so that all [system images]({{< baseurl >}}/rke/v0.1.x/en/config-options/system-images/) are pulled from the designated private registry. You can use the command `rke config --system-images` to get the list of default system images to populate your private registry. +As of v0.1.10, you have to configure your private registry credentials, but you can specify this registry as a default registry so that all [system images]({{< baseurl >}}/rke/v0.1.x/en/config-options/system-images/) are pulled from the designated private registry. You can use the command `rke config --system-images` to get the list of default system images to populate your private registry. -Prior to v0.1.10, you would have had to configure your private registry credentials and update the names of all the [system images]({{< baseurl >}}/rke/v0.1.x/en/config-options/system-images/) in the cluster.yml so that they would have the private registry url appended before the image name. +Prior to v0.1.10, you had to configure your private registry credentials **and** update the names of all the [system images]({{< baseurl >}}/rke/v0.1.x/en/config-options/system-images/) in the `cluster.yml` so that the image names would have the private registry URL appended before each image name.