Skip to content

Commit 6fcaaa8

Browse files
committed
Revert "feat(registry): remove the documentation specifying insecure registry"
This reverts commit 9e62e19.
1 parent 43b5687 commit 6fcaaa8

4 files changed

Lines changed: 18 additions & 11 deletions

File tree

src/installing-workflow/system-requirements.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,14 @@ application footprint as well.
2626
Running smaller machines will likely result in increased system load and has been known to result in component failures
2727
and instability.
2828

29-
!!! warning
29+
## Docker Insecure Registry
3030

31-
Versions prior to 2.2 require '--insecure-registry' to function properly. Depending on your Kubernetes and Docker configuration,
32-
setting `EXTRA_DOCKER_OPTS="--insecure-registry=10.0.0.0/8"` may be sufficient.
31+
The on-cluster Docker registry is not deployed with TLS enabled. As such, all Kubernetes worker nodes must have their
32+
Docker daemons configured to use an **insecure registry**. The configured subnet should encompass any private networks
33+
used by your worker nodes, including overlay networks.
34+
35+
Depending on your Kubernetes and Docker configuration, setting `EXTRA_DOCKER_OPTS="--insecure-registry=10.0.0.0/8"` may
36+
be sufficient.
3337

3438
## SELinux + OverlayFS
3539

src/quickstart/provider/aws/boot.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ LICENSES README.md Vagrantfile cluster/ contrib/ docs/ ex
5151
Before calling the Kubernetes setup scripts, we need to change a few defaults so that Deis Workflow works best. Type
5252
each of these commands into your terminal application before calling `kube-up.sh`.
5353

54+
First, enable insecure registry support for Docker:
55+
```
56+
$ export KUBE_ENABLE_INSECURE_REGISTRY=true
57+
```
58+
5459
Next, pick the AWS Availability Zone you would like to use. The boot script will create a new VPC in that region.
5560

5661
```

src/quickstart/provider/vagrant/boot.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ LICENSES README.md Vagrantfile cluster/ contrib/ docs/ ex
3939
Before calling the Kubernetes setup scripts, we need to change a few defaults so that Deis Workflow works best. Type
4040
each of these commands into your terminal application before calling `kube-up.sh`.
4141

42-
First, set Vagrant as the provider:
42+
First, enable insecure registry support for Docker and use Vagrant as the provider:
4343
```
44+
$ export KUBE_ENABLE_INSECURE_REGISTRY=true
4445
$ export KUBERNETES_PROVIDER=vagrant
4546
```
4647

@@ -56,6 +57,7 @@ Double check the configured environment variables:
5657

5758
```
5859
$ env | grep KUBE
60+
KUBE_ENABLE_INSECURE_REGISTRY=true
5961
KUBERNETES_PROVIDER=vagrant
6062
KUBERNETES_NODE_MEMORY=4096
6163
KUBERNETES_MASTER_MEMORY=1536

src/understanding-workflow/components.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,9 @@ configure minio to use persistent storage available in your environment.
9393
**Project Location:** [deis/registry](https://github.com/deis/registry)
9494

9595
The registry component is a managed docker registry which holds application
96-
images generated from the builder component. Registry persists the Docker
97-
images to either local storage (in development mode) or to object storage
98-
configured for the cluster. Starting with release v2.2.0, the component also runs a
99-
[proxy](https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/registry/images)
100-
daemon to expose the registry service as `localhost` on each node. The proxy daemon uses
101-
[HAProxy](http://www.haproxy.org/) to route the incoming registry requests on `localhost` to the
102-
registry service removing the necessity of setting `--insecure-registry` for docker daemon.
96+
images generated from the builder component. Registry persists the Docker image
97+
iamges to either local storage (in development mode) or to object storage
98+
configured for the cluster.
10399

104100
## Router
105101

0 commit comments

Comments
 (0)