Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io: Create hyperlink Add files via upload Fix typo Remove from TOC/Search: pods/init-containers ... (#2694) Add files via upload fix to taint the master node Move Guide topics: Container Lifestyle Hooks, Images, Volumes Correct ASM logo filename fixed ASM blurb Repair Spotinst logo Remove redundant section in deployments # Conflicts: # docs/getting-started-guides/kubeadm.md # docs/user-guide/volumes.md
This commit is contained in:
@@ -266,7 +266,7 @@ Some drivers will mount a host folder within the VM so that you can easily share
|
||||
|
||||
## Private Container Registries
|
||||
|
||||
To access a private container registry, follow the steps on [this page](http://kubernetes.io/docs/user-guide/images/).
|
||||
To access a private container registry, follow the steps on [this page](/docs/concepts/containers/images/).
|
||||
|
||||
We recommend you use ImagePullSecrets, but if you would like to configure access on the minikube VM you can place the `.dockercfg` in the `/home/docker` directory or the `config.json` in the `/home/docker/.docker` directory.
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ Documentation for how to use vSphere managed storage can be found in the
|
||||
[persistent volumes user
|
||||
guide](http://kubernetes.io/docs/user-guide/persistent-volumes/#vsphere) and the
|
||||
[volumes user
|
||||
guide](http://kubernetes.io/docs/user-guide/volumes/#vspherevolume)
|
||||
guide](/docs/concepts/storage/volumes/#vspherevolume)
|
||||
|
||||
Examples can be found
|
||||
[here](https://github.com/kubernetes/kubernetes/tree/master/examples/volumes/vsphere)
|
||||
|
||||
Reference in New Issue
Block a user