diff --git a/doc/source/host-setup.rst b/doc/source/host-setup.rst index 78b67b9bc..76fbbabf7 100644 --- a/doc/source/host-setup.rst +++ b/doc/source/host-setup.rst @@ -29,7 +29,7 @@ packaged version of Docker for maximum stability and compatibility with the following command: .. NOTE:: Docker 1.11.0 is not compatible with Kubernetes due to some issues in - Docker. The below command will install the latest docker and revert back to + Docker. The below command will install the latest Docker and revert back to 1.10.3. For different Debian or Ubuntu distributions, you may need to use ``apt-cache madison docker-engine`` to get the correct version. diff --git a/doc/source/multi-node.rst b/doc/source/multi-node.rst index 813e60114..dd34317a7 100644 --- a/doc/source/multi-node.rst +++ b/doc/source/multi-node.rst @@ -49,13 +49,13 @@ absolutely required. Configure Kolla =============== -For multi-node deployments, a docker registry is required since the +For multi-node deployments, a Docker registry is required since the kubernetes nodes will not be able to find the kolla images that your development machine has built. Thus, we must configure kolla to name the images correctly, so that we may easily push the images to the -right docker registry. +right Docker registry. -Add your docker registry settings in the kolla configuration file +Add your Docker registry settings in the kolla configuration file ```./etc/kolla/globals.yaml```. :: @@ -65,7 +65,7 @@ Add your docker registry settings in the kolla configuration file docker_namespace: " # e.g. "annular-reef-123" Generate the kolla configurations, build the kolla images, and push -the kolla images to your docker registry. +the kolla images to your Docker registry. :: @@ -90,11 +90,11 @@ Build Kolla Images and Push to Docker Registry # Build the kolla containers kolla-build $KOLLA_CONTAINERS --registry $DOCKER_REGISTRY --namespace $DOCKER_NAMESPACE - # Authenticate with your docker registry + # Authenticate with your Docker registry # This may not be necessary if you are using a cloud provider docker login - # Push the newly-built kolla containers to your docker registry + # Push the newly-built kolla containers to your Docker registry # For GKE, change the command below to be "gcloud docker push" for i in $KOLLA_CONTAINERS; do docker push "$DOCKER_REGISTRY/$DOCKER_NAMESPACE/centos-binary-$i:$DOCKER_TAG" diff --git a/doc/source/private-registry.rst b/doc/source/private-registry.rst index 674561f32..0ffa3d493 100644 --- a/doc/source/private-registry.rst +++ b/doc/source/private-registry.rst @@ -24,7 +24,7 @@ How It Works There are two steps: - Create an ImagePullSecret. These instructions may differ based on - the docker registry provider. The two types of registry providers + the Docker registry provider. The two types of registry providers currently covered by this guide include: - Standard Docker Registry with Username/Password Authentication @@ -34,20 +34,20 @@ There are two steps: the ImagePullSecret. By default and unless configured otherwise, all Kubernetes pods are created under the default service-account. Pods under the default service-account use the ImagePullSecret - credentials to authenticate and access the private docker registry. + credentials to authenticate and access the private Docker registry. Create the ImagePullSecret ========================== -Based on the docker registry provider, follow the appropriate section +Based on the Docker registry provider, follow the appropriate section below to create the ImagePullSecret. Standard Docker Registry with Username/Password Authentication -------------------------------------------------------------- -A typical docker registry only requires only username/password +A typical Docker registry only requires only username/password authentication, without any other API keys or tokens (e.g. Docker Hub). @@ -106,7 +106,7 @@ Patch the Default Service-Account Patch the Kubernetes default service-account to add a reference to the ImagePullSecret, after which pods under the default service-account use the ImagePullSecret credentials to authenticate and access the -private docker registry. +private Docker registry. :: @@ -114,5 +114,5 @@ private docker registry. # ImagePullSecret kubectl patch serviceaccount default -p '{"imagePullSecrets":[{"name":"private-docker-registry-secret"}]}' -Now, your kubernetes cluster should have access to the private docker registry. +Now, your kubernetes cluster should have access to the private Docker registry.