From 4c9e72c5189bb71bf18f764adf4bcde520232e92 Mon Sep 17 00:00:00 2001 From: John Mulhausen Date: Mon, 29 Feb 2016 15:17:22 -0800 Subject: [PATCH] Moving docs from /vX to /docs; we will use branches for old versions. --- _config.yml | 12 +- _data/{v1_1 => }/globals.yml | 0 _data/{v1_1 => }/guides.yml | 128 +-- _data/overrides.yml | 21 +- _data/reference.yml | 184 ++++ _data/{v1_2 => }/samples.yml | 4 +- _data/{v1_1 => }/support.yml | 18 +- _data/v1_1/reference.yml | 184 ---- _data/v1_1/samples.yml | 54 -- _data/v1_2/globals.yml | 5 - _data/v1_2/guides.yml | 179 ---- _data/v1_2/reference.yml | 184 ---- _data/v1_2/support.yml | 40 - _layouts/docwithnav.html | 18 +- .../docs => docs}/admin/accessing-the-api.md | 10 +- .../admin/admission-controllers.md | 8 +- {v1.1/docs => docs}/admin/authentication.md | 0 {v1.1/docs => docs}/admin/authorization.md | 2 +- .../docs => docs}/admin/cluster-components.md | 22 +- {v1.2/docs => docs}/admin/cluster-large.md | 2 +- .../docs => docs}/admin/cluster-management.md | 6 +- .../admin/cluster-troubleshooting.md | 8 +- {v1.1/docs => docs}/admin/daemon.yaml | 0 {v1.1/docs => docs}/admin/daemons.md | 30 +- {v1.1/docs => docs}/admin/dns.md | 0 {v1.1/docs => docs}/admin/etcd.md | 4 +- .../docs => docs}/admin/garbage-collection.md | 0 .../docs => docs}/admin/high-availability.md | 16 +- .../admin/high-availability/default-kubelet | 0 .../admin/high-availability/etcd.yaml | 0 .../high-availability/kube-apiserver.yaml | 0 .../kube-controller-manager.yaml | 0 .../high-availability/kube-scheduler.yaml | 0 .../admin/high-availability/monit-docker | 0 .../admin/high-availability/monit-kubelet | 0 .../admin/high-availability/podmaster.yaml | 0 {v1.2/docs => docs}/admin/index.md | 36 +- {v1.1/docs => docs}/admin/kube-apiserver.md | 0 .../admin/kube-controller-manager.md | 0 {v1.1/docs => docs}/admin/kube-proxy.md | 0 {v1.1/docs => docs}/admin/kube-scheduler.md | 0 {v1.1/docs => docs}/admin/kubelet.md | 0 {v1.1/docs => docs}/admin/limitrange/index.md | 4 +- .../admin/limitrange/invalid-pod.yaml | 0 .../admin/limitrange/limits.yaml | 0 .../admin/limitrange/namespace.yaml | 0 .../admin/limitrange/valid-pod.yaml | 0 {v1.1/docs => docs}/admin/multi-cluster.md | 0 {v1.2/docs => docs}/admin/namespaces.md | 8 +- {v1.2/docs => docs}/admin/namespaces/index.md | 10 +- .../admin/namespaces/namespace-dev.json | 0 .../admin/namespaces/namespace-prod.json | 0 {v1.1/docs => docs}/admin/networking.md | 8 +- {v1.2/docs => docs}/admin/node.md | 4 +- {v1.1/docs => docs}/admin/ovs-networking.md | 0 {v1.1/docs => docs}/admin/resource-quota.md | 12 +- .../admin/resourcequota/index.md | 4 +- .../admin/resourcequota/limits.yaml | 0 .../admin/resourcequota/namespace.yaml | 0 .../admin/resourcequota/quota.yaml | 0 {v1.1/docs => docs}/admin/salt.md | 0 .../admin/service-accounts-admin.md | 4 +- {v1.1/docs => docs}/admin/static-pods.md | 2 +- .../extensions/v1beta1/definitions.md | 0 .../extensions/v1beta1/operations.md | 0 .../api-reference/v1/definitions.md | 0 .../api-reference/v1/operations.md | 0 {v1.1/docs => docs}/api.md | 25 +- {v1.1/docs => docs}/devel/api-conventions.md | 26 +- {v1.1/docs => docs}/devel/api_changes.md | 10 +- {v1.1/docs => docs}/devel/automation.md | 0 {v1.1/docs => docs}/devel/cherry-picks.md | 0 {v1.1/docs => docs}/devel/cli-roadmap.md | 0 {v1.1/docs => docs}/devel/client-libraries.md | 0 .../docs => docs}/devel/coding-conventions.md | 12 +- {v1.1/docs => docs}/devel/collab.md | 0 .../devel/developer-guides/vagrant.md | 2 +- {v1.1/docs => docs}/devel/development.md | 10 +- {v1.1/docs => docs}/devel/e2e-tests.md | 0 {v1.2/docs => docs}/devel/faster_reviews.md | 8 +- {v1.1/docs => docs}/devel/flaky-tests.md | 0 {v1.1/docs => docs}/devel/getting-builds.md | 0 docs/devel/index.md | 78 ++ {v1.1/docs => docs}/devel/instrumentation.md | 0 {v1.1/docs => docs}/devel/issues.md | 0 .../devel/kubectl-conventions.md | 0 {v1.1/docs => docs}/devel/logging.md | 0 .../devel/making-release-notes.md | 0 {v1.1/docs => docs}/devel/profiling.md | 0 {v1.2/docs => docs}/devel/pull-requests.md | 2 +- {v1.2/docs => docs}/devel/releasing.md | 4 +- {v1.1/docs => docs}/devel/scheduler.md | 0 .../devel/scheduler_algorithm.md | 6 +- .../devel/writing-a-getting-started-guide.md | 8 +- {v1.1 => docs}/editdocs.md | 0 .../getting-started-guides/aws.md | 10 +- docs/getting-started-guides/azure.md | 10 + .../getting-started-guides/binary_release.md | 0 .../centos/centos_manual_config.md | 4 +- .../getting-started-guides/cloudstack.md | 2 +- .../getting-started-guides/coreos.md | 4 +- .../coreos/azure/.gitignore | 0 .../coreos/azure/addons/skydns-rc.yaml | 0 .../coreos/azure/addons/skydns-svc.yaml | 0 .../coreos/azure/azure-login.js | 0 .../kubernetes-cluster-etcd-node-template.yml | 0 ...kubernetes-cluster-main-nodes-template.yml | 0 .../coreos/azure/create-kubernetes-cluster.js | 0 .../coreos/azure/destroy-cluster.js | 0 .../coreos/azure/expose_guestbook_app_port.sh | 0 .../coreos/azure/index.md | 0 .../coreos/azure/lib/azure_wrapper.js | 0 .../coreos/azure/lib/cloud_config.js | 0 .../azure/lib/deployment_logic/kubernetes.js | 0 .../coreos/azure/lib/util.js | 0 .../coreos/azure/package.json | 0 .../coreos/azure/scale-kubernetes-cluster.js | 0 .../coreos/bare_metal_calico.md | 0 .../coreos/bare_metal_offline.md | 4 +- .../coreos/cloud-configs/master.yaml | 0 .../coreos/cloud-configs/node.yaml | 0 .../coreos/coreos_multinode_cluster.md | 2 +- .../getting-started-guides/dcos.md | 2 +- .../docker-multinode.md | 14 +- .../docker-multinode/deployDNS.md | 4 +- .../docker-multinode/master.md | 4 +- .../docker-multinode/master.sh | 0 .../docker-multinode/skydns-rc.yaml.in | 0 .../docker-multinode/skydns-svc.yaml.in | 0 .../docker-multinode/testing.md | 2 +- .../docker-multinode/worker.md | 4 +- .../docker-multinode/worker.sh | 0 .../getting-started-guides/docker.md | 2 +- .../fedora/fedora-calico.md | 0 .../fedora/fedora_ansible_config.md | 0 .../fedora/fedora_manual_config.md | 4 +- .../fedora/flannel_multi_node_cluster.md | 2 +- .../getting-started-guides/gce.md | 14 +- docs/getting-started-guides/index.md | 177 ++++ .../getting-started-guides/juju.md | 0 .../getting-started-guides/libvirt-coreos.md | 0 .../getting-started-guides/locally.md | 6 +- .../logging-elasticsearch.md | 2 +- .../getting-started-guides/logging.md | 2 +- .../getting-started-guides/meanstack.md | 0 .../getting-started-guides/mesos-docker.md | 2 +- .../getting-started-guides/mesos.md | 0 .../getting-started-guides/ovirt.md | 0 .../getting-started-guides/rackspace.md | 0 .../getting-started-guides/rkt/index.md | 4 +- .../getting-started-guides/scratch.md | 38 +- .../getting-started-guides/ubuntu-calico.md | 2 +- .../getting-started-guides/ubuntu.md | 2 +- .../getting-started-guides/vagrant.md | 2 +- .../getting-started-guides/vsphere.md | 2 +- {v1.1 => docs}/index.md | 0 {v1.2 => docs}/pagelist.md | 2 +- {v1.1 => docs}/reference.md | 0 .../reporting-security-issues.md | 0 {v1.1/docs => docs}/roadmap.md | 0 {v1.1 => docs}/samples.md | 0 search.md => docs/search.md | 0 {v1.1/docs => docs}/troubleshooting.md | 8 +- .../user-guide/accessing-the-cluster.md | 24 +- {v1.2/docs => docs}/user-guide/annotations.md | 2 +- .../user-guide/application-troubleshooting.md | 8 +- .../user-guide/compute-resources.md | 10 +- .../user-guide/config-best-practices.md | 10 +- .../user-guide/configuring-containers.md | 8 +- .../user-guide/connecting-applications.md | 8 +- ...connecting-to-applications-port-forward.md | 2 +- .../connecting-to-applications-proxy.md | 4 +- .../user-guide/container-environment.md | 6 +- {v1.1/docs => docs}/user-guide/containers.md | 0 .../user-guide/debugging-services.md | 4 +- .../user-guide/deploying-applications.md | 14 +- {v1.2/docs => docs}/user-guide/deployments.md | 18 +- .../user-guide/docker-cli-to-kubectl.md | 24 +- .../docs => docs}/user-guide/downward-api.md | 10 +- .../user-guide/downward-api/dapi-pod.yaml | 0 .../user-guide/downward-api/index.md | 6 +- .../downward-api/volume/dapi-volume.yaml | 0 .../user-guide/downward-api/volume/index.md | 4 +- .../environment-guide/backend-rc.yaml | 0 .../environment-guide/backend-srv.yaml | 0 .../containers/backend/Dockerfile | 0 .../containers/backend/backend.go | 0 .../environment-guide/containers/index.md | 0 .../containers/show/Dockerfile | 0 .../environment-guide/containers/show/show.go | 0 .../user-guide/environment-guide/index.md | 10 +- .../user-guide/environment-guide/show-rc.yaml | 0 .../environment-guide/show-srv.yaml | 0 .../user-guide/getting-into-containers.md | 2 +- .../user-guide/horizontal-pod-autoscaler.md | 10 +- .../hpa-php-apache.yaml | 0 .../image/Dockerfile | 0 .../image/index.php | 0 .../horizontal-pod-autoscaling/index.md | 10 +- {v1.1/docs => docs}/user-guide/identifiers.md | 2 +- {v1.1/docs => docs}/user-guide/images.md | 4 +- docs/user-guide/index.md | 90 ++ {v1.1/docs => docs}/user-guide/ingress.md | 8 +- {v1.1/docs => docs}/user-guide/ingress.yaml | 0 .../user-guide/introspection-and-debugging.md | 10 +- {v1.1/docs => docs}/user-guide/job.yaml | 0 {v1.1/docs => docs}/user-guide/jobs.md | 28 +- {v1.1/docs => docs}/user-guide/jsonpath.md | 0 .../docs => docs}/user-guide/known-issues.md | 0 .../user-guide/kubeconfig-file.md | 2 +- .../user-guide/kubectl-overview.md | 18 +- .../user-guide/kubectl/.files_generated | 0 .../user-guide/kubectl/kubectl.md | 0 .../user-guide/kubectl/kubectl_annotate.md | 0 .../kubectl/kubectl_api-versions.md | 0 .../user-guide/kubectl/kubectl_apply.md | 0 .../user-guide/kubectl/kubectl_attach.md | 0 .../user-guide/kubectl/kubectl_autoscale.md | 0 .../kubectl/kubectl_cluster-info.md | 0 .../user-guide/kubectl/kubectl_config.md | 0 .../kubectl/kubectl_config_set-cluster.md | 0 .../kubectl/kubectl_config_set-context.md | 0 .../kubectl/kubectl_config_set-credentials.md | 0 .../user-guide/kubectl/kubectl_config_set.md | 0 .../kubectl/kubectl_config_unset.md | 0 .../kubectl/kubectl_config_use-context.md | 0 .../user-guide/kubectl/kubectl_config_view.md | 0 .../user-guide/kubectl/kubectl_create.md | 0 .../user-guide/kubectl/kubectl_delete.md | 0 .../user-guide/kubectl/kubectl_describe.md | 0 .../user-guide/kubectl/kubectl_edit.md | 0 .../user-guide/kubectl/kubectl_exec.md | 0 .../user-guide/kubectl/kubectl_expose.md | 0 .../user-guide/kubectl/kubectl_get.md | 0 .../user-guide/kubectl/kubectl_label.md | 0 .../user-guide/kubectl/kubectl_logs.md | 0 .../user-guide/kubectl/kubectl_namespace.md | 0 .../user-guide/kubectl/kubectl_patch.md | 0 .../kubectl/kubectl_port-forward.md | 0 .../user-guide/kubectl/kubectl_proxy.md | 0 .../user-guide/kubectl/kubectl_replace.md | 0 .../kubectl/kubectl_rolling-update.md | 0 .../user-guide/kubectl/kubectl_run.md | 0 .../user-guide/kubectl/kubectl_scale.md | 0 .../user-guide/kubectl/kubectl_stop.md | 0 .../user-guide/kubectl/kubectl_version.md | 0 {v1.2/docs => docs}/user-guide/labels.md | 8 +- .../user-guide/liveness/exec-liveness.yaml | 0 .../user-guide/liveness/http-liveness.yaml | 0 .../user-guide/liveness/image/Dockerfile | 0 .../user-guide/liveness/image/Makefile | 0 .../user-guide/liveness/image/server.go | 0 .../user-guide/liveness/index.md | 8 +- .../user-guide/logging-demo/Makefile | 0 docs/user-guide/logging-demo/index.md | 18 + .../logging-demo/synthetic_0_25lps.yaml | 0 .../logging-demo/synthetic_10lps.yaml | 0 {v1.2/docs => docs}/user-guide/logging.md | 8 +- .../user-guide/managing-deployments.md | 12 +- {v1.1/docs => docs}/user-guide/monitoring.md | 4 +- {v1.1/docs => docs}/user-guide/multi-pod.yaml | 0 {v1.2/docs => docs}/user-guide/namespaces.md | 10 +- .../user-guide/new-nginx-deployment.yaml | 0 .../user-guide/nginx-deployment.yaml | 0 .../user-guide/node-selection/index.md | 2 +- .../user-guide/node-selection/pod.yaml | 0 docs/user-guide/overview.md | 25 + .../user-guide/persistent-volumes.md | 4 +- .../persistent-volumes/claims/claim-01.yaml | 0 .../persistent-volumes/claims/claim-02.yaml | 0 .../persistent-volumes/claims/claim-03.json | 0 .../user-guide/persistent-volumes/index.md | 4 +- .../simpletest/namespace.json | 0 .../persistent-volumes/simpletest/pod.yaml | 0 .../simpletest/service.json | 0 .../persistent-volumes/volumes/gce.yaml | 0 .../persistent-volumes/volumes/local-01.yaml | 0 .../persistent-volumes/volumes/local-02.yaml | 0 .../persistent-volumes/volumes/nfs.yaml | 0 {v1.1/docs => docs}/user-guide/pod-states.md | 12 +- {v1.1/docs => docs}/user-guide/pod.yaml | 0 {v1.1/docs => docs}/user-guide/pods.md | 10 +- {v1.1/docs => docs}/user-guide/prereqs.md | 6 +- .../user-guide/production-pods.md | 36 +- {v1.2/docs => docs}/user-guide/quick-start.md | 8 +- .../user-guide/replication-controller.md | 8 +- .../docs => docs}/user-guide/replication.yaml | 0 docs/user-guide/resourcequota/index.md | 6 + {v1.2/docs => docs}/user-guide/secrets.md | 16 +- .../docs => docs}/user-guide/secrets/index.md | 8 +- .../user-guide/secrets/secret-pod.yaml | 0 .../user-guide/secrets/secret.yaml | 0 .../user-guide/security-context.md | 0 .../user-guide/service-accounts.md | 6 +- .../user-guide/services-firewalls.md | 0 {v1.2/docs => docs}/user-guide/services.md | 12 +- .../user-guide/sharing-clusters.md | 6 +- .../docs => docs}/user-guide/simple-nginx.md | 8 +- {v1.1/docs => docs}/user-guide/simple-yaml.md | 8 +- {v1.1/docs => docs}/user-guide/ui.md | 0 .../user-guide/update-demo/build-images.sh | 0 .../update-demo/images/kitten/Dockerfile | 0 .../update-demo/images/kitten/html/data.json | 0 .../update-demo/images/kitten/html/kitten.jpg | Bin .../update-demo/images/nautilus/Dockerfile | 0 .../images/nautilus/html/data.json | 0 .../images/nautilus/html/nautilus.jpg | Bin .../user-guide/update-demo/index.md | 10 +- .../user-guide/update-demo/kitten-rc.yaml | 0 .../update-demo/local/LICENSE.angular | 0 .../update-demo/local/angular.min.js | 0 .../update-demo/local/angular.min.js.map | 0 .../user-guide/update-demo/local/index.html | 0 .../user-guide/update-demo/local/script.js | 0 .../user-guide/update-demo/local/style.css | 0 .../user-guide/update-demo/nautilus-rc.yaml | 0 {v1.1/docs => docs}/user-guide/volumes.md | 12 +- .../user-guide/walkthrough/index.md | 20 +- .../user-guide/walkthrough/k8s201.md | 38 +- .../walkthrough/pod-nginx-with-label.yaml | 0 .../user-guide/walkthrough/pod-nginx.yaml | 0 .../user-guide/walkthrough/pod-redis.yaml | 0 .../pod-with-http-healthcheck.yaml | 0 .../user-guide/walkthrough/podtemplate.json | 0 .../walkthrough/replication-controller.yaml | 0 .../user-guide/walkthrough/service.yaml | 0 .../user-guide/working-with-resources.md | 12 +- {v1.1/docs => docs}/whatisk8s.md | 22 +- v1.1/docs/admin/admission-controllers.md | 133 --- v1.1/docs/admin/cluster-components.md | 142 --- v1.1/docs/admin/cluster-large.md | 69 -- v1.1/docs/admin/cluster-management.md | 187 ---- v1.1/docs/admin/index.md | 78 -- v1.1/docs/admin/namespaces.md | 145 --- v1.1/docs/admin/namespaces/index.md | 250 ------ v1.1/docs/admin/node.md | 212 ----- v1.1/docs/admin/service-accounts-admin.md | 97 -- v1.1/docs/devel/coding-conventions.md | 58 -- v1.1/docs/devel/developer-guides/vagrant.md | 345 -------- v1.1/docs/devel/faster_reviews.md | 202 ----- v1.1/docs/devel/index.md | 78 -- v1.1/docs/devel/pull-requests.md | 36 - v1.1/docs/devel/releasing.md | 309 ------- v1.1/docs/devel/scheduler_algorithm.md | 38 - v1.1/docs/getting-started-guides/aws.md | 103 --- v1.1/docs/getting-started-guides/azure.md | 10 - .../coreos/bare_metal_offline.md | 694 --------------- .../coreos/coreos_multinode_cluster.md | 199 ----- .../docker-multinode.md | 84 -- .../docker-multinode/deployDNS.md | 51 -- .../docker-multinode/worker.md | 139 --- .../fedora/fedora_manual_config.md | 215 ----- v1.1/docs/getting-started-guides/index.md | 177 ---- v1.1/docs/getting-started-guides/locally.md | 116 --- .../getting-started-guides/mesos-docker.md | 262 ------ v1.1/docs/getting-started-guides/rkt/index.md | 138 --- v1.1/docs/getting-started-guides/scratch.md | 828 ------------------ v1.1/docs/index.md | 31 - v1.1/docs/user-guide/accessing-the-cluster.md | 271 ------ v1.1/docs/user-guide/annotations.md | 27 - v1.1/docs/user-guide/config-best-practices.md | 25 - .../docs/user-guide/configuring-containers.md | 163 ---- .../connecting-to-applications-proxy.md | 28 - v1.1/docs/user-guide/container-environment.md | 80 -- v1.1/docs/user-guide/deployments.md | 351 -------- v1.1/docs/user-guide/downward-api/index.md | 35 - .../user-guide/environment-guide/index.md | 93 -- .../horizontal-pod-autoscaling/index.md | 184 ---- v1.1/docs/user-guide/index.md | 90 -- v1.1/docs/user-guide/kubeconfig-file.md | 208 ----- v1.1/docs/user-guide/kubectl-overview.md | 270 ------ v1.1/docs/user-guide/labels.md | 163 ---- v1.1/docs/user-guide/logging-demo/index.md | 18 - v1.1/docs/user-guide/logging.md | 93 -- v1.1/docs/user-guide/namespaces.md | 89 -- v1.1/docs/user-guide/overview.md | 25 - v1.1/docs/user-guide/persistent-volumes.md | 171 ---- v1.1/docs/user-guide/quick-start.md | 66 -- .../docs/user-guide/replication-controller.md | 78 -- v1.1/docs/user-guide/resourcequota/index.md | 6 - v1.1/docs/user-guide/secrets.md | 491 ----------- v1.1/docs/user-guide/service-accounts.md | 192 ---- v1.1/docs/user-guide/services.md | 531 ----------- v1.1/docs/user-guide/update-demo/index.md | 126 --- v1.1/docs/user-guide/walkthrough/k8s201.md | 277 ------ v1.1/pagelist.md | 22 - v1.2/docs/admin/accessing-the-api.md | 75 -- v1.2/docs/admin/authentication.md | 128 --- v1.2/docs/admin/authorization.md | 131 --- v1.2/docs/admin/cluster-troubleshooting.md | 112 --- v1.2/docs/admin/daemon.yaml | 18 - v1.2/docs/admin/daemons.md | 169 ---- v1.2/docs/admin/dns.md | 39 - v1.2/docs/admin/etcd.md | 46 - v1.2/docs/admin/garbage-collection.md | 61 -- v1.2/docs/admin/high-availability.md | 227 ----- .../admin/high-availability/default-kubelet | 8 - v1.2/docs/admin/high-availability/etcd.yaml | 87 -- .../high-availability/kube-apiserver.yaml | 90 -- .../kube-controller-manager.yaml | 82 -- .../high-availability/kube-scheduler.yaml | 30 - .../docs/admin/high-availability/monit-docker | 9 - .../admin/high-availability/monit-kubelet | 11 - .../admin/high-availability/podmaster.yaml | 43 - v1.2/docs/admin/limitrange/index.md | 194 ---- v1.2/docs/admin/limitrange/invalid-pod.yaml | 12 - v1.2/docs/admin/limitrange/limits.yaml | 26 - v1.2/docs/admin/limitrange/namespace.yaml | 4 - v1.2/docs/admin/limitrange/valid-pod.yaml | 14 - v1.2/docs/admin/multi-cluster.md | 66 -- v1.2/docs/admin/namespaces/namespace-dev.json | 10 - .../docs/admin/namespaces/namespace-prod.json | 10 - v1.2/docs/admin/networking.md | 184 ---- v1.2/docs/admin/ovs-networking.md | 18 - v1.2/docs/admin/resource-quota.md | 154 ---- v1.2/docs/admin/resourcequota/index.md | 156 ---- v1.2/docs/admin/resourcequota/limits.yaml | 13 - v1.2/docs/admin/resourcequota/namespace.yaml | 4 - v1.2/docs/admin/resourcequota/quota.yaml | 14 - v1.2/docs/admin/salt.md | 102 --- v1.2/docs/admin/static-pods.md | 123 --- v1.2/docs/api.md | 129 --- v1.2/docs/devel/api-conventions.md | 659 -------------- v1.2/docs/devel/api_changes.md | 586 ------------- v1.2/docs/devel/automation.md | 103 --- v1.2/docs/devel/cherry-picks.md | 33 - v1.2/docs/devel/cli-roadmap.md | 10 - v1.2/docs/devel/client-libraries.md | 22 - v1.2/docs/devel/collab.md | 41 - v1.2/docs/devel/development.md | 317 ------- v1.2/docs/devel/e2e-tests.md | 112 --- v1.2/docs/devel/flaky-tests.md | 66 -- v1.2/docs/devel/getting-builds.md | 33 - v1.2/docs/devel/index.md | 78 -- v1.2/docs/devel/instrumentation.md | 36 - v1.2/docs/devel/issues.md | 18 - v1.2/docs/devel/kubectl-conventions.md | 98 --- v1.2/docs/devel/logging.md | 29 - v1.2/docs/devel/making-release-notes.md | 43 - v1.2/docs/devel/profiling.md | 45 - v1.2/docs/devel/scheduler.md | 50 -- .../devel/writing-a-getting-started-guide.md | 99 --- v1.2/docs/getting-started-guides/azure.md | 10 - .../getting-started-guides/binary_release.md | 27 - .../centos/centos_manual_config.md | 171 ---- .../docs/getting-started-guides/cloudstack.md | 80 -- v1.2/docs/getting-started-guides/coreos.md | 71 -- .../coreos/azure/.gitignore | 1 - .../coreos/azure/addons/skydns-rc.yaml | 92 -- .../coreos/azure/addons/skydns-svc.yaml | 20 - .../coreos/azure/azure-login.js | 3 - .../kubernetes-cluster-etcd-node-template.yml | 19 - ...kubernetes-cluster-main-nodes-template.yml | 339 ------- .../coreos/azure/create-kubernetes-cluster.js | 15 - .../coreos/azure/destroy-cluster.js | 7 - .../coreos/azure/expose_guestbook_app_port.sh | 29 - .../coreos/azure/index.md | 227 ----- .../coreos/azure/lib/azure_wrapper.js | 271 ------ .../coreos/azure/lib/cloud_config.js | 58 -- .../azure/lib/deployment_logic/kubernetes.js | 77 -- .../coreos/azure/lib/util.js | 33 - .../coreos/azure/package.json | 19 - .../coreos/azure/scale-kubernetes-cluster.js | 10 - .../coreos/bare_metal_calico.md | 120 --- .../coreos/cloud-configs/master.yaml | 140 --- .../coreos/cloud-configs/node.yaml | 98 --- v1.2/docs/getting-started-guides/dcos.md | 130 --- .../docker-multinode/master.md | 179 ---- .../docker-multinode/master.sh | 176 ---- .../docker-multinode/skydns-rc.yaml.in | 92 -- .../docker-multinode/skydns-svc.yaml.in | 20 - .../docker-multinode/testing.md | 68 -- .../docker-multinode/worker.sh | 174 ---- v1.2/docs/getting-started-guides/docker.md | 144 --- .../fedora/fedora-calico.md | 310 ------- .../fedora/fedora_ansible_config.md | 226 ----- .../fedora/flannel_multi_node_cluster.md | 173 ---- v1.2/docs/getting-started-guides/gce.md | 215 ----- v1.2/docs/getting-started-guides/index.md | 177 ---- v1.2/docs/getting-started-guides/juju.md | 250 ------ .../getting-started-guides/libvirt-coreos.md | 293 ------- .../logging-elasticsearch.md | 243 ----- v1.2/docs/getting-started-guides/logging.md | 218 ----- v1.2/docs/getting-started-guides/meanstack.md | 444 ---------- v1.2/docs/getting-started-guides/mesos.md | 335 ------- v1.2/docs/getting-started-guides/ovirt.md | 50 -- v1.2/docs/getting-started-guides/rackspace.md | 63 -- .../getting-started-guides/ubuntu-calico.md | 273 ------ v1.2/docs/getting-started-guides/ubuntu.md | 261 ------ v1.2/docs/getting-started-guides/vagrant.md | 336 ------- v1.2/docs/getting-started-guides/vsphere.md | 84 -- v1.2/docs/index.md | 31 - v1.2/docs/reporting-security-issues.md | 24 - v1.2/docs/roadmap.md | 48 - v1.2/docs/troubleshooting.md | 58 -- .../user-guide/application-troubleshooting.md | 191 ---- v1.2/docs/user-guide/compute-resources.md | 249 ------ .../user-guide/connecting-applications.md | 386 -------- ...connecting-to-applications-port-forward.md | 46 - v1.2/docs/user-guide/containers.md | 93 -- v1.2/docs/user-guide/debugging-services.md | 503 ----------- .../docs/user-guide/deploying-applications.md | 114 --- v1.2/docs/user-guide/docker-cli-to-kubectl.md | 266 ------ v1.2/docs/user-guide/downward-api.md | 154 ---- .../user-guide/downward-api/dapi-pod.yaml | 23 - .../downward-api/volume/dapi-volume.yaml | 30 - .../user-guide/downward-api/volume/index.md | 67 -- .../environment-guide/backend-rc.yaml | 30 - .../environment-guide/backend-srv.yaml | 13 - .../containers/backend/Dockerfile | 2 - .../containers/backend/backend.go | 37 - .../environment-guide/containers/index.md | 27 - .../containers/show/Dockerfile | 2 - .../environment-guide/containers/show/show.go | 95 -- .../user-guide/environment-guide/show-rc.yaml | 32 - .../environment-guide/show-srv.yaml | 15 - .../user-guide/getting-into-containers.md | 70 -- .../user-guide/horizontal-pod-autoscaler.md | 78 -- .../hpa-php-apache.yaml | 14 - .../image/Dockerfile | 5 - .../image/index.php | 7 - v1.2/docs/user-guide/identifiers.md | 14 - v1.2/docs/user-guide/images.md | 237 ----- v1.2/docs/user-guide/index.md | 90 -- v1.2/docs/user-guide/ingress.md | 265 ------ v1.2/docs/user-guide/ingress.yaml | 9 - .../user-guide/introspection-and-debugging.md | 316 ------- v1.2/docs/user-guide/job.yaml | 20 - v1.2/docs/user-guide/jobs.md | 210 ----- v1.2/docs/user-guide/jsonpath.md | 63 -- v1.2/docs/user-guide/known-issues.md | 25 - .../user-guide/liveness/exec-liveness.yaml | 21 - .../user-guide/liveness/http-liveness.yaml | 18 - .../docs/user-guide/liveness/image/Dockerfile | 4 - v1.2/docs/user-guide/liveness/image/Makefile | 13 - v1.2/docs/user-guide/liveness/image/server.go | 46 - v1.2/docs/user-guide/liveness/index.md | 82 -- v1.2/docs/user-guide/logging-demo/Makefile | 26 - v1.2/docs/user-guide/logging-demo/index.md | 18 - .../logging-demo/synthetic_0_25lps.yaml | 30 - .../logging-demo/synthetic_10lps.yaml | 30 - v1.2/docs/user-guide/managing-deployments.md | 409 --------- v1.2/docs/user-guide/monitoring.md | 60 -- v1.2/docs/user-guide/multi-pod.yaml | 49 -- .../docs/user-guide/new-nginx-deployment.yaml | 16 - v1.2/docs/user-guide/nginx-deployment.yaml | 16 - v1.2/docs/user-guide/node-selection/index.md | 61 -- v1.2/docs/user-guide/node-selection/pod.yaml | 13 - v1.2/docs/user-guide/overview.md | 25 - .../persistent-volumes/claims/claim-01.yaml | 10 - .../persistent-volumes/claims/claim-02.yaml | 10 - .../persistent-volumes/claims/claim-03.json | 17 - .../user-guide/persistent-volumes/index.md | 93 -- .../simpletest/namespace.json | 10 - .../persistent-volumes/simpletest/pod.yaml | 20 - .../simpletest/service.json | 19 - .../persistent-volumes/volumes/gce.yaml | 13 - .../persistent-volumes/volumes/local-01.yaml | 13 - .../persistent-volumes/volumes/local-02.yaml | 14 - .../persistent-volumes/volumes/nfs.yaml | 12 - v1.2/docs/user-guide/pod-states.md | 125 --- v1.2/docs/user-guide/pod.yaml | 12 - v1.2/docs/user-guide/pods.md | 124 --- v1.2/docs/user-guide/prereqs.md | 56 -- v1.2/docs/user-guide/production-pods.md | 343 -------- v1.2/docs/user-guide/replication.yaml | 19 - v1.2/docs/user-guide/resourcequota/index.md | 6 - v1.2/docs/user-guide/secrets/index.md | 59 -- v1.2/docs/user-guide/secrets/secret-pod.yaml | 18 - v1.2/docs/user-guide/secrets/secret.yaml | 7 - v1.2/docs/user-guide/security-context.md | 4 - v1.2/docs/user-guide/services-firewalls.md | 51 -- v1.2/docs/user-guide/sharing-clusters.md | 119 --- v1.2/docs/user-guide/simple-nginx.md | 56 -- v1.2/docs/user-guide/simple-yaml.md | 94 -- v1.2/docs/user-guide/ui.md | 59 -- .../user-guide/update-demo/build-images.sh | 30 - .../update-demo/images/kitten/Dockerfile | 17 - .../update-demo/images/kitten/html/data.json | 3 - .../update-demo/images/kitten/html/kitten.jpg | Bin 14769 -> 0 bytes .../update-demo/images/nautilus/Dockerfile | 17 - .../images/nautilus/html/data.json | 3 - .../images/nautilus/html/nautilus.jpg | Bin 21231 -> 0 bytes .../user-guide/update-demo/kitten-rc.yaml | 20 - .../update-demo/local/LICENSE.angular | 21 - .../update-demo/local/angular.min.js | 210 ----- .../update-demo/local/angular.min.js.map | 8 - .../user-guide/update-demo/local/index.html | 36 - .../user-guide/update-demo/local/script.js | 100 --- .../user-guide/update-demo/local/style.css | 40 - .../user-guide/update-demo/nautilus-rc.yaml | 21 - v1.2/docs/user-guide/volumes.md | 378 -------- v1.2/docs/user-guide/walkthrough/index.md | 182 ---- .../walkthrough/pod-nginx-with-label.yaml | 12 - .../user-guide/walkthrough/pod-nginx.yaml | 10 - .../user-guide/walkthrough/pod-redis.yaml | 14 - .../pod-with-http-healthcheck.yaml | 20 - .../user-guide/walkthrough/podtemplate.json | 22 - .../walkthrough/replication-controller.yaml | 24 - v1.2/docs/user-guide/walkthrough/service.yaml | 16 - .../docs/user-guide/working-with-resources.md | 54 -- v1.2/docs/whatisk8s.md | 94 -- v1.2/editdocs.md | 118 --- v1.2/index.md | 116 --- v1.2/reference.md | 3 - v1.2/samples.md | 3 - 606 files changed, 1202 insertions(+), 30698 deletions(-) rename _data/{v1_1 => }/globals.yml (100%) rename _data/{v1_1 => }/guides.yml (54%) create mode 100644 _data/reference.yml rename _data/{v1_2 => }/samples.yml (97%) rename _data/{v1_1 => }/support.yml (73%) delete mode 100644 _data/v1_1/reference.yml delete mode 100644 _data/v1_1/samples.yml delete mode 100644 _data/v1_2/globals.yml delete mode 100644 _data/v1_2/guides.yml delete mode 100644 _data/v1_2/reference.yml delete mode 100644 _data/v1_2/support.yml rename {v1.1/docs => docs}/admin/accessing-the-api.md (90%) rename {v1.2/docs => docs}/admin/admission-controllers.md (92%) rename {v1.1/docs => docs}/admin/authentication.md (100%) rename {v1.1/docs => docs}/admin/authorization.md (98%) rename {v1.2/docs => docs}/admin/cluster-components.md (77%) rename {v1.2/docs => docs}/admin/cluster-large.md (97%) rename {v1.2/docs => docs}/admin/cluster-management.md (97%) rename {v1.1/docs => docs}/admin/cluster-troubleshooting.md (89%) rename {v1.1/docs => docs}/admin/daemon.yaml (100%) rename {v1.1/docs => docs}/admin/daemons.md (83%) rename {v1.1/docs => docs}/admin/dns.md (100%) rename {v1.1/docs => docs}/admin/etcd.md (88%) rename {v1.1/docs => docs}/admin/garbage-collection.md (100%) rename {v1.1/docs => docs}/admin/high-availability.md (90%) rename {v1.1/docs => docs}/admin/high-availability/default-kubelet (100%) rename {v1.1/docs => docs}/admin/high-availability/etcd.yaml (100%) rename {v1.1/docs => docs}/admin/high-availability/kube-apiserver.yaml (100%) rename {v1.1/docs => docs}/admin/high-availability/kube-controller-manager.yaml (100%) rename {v1.1/docs => docs}/admin/high-availability/kube-scheduler.yaml (100%) rename {v1.1/docs => docs}/admin/high-availability/monit-docker (100%) rename {v1.1/docs => docs}/admin/high-availability/monit-kubelet (100%) rename {v1.1/docs => docs}/admin/high-availability/podmaster.yaml (100%) rename {v1.2/docs => docs}/admin/index.md (60%) rename {v1.1/docs => docs}/admin/kube-apiserver.md (100%) rename {v1.1/docs => docs}/admin/kube-controller-manager.md (100%) rename {v1.1/docs => docs}/admin/kube-proxy.md (100%) rename {v1.1/docs => docs}/admin/kube-scheduler.md (100%) rename {v1.1/docs => docs}/admin/kubelet.md (100%) rename {v1.1/docs => docs}/admin/limitrange/index.md (95%) rename {v1.1/docs => docs}/admin/limitrange/invalid-pod.yaml (100%) rename {v1.1/docs => docs}/admin/limitrange/limits.yaml (100%) rename {v1.1/docs => docs}/admin/limitrange/namespace.yaml (100%) rename {v1.1/docs => docs}/admin/limitrange/valid-pod.yaml (100%) rename {v1.1/docs => docs}/admin/multi-cluster.md (100%) rename {v1.2/docs => docs}/admin/namespaces.md (90%) rename {v1.2/docs => docs}/admin/namespaces/index.md (92%) rename {v1.1/docs => docs}/admin/namespaces/namespace-dev.json (100%) rename {v1.1/docs => docs}/admin/namespaces/namespace-prod.json (100%) rename {v1.1/docs => docs}/admin/networking.md (96%) rename {v1.2/docs => docs}/admin/node.md (97%) rename {v1.1/docs => docs}/admin/ovs-networking.md (100%) rename {v1.1/docs => docs}/admin/resource-quota.md (90%) rename {v1.1/docs => docs}/admin/resourcequota/index.md (95%) rename {v1.1/docs => docs}/admin/resourcequota/limits.yaml (100%) rename {v1.1/docs => docs}/admin/resourcequota/namespace.yaml (100%) rename {v1.1/docs => docs}/admin/resourcequota/quota.yaml (100%) rename {v1.1/docs => docs}/admin/salt.md (100%) rename {v1.2/docs => docs}/admin/service-accounts-admin.md (94%) rename {v1.1/docs => docs}/admin/static-pods.md (96%) rename {v1.1/docs => docs}/api-reference/extensions/v1beta1/definitions.md (100%) rename {v1.1/docs => docs}/api-reference/extensions/v1beta1/operations.md (100%) rename {v1.1/docs => docs}/api-reference/v1/definitions.md (100%) rename {v1.1/docs => docs}/api-reference/v1/operations.md (100%) rename {v1.1/docs => docs}/api.md (86%) rename {v1.1/docs => docs}/devel/api-conventions.md (94%) rename {v1.1/docs => docs}/devel/api_changes.md (98%) rename {v1.1/docs => docs}/devel/automation.md (100%) rename {v1.1/docs => docs}/devel/cherry-picks.md (100%) rename {v1.1/docs => docs}/devel/cli-roadmap.md (100%) rename {v1.1/docs => docs}/devel/client-libraries.md (100%) rename {v1.2/docs => docs}/devel/coding-conventions.md (89%) rename {v1.1/docs => docs}/devel/collab.md (100%) rename {v1.2/docs => docs}/devel/developer-guides/vagrant.md (99%) rename {v1.1/docs => docs}/devel/development.md (96%) rename {v1.1/docs => docs}/devel/e2e-tests.md (100%) rename {v1.2/docs => docs}/devel/faster_reviews.md (97%) rename {v1.1/docs => docs}/devel/flaky-tests.md (100%) rename {v1.1/docs => docs}/devel/getting-builds.md (100%) create mode 100644 docs/devel/index.md rename {v1.1/docs => docs}/devel/instrumentation.md (100%) rename {v1.1/docs => docs}/devel/issues.md (100%) rename {v1.1/docs => docs}/devel/kubectl-conventions.md (100%) rename {v1.1/docs => docs}/devel/logging.md (100%) rename {v1.1/docs => docs}/devel/making-release-notes.md (100%) rename {v1.1/docs => docs}/devel/profiling.md (100%) rename {v1.2/docs => docs}/devel/pull-requests.md (96%) rename {v1.2/docs => docs}/devel/releasing.md (98%) rename {v1.1/docs => docs}/devel/scheduler.md (100%) rename {v1.2/docs => docs}/devel/scheduler_algorithm.md (89%) rename {v1.1/docs => docs}/devel/writing-a-getting-started-guide.md (92%) rename {v1.1 => docs}/editdocs.md (100%) rename {v1.2/docs => docs}/getting-started-guides/aws.md (85%) create mode 100644 docs/getting-started-guides/azure.md rename {v1.1/docs => docs}/getting-started-guides/binary_release.md (100%) rename {v1.1/docs => docs}/getting-started-guides/centos/centos_manual_config.md (91%) rename {v1.1/docs => docs}/getting-started-guides/cloudstack.md (96%) rename {v1.1/docs => docs}/getting-started-guides/coreos.md (93%) rename {v1.1/docs => docs}/getting-started-guides/coreos/azure/.gitignore (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/azure/addons/skydns-rc.yaml (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/azure/addons/skydns-svc.yaml (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/azure/azure-login.js (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-etcd-node-template.yml (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/azure/create-kubernetes-cluster.js (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/azure/destroy-cluster.js (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/azure/expose_guestbook_app_port.sh (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/azure/index.md (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/azure/lib/azure_wrapper.js (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/azure/lib/cloud_config.js (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/azure/lib/util.js (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/azure/package.json (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/azure/scale-kubernetes-cluster.js (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/bare_metal_calico.md (100%) rename {v1.2/docs => docs}/getting-started-guides/coreos/bare_metal_offline.md (98%) rename {v1.1/docs => docs}/getting-started-guides/coreos/cloud-configs/master.yaml (100%) rename {v1.1/docs => docs}/getting-started-guides/coreos/cloud-configs/node.yaml (100%) rename {v1.2/docs => docs}/getting-started-guides/coreos/coreos_multinode_cluster.md (95%) rename {v1.1/docs => docs}/getting-started-guides/dcos.md (97%) rename {v1.2/docs => docs}/getting-started-guides/docker-multinode.md (71%) rename {v1.2/docs => docs}/getting-started-guides/docker-multinode/deployDNS.md (86%) rename {v1.1/docs => docs}/getting-started-guides/docker-multinode/master.md (95%) rename {v1.1/docs => docs}/getting-started-guides/docker-multinode/master.sh (100%) rename {v1.1/docs => docs}/getting-started-guides/docker-multinode/skydns-rc.yaml.in (100%) rename {v1.1/docs => docs}/getting-started-guides/docker-multinode/skydns-svc.yaml.in (100%) rename {v1.1/docs => docs}/getting-started-guides/docker-multinode/testing.md (94%) rename {v1.2/docs => docs}/getting-started-guides/docker-multinode/worker.md (94%) rename {v1.1/docs => docs}/getting-started-guides/docker-multinode/worker.sh (100%) rename {v1.1/docs => docs}/getting-started-guides/docker.md (93%) rename {v1.1/docs => docs}/getting-started-guides/fedora/fedora-calico.md (100%) rename {v1.1/docs => docs}/getting-started-guides/fedora/fedora_ansible_config.md (100%) rename {v1.2/docs => docs}/getting-started-guides/fedora/fedora_manual_config.md (95%) rename {v1.1/docs => docs}/getting-started-guides/fedora/flannel_multi_node_cluster.md (87%) rename {v1.1/docs => docs}/getting-started-guides/gce.md (90%) create mode 100644 docs/getting-started-guides/index.md rename {v1.1/docs => docs}/getting-started-guides/juju.md (100%) rename {v1.1/docs => docs}/getting-started-guides/libvirt-coreos.md (100%) rename {v1.2/docs => docs}/getting-started-guides/locally.md (89%) rename {v1.1/docs => docs}/getting-started-guides/logging-elasticsearch.md (99%) rename {v1.1/docs => docs}/getting-started-guides/logging.md (98%) rename {v1.1/docs => docs}/getting-started-guides/meanstack.md (100%) rename {v1.2/docs => docs}/getting-started-guides/mesos-docker.md (99%) rename {v1.1/docs => docs}/getting-started-guides/mesos.md (100%) rename {v1.1/docs => docs}/getting-started-guides/ovirt.md (100%) rename {v1.1/docs => docs}/getting-started-guides/rackspace.md (100%) rename {v1.2/docs => docs}/getting-started-guides/rkt/index.md (95%) rename {v1.2/docs => docs}/getting-started-guides/scratch.md (91%) rename {v1.1/docs => docs}/getting-started-guides/ubuntu-calico.md (98%) rename {v1.1/docs => docs}/getting-started-guides/ubuntu.md (98%) rename {v1.1/docs => docs}/getting-started-guides/vagrant.md (97%) rename {v1.1/docs => docs}/getting-started-guides/vsphere.md (93%) rename {v1.1 => docs}/index.md (100%) rename {v1.2 => docs}/pagelist.md (73%) rename {v1.1 => docs}/reference.md (100%) rename {v1.1/docs => docs}/reporting-security-issues.md (100%) rename {v1.1/docs => docs}/roadmap.md (100%) rename {v1.1 => docs}/samples.md (100%) rename search.md => docs/search.md (100%) rename {v1.1/docs => docs}/troubleshooting.md (81%) rename {v1.2/docs => docs}/user-guide/accessing-the-cluster.md (89%) rename {v1.2/docs => docs}/user-guide/annotations.md (94%) rename {v1.1/docs => docs}/user-guide/application-troubleshooting.md (92%) rename {v1.1/docs => docs}/user-guide/compute-resources.md (95%) rename {v1.2/docs => docs}/user-guide/config-best-practices.md (77%) rename {v1.2/docs => docs}/user-guide/configuring-containers.md (85%) rename {v1.1/docs => docs}/user-guide/connecting-applications.md (97%) rename {v1.1/docs => docs}/user-guide/connecting-to-applications-port-forward.md (69%) rename {v1.2/docs => docs}/user-guide/connecting-to-applications-proxy.md (66%) rename {v1.2/docs => docs}/user-guide/container-environment.md (91%) rename {v1.1/docs => docs}/user-guide/containers.md (100%) rename {v1.1/docs => docs}/user-guide/debugging-services.md (99%) rename {v1.1/docs => docs}/user-guide/deploying-applications.md (77%) rename {v1.2/docs => docs}/user-guide/deployments.md (92%) rename {v1.1/docs => docs}/user-guide/docker-cli-to-kubectl.md (86%) rename {v1.1/docs => docs}/user-guide/downward-api.md (90%) rename {v1.1/docs => docs}/user-guide/downward-api/dapi-pod.yaml (100%) rename {v1.2/docs => docs}/user-guide/downward-api/index.md (75%) rename {v1.1/docs => docs}/user-guide/downward-api/volume/dapi-volume.yaml (100%) rename {v1.1/docs => docs}/user-guide/downward-api/volume/index.md (93%) rename {v1.1/docs => docs}/user-guide/environment-guide/backend-rc.yaml (100%) rename {v1.1/docs => docs}/user-guide/environment-guide/backend-srv.yaml (100%) rename {v1.1/docs => docs}/user-guide/environment-guide/containers/backend/Dockerfile (100%) rename {v1.1/docs => docs}/user-guide/environment-guide/containers/backend/backend.go (100%) rename {v1.1/docs => docs}/user-guide/environment-guide/containers/index.md (100%) rename {v1.1/docs => docs}/user-guide/environment-guide/containers/show/Dockerfile (100%) rename {v1.1/docs => docs}/user-guide/environment-guide/containers/show/show.go (100%) rename {v1.2/docs => docs}/user-guide/environment-guide/index.md (84%) rename {v1.1/docs => docs}/user-guide/environment-guide/show-rc.yaml (100%) rename {v1.1/docs => docs}/user-guide/environment-guide/show-srv.yaml (100%) rename {v1.1/docs => docs}/user-guide/getting-into-containers.md (87%) rename {v1.1/docs => docs}/user-guide/horizontal-pod-autoscaler.md (90%) rename {v1.1/docs => docs}/user-guide/horizontal-pod-autoscaling/hpa-php-apache.yaml (100%) rename {v1.1/docs => docs}/user-guide/horizontal-pod-autoscaling/image/Dockerfile (100%) rename {v1.1/docs => docs}/user-guide/horizontal-pod-autoscaling/image/index.php (100%) rename {v1.2/docs => docs}/user-guide/horizontal-pod-autoscaling/index.md (91%) rename {v1.1/docs => docs}/user-guide/identifiers.md (90%) rename {v1.1/docs => docs}/user-guide/images.md (98%) create mode 100644 docs/user-guide/index.md rename {v1.1/docs => docs}/user-guide/ingress.md (93%) rename {v1.1/docs => docs}/user-guide/ingress.yaml (100%) rename {v1.1/docs => docs}/user-guide/introspection-and-debugging.md (96%) rename {v1.1/docs => docs}/user-guide/job.yaml (100%) rename {v1.1/docs => docs}/user-guide/jobs.md (87%) rename {v1.1/docs => docs}/user-guide/jsonpath.md (100%) rename {v1.1/docs => docs}/user-guide/known-issues.md (100%) rename {v1.2/docs => docs}/user-guide/kubeconfig-file.md (97%) rename {v1.2/docs => docs}/user-guide/kubectl-overview.md (93%) rename {v1.1/docs => docs}/user-guide/kubectl/.files_generated (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_annotate.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_api-versions.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_apply.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_attach.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_autoscale.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_cluster-info.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_config.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_config_set-cluster.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_config_set-context.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_config_set-credentials.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_config_set.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_config_unset.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_config_use-context.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_config_view.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_create.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_delete.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_describe.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_edit.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_exec.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_expose.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_get.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_label.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_logs.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_namespace.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_patch.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_port-forward.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_proxy.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_replace.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_rolling-update.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_run.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_scale.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_stop.md (100%) rename {v1.1/docs => docs}/user-guide/kubectl/kubectl_version.md (100%) rename {v1.2/docs => docs}/user-guide/labels.md (92%) rename {v1.1/docs => docs}/user-guide/liveness/exec-liveness.yaml (100%) rename {v1.1/docs => docs}/user-guide/liveness/http-liveness.yaml (100%) rename {v1.1/docs => docs}/user-guide/liveness/image/Dockerfile (100%) rename {v1.1/docs => docs}/user-guide/liveness/image/Makefile (100%) rename {v1.1/docs => docs}/user-guide/liveness/image/server.go (100%) rename {v1.1/docs => docs}/user-guide/liveness/index.md (85%) rename {v1.1/docs => docs}/user-guide/logging-demo/Makefile (100%) create mode 100644 docs/user-guide/logging-demo/index.md rename {v1.1/docs => docs}/user-guide/logging-demo/synthetic_0_25lps.yaml (100%) rename {v1.1/docs => docs}/user-guide/logging-demo/synthetic_10lps.yaml (100%) rename {v1.2/docs => docs}/user-guide/logging.md (91%) rename {v1.1/docs => docs}/user-guide/managing-deployments.md (93%) rename {v1.1/docs => docs}/user-guide/monitoring.md (89%) rename {v1.1/docs => docs}/user-guide/multi-pod.yaml (100%) rename {v1.2/docs => docs}/user-guide/namespaces.md (87%) rename {v1.1/docs => docs}/user-guide/new-nginx-deployment.yaml (100%) rename {v1.1/docs => docs}/user-guide/nginx-deployment.yaml (100%) rename {v1.1/docs => docs}/user-guide/node-selection/index.md (85%) rename {v1.1/docs => docs}/user-guide/node-selection/pod.yaml (100%) create mode 100644 docs/user-guide/overview.md rename {v1.2/docs => docs}/user-guide/persistent-volumes.md (97%) rename {v1.1/docs => docs}/user-guide/persistent-volumes/claims/claim-01.yaml (100%) rename {v1.1/docs => docs}/user-guide/persistent-volumes/claims/claim-02.yaml (100%) rename {v1.1/docs => docs}/user-guide/persistent-volumes/claims/claim-03.json (100%) rename {v1.1/docs => docs}/user-guide/persistent-volumes/index.md (95%) rename {v1.1/docs => docs}/user-guide/persistent-volumes/simpletest/namespace.json (100%) rename {v1.1/docs => docs}/user-guide/persistent-volumes/simpletest/pod.yaml (100%) rename {v1.1/docs => docs}/user-guide/persistent-volumes/simpletest/service.json (100%) rename {v1.1/docs => docs}/user-guide/persistent-volumes/volumes/gce.yaml (100%) rename {v1.1/docs => docs}/user-guide/persistent-volumes/volumes/local-01.yaml (100%) rename {v1.1/docs => docs}/user-guide/persistent-volumes/volumes/local-02.yaml (100%) rename {v1.1/docs => docs}/user-guide/persistent-volumes/volumes/nfs.yaml (100%) rename {v1.1/docs => docs}/user-guide/pod-states.md (86%) rename {v1.1/docs => docs}/user-guide/pod.yaml (100%) rename {v1.1/docs => docs}/user-guide/pods.md (89%) rename {v1.1/docs => docs}/user-guide/prereqs.md (66%) rename {v1.1/docs => docs}/user-guide/production-pods.md (74%) rename {v1.2/docs => docs}/user-guide/quick-start.md (83%) rename {v1.2/docs => docs}/user-guide/replication-controller.md (86%) rename {v1.1/docs => docs}/user-guide/replication.yaml (100%) create mode 100644 docs/user-guide/resourcequota/index.md rename {v1.2/docs => docs}/user-guide/secrets.md (95%) rename {v1.1/docs => docs}/user-guide/secrets/index.md (62%) rename {v1.1/docs => docs}/user-guide/secrets/secret-pod.yaml (100%) rename {v1.1/docs => docs}/user-guide/secrets/secret.yaml (100%) rename {v1.1/docs => docs}/user-guide/security-context.md (100%) rename {v1.2/docs => docs}/user-guide/service-accounts.md (94%) rename {v1.1/docs => docs}/user-guide/services-firewalls.md (100%) rename {v1.2/docs => docs}/user-guide/services.md (97%) rename {v1.1/docs => docs}/user-guide/sharing-clusters.md (91%) rename {v1.1/docs => docs}/user-guide/simple-nginx.md (71%) rename {v1.1/docs => docs}/user-guide/simple-yaml.md (87%) rename {v1.1/docs => docs}/user-guide/ui.md (100%) rename {v1.1/docs => docs}/user-guide/update-demo/build-images.sh (100%) rename {v1.1/docs => docs}/user-guide/update-demo/images/kitten/Dockerfile (100%) rename {v1.1/docs => docs}/user-guide/update-demo/images/kitten/html/data.json (100%) rename {v1.1/docs => docs}/user-guide/update-demo/images/kitten/html/kitten.jpg (100%) rename {v1.1/docs => docs}/user-guide/update-demo/images/nautilus/Dockerfile (100%) rename {v1.1/docs => docs}/user-guide/update-demo/images/nautilus/html/data.json (100%) rename {v1.1/docs => docs}/user-guide/update-demo/images/nautilus/html/nautilus.jpg (100%) rename {v1.2/docs => docs}/user-guide/update-demo/index.md (82%) rename {v1.1/docs => docs}/user-guide/update-demo/kitten-rc.yaml (100%) rename {v1.1/docs => docs}/user-guide/update-demo/local/LICENSE.angular (100%) rename {v1.1/docs => docs}/user-guide/update-demo/local/angular.min.js (100%) rename {v1.1/docs => docs}/user-guide/update-demo/local/angular.min.js.map (100%) rename {v1.1/docs => docs}/user-guide/update-demo/local/index.html (100%) rename {v1.1/docs => docs}/user-guide/update-demo/local/script.js (100%) rename {v1.1/docs => docs}/user-guide/update-demo/local/style.css (100%) rename {v1.1/docs => docs}/user-guide/update-demo/nautilus-rc.yaml (100%) rename {v1.1/docs => docs}/user-guide/volumes.md (95%) rename {v1.1/docs => docs}/user-guide/walkthrough/index.md (86%) rename {v1.2/docs => docs}/user-guide/walkthrough/k8s201.md (82%) rename {v1.1/docs => docs}/user-guide/walkthrough/pod-nginx-with-label.yaml (100%) rename {v1.1/docs => docs}/user-guide/walkthrough/pod-nginx.yaml (100%) rename {v1.1/docs => docs}/user-guide/walkthrough/pod-redis.yaml (100%) rename {v1.1/docs => docs}/user-guide/walkthrough/pod-with-http-healthcheck.yaml (100%) rename {v1.1/docs => docs}/user-guide/walkthrough/podtemplate.json (100%) rename {v1.1/docs => docs}/user-guide/walkthrough/replication-controller.yaml (100%) rename {v1.1/docs => docs}/user-guide/walkthrough/service.yaml (100%) rename {v1.1/docs => docs}/user-guide/working-with-resources.md (77%) rename {v1.1/docs => docs}/whatisk8s.md (78%) delete mode 100644 v1.1/docs/admin/admission-controllers.md delete mode 100644 v1.1/docs/admin/cluster-components.md delete mode 100644 v1.1/docs/admin/cluster-large.md delete mode 100644 v1.1/docs/admin/cluster-management.md delete mode 100644 v1.1/docs/admin/index.md delete mode 100644 v1.1/docs/admin/namespaces.md delete mode 100644 v1.1/docs/admin/namespaces/index.md delete mode 100644 v1.1/docs/admin/node.md delete mode 100644 v1.1/docs/admin/service-accounts-admin.md delete mode 100644 v1.1/docs/devel/coding-conventions.md delete mode 100644 v1.1/docs/devel/developer-guides/vagrant.md delete mode 100644 v1.1/docs/devel/faster_reviews.md delete mode 100644 v1.1/docs/devel/index.md delete mode 100644 v1.1/docs/devel/pull-requests.md delete mode 100644 v1.1/docs/devel/releasing.md delete mode 100755 v1.1/docs/devel/scheduler_algorithm.md delete mode 100644 v1.1/docs/getting-started-guides/aws.md delete mode 100644 v1.1/docs/getting-started-guides/azure.md delete mode 100644 v1.1/docs/getting-started-guides/coreos/bare_metal_offline.md delete mode 100644 v1.1/docs/getting-started-guides/coreos/coreos_multinode_cluster.md delete mode 100644 v1.1/docs/getting-started-guides/docker-multinode.md delete mode 100644 v1.1/docs/getting-started-guides/docker-multinode/deployDNS.md delete mode 100644 v1.1/docs/getting-started-guides/docker-multinode/worker.md delete mode 100644 v1.1/docs/getting-started-guides/fedora/fedora_manual_config.md delete mode 100644 v1.1/docs/getting-started-guides/index.md delete mode 100644 v1.1/docs/getting-started-guides/locally.md delete mode 100644 v1.1/docs/getting-started-guides/mesos-docker.md delete mode 100644 v1.1/docs/getting-started-guides/rkt/index.md delete mode 100644 v1.1/docs/getting-started-guides/scratch.md delete mode 100644 v1.1/docs/index.md delete mode 100644 v1.1/docs/user-guide/accessing-the-cluster.md delete mode 100644 v1.1/docs/user-guide/annotations.md delete mode 100644 v1.1/docs/user-guide/config-best-practices.md delete mode 100644 v1.1/docs/user-guide/configuring-containers.md delete mode 100644 v1.1/docs/user-guide/connecting-to-applications-proxy.md delete mode 100644 v1.1/docs/user-guide/container-environment.md delete mode 100644 v1.1/docs/user-guide/deployments.md delete mode 100644 v1.1/docs/user-guide/downward-api/index.md delete mode 100644 v1.1/docs/user-guide/environment-guide/index.md delete mode 100644 v1.1/docs/user-guide/horizontal-pod-autoscaling/index.md delete mode 100644 v1.1/docs/user-guide/index.md delete mode 100644 v1.1/docs/user-guide/kubeconfig-file.md delete mode 100644 v1.1/docs/user-guide/kubectl-overview.md delete mode 100644 v1.1/docs/user-guide/labels.md delete mode 100644 v1.1/docs/user-guide/logging-demo/index.md delete mode 100644 v1.1/docs/user-guide/logging.md delete mode 100644 v1.1/docs/user-guide/namespaces.md delete mode 100644 v1.1/docs/user-guide/overview.md delete mode 100644 v1.1/docs/user-guide/persistent-volumes.md delete mode 100644 v1.1/docs/user-guide/quick-start.md delete mode 100644 v1.1/docs/user-guide/replication-controller.md delete mode 100644 v1.1/docs/user-guide/resourcequota/index.md delete mode 100644 v1.1/docs/user-guide/secrets.md delete mode 100644 v1.1/docs/user-guide/service-accounts.md delete mode 100644 v1.1/docs/user-guide/services.md delete mode 100644 v1.1/docs/user-guide/update-demo/index.md delete mode 100644 v1.1/docs/user-guide/walkthrough/k8s201.md delete mode 100644 v1.1/pagelist.md delete mode 100644 v1.2/docs/admin/accessing-the-api.md delete mode 100644 v1.2/docs/admin/authentication.md delete mode 100644 v1.2/docs/admin/authorization.md delete mode 100644 v1.2/docs/admin/cluster-troubleshooting.md delete mode 100644 v1.2/docs/admin/daemon.yaml delete mode 100644 v1.2/docs/admin/daemons.md delete mode 100644 v1.2/docs/admin/dns.md delete mode 100644 v1.2/docs/admin/etcd.md delete mode 100644 v1.2/docs/admin/garbage-collection.md delete mode 100644 v1.2/docs/admin/high-availability.md delete mode 100644 v1.2/docs/admin/high-availability/default-kubelet delete mode 100644 v1.2/docs/admin/high-availability/etcd.yaml delete mode 100644 v1.2/docs/admin/high-availability/kube-apiserver.yaml delete mode 100644 v1.2/docs/admin/high-availability/kube-controller-manager.yaml delete mode 100644 v1.2/docs/admin/high-availability/kube-scheduler.yaml delete mode 100644 v1.2/docs/admin/high-availability/monit-docker delete mode 100644 v1.2/docs/admin/high-availability/monit-kubelet delete mode 100644 v1.2/docs/admin/high-availability/podmaster.yaml delete mode 100644 v1.2/docs/admin/limitrange/index.md delete mode 100644 v1.2/docs/admin/limitrange/invalid-pod.yaml delete mode 100644 v1.2/docs/admin/limitrange/limits.yaml delete mode 100644 v1.2/docs/admin/limitrange/namespace.yaml delete mode 100644 v1.2/docs/admin/limitrange/valid-pod.yaml delete mode 100644 v1.2/docs/admin/multi-cluster.md delete mode 100644 v1.2/docs/admin/namespaces/namespace-dev.json delete mode 100644 v1.2/docs/admin/namespaces/namespace-prod.json delete mode 100644 v1.2/docs/admin/networking.md delete mode 100644 v1.2/docs/admin/ovs-networking.md delete mode 100755 v1.2/docs/admin/resource-quota.md delete mode 100644 v1.2/docs/admin/resourcequota/index.md delete mode 100755 v1.2/docs/admin/resourcequota/limits.yaml delete mode 100644 v1.2/docs/admin/resourcequota/namespace.yaml delete mode 100644 v1.2/docs/admin/resourcequota/quota.yaml delete mode 100644 v1.2/docs/admin/salt.md delete mode 100644 v1.2/docs/admin/static-pods.md delete mode 100644 v1.2/docs/api.md delete mode 100644 v1.2/docs/devel/api-conventions.md delete mode 100644 v1.2/docs/devel/api_changes.md delete mode 100644 v1.2/docs/devel/automation.md delete mode 100644 v1.2/docs/devel/cherry-picks.md delete mode 100644 v1.2/docs/devel/cli-roadmap.md delete mode 100644 v1.2/docs/devel/client-libraries.md delete mode 100644 v1.2/docs/devel/collab.md delete mode 100644 v1.2/docs/devel/development.md delete mode 100644 v1.2/docs/devel/e2e-tests.md delete mode 100644 v1.2/docs/devel/flaky-tests.md delete mode 100644 v1.2/docs/devel/getting-builds.md delete mode 100644 v1.2/docs/devel/index.md delete mode 100644 v1.2/docs/devel/instrumentation.md delete mode 100644 v1.2/docs/devel/issues.md delete mode 100644 v1.2/docs/devel/kubectl-conventions.md delete mode 100644 v1.2/docs/devel/logging.md delete mode 100644 v1.2/docs/devel/making-release-notes.md delete mode 100644 v1.2/docs/devel/profiling.md delete mode 100755 v1.2/docs/devel/scheduler.md delete mode 100644 v1.2/docs/devel/writing-a-getting-started-guide.md delete mode 100644 v1.2/docs/getting-started-guides/azure.md delete mode 100644 v1.2/docs/getting-started-guides/binary_release.md delete mode 100644 v1.2/docs/getting-started-guides/centos/centos_manual_config.md delete mode 100644 v1.2/docs/getting-started-guides/cloudstack.md delete mode 100644 v1.2/docs/getting-started-guides/coreos.md delete mode 100644 v1.2/docs/getting-started-guides/coreos/azure/.gitignore delete mode 100644 v1.2/docs/getting-started-guides/coreos/azure/addons/skydns-rc.yaml delete mode 100644 v1.2/docs/getting-started-guides/coreos/azure/addons/skydns-svc.yaml delete mode 100755 v1.2/docs/getting-started-guides/coreos/azure/azure-login.js delete mode 100644 v1.2/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-etcd-node-template.yml delete mode 100644 v1.2/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml delete mode 100755 v1.2/docs/getting-started-guides/coreos/azure/create-kubernetes-cluster.js delete mode 100755 v1.2/docs/getting-started-guides/coreos/azure/destroy-cluster.js delete mode 100755 v1.2/docs/getting-started-guides/coreos/azure/expose_guestbook_app_port.sh delete mode 100644 v1.2/docs/getting-started-guides/coreos/azure/index.md delete mode 100644 v1.2/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js delete mode 100644 v1.2/docs/getting-started-guides/coreos/azure/lib/cloud_config.js delete mode 100644 v1.2/docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js delete mode 100644 v1.2/docs/getting-started-guides/coreos/azure/lib/util.js delete mode 100644 v1.2/docs/getting-started-guides/coreos/azure/package.json delete mode 100755 v1.2/docs/getting-started-guides/coreos/azure/scale-kubernetes-cluster.js delete mode 100644 v1.2/docs/getting-started-guides/coreos/bare_metal_calico.md delete mode 100644 v1.2/docs/getting-started-guides/coreos/cloud-configs/master.yaml delete mode 100644 v1.2/docs/getting-started-guides/coreos/cloud-configs/node.yaml delete mode 100644 v1.2/docs/getting-started-guides/dcos.md delete mode 100644 v1.2/docs/getting-started-guides/docker-multinode/master.md delete mode 100755 v1.2/docs/getting-started-guides/docker-multinode/master.sh delete mode 100644 v1.2/docs/getting-started-guides/docker-multinode/skydns-rc.yaml.in delete mode 100644 v1.2/docs/getting-started-guides/docker-multinode/skydns-svc.yaml.in delete mode 100644 v1.2/docs/getting-started-guides/docker-multinode/testing.md delete mode 100755 v1.2/docs/getting-started-guides/docker-multinode/worker.sh delete mode 100644 v1.2/docs/getting-started-guides/docker.md delete mode 100644 v1.2/docs/getting-started-guides/fedora/fedora-calico.md delete mode 100644 v1.2/docs/getting-started-guides/fedora/fedora_ansible_config.md delete mode 100644 v1.2/docs/getting-started-guides/fedora/flannel_multi_node_cluster.md delete mode 100644 v1.2/docs/getting-started-guides/gce.md delete mode 100644 v1.2/docs/getting-started-guides/index.md delete mode 100644 v1.2/docs/getting-started-guides/juju.md delete mode 100644 v1.2/docs/getting-started-guides/libvirt-coreos.md delete mode 100644 v1.2/docs/getting-started-guides/logging-elasticsearch.md delete mode 100644 v1.2/docs/getting-started-guides/logging.md delete mode 100644 v1.2/docs/getting-started-guides/meanstack.md delete mode 100644 v1.2/docs/getting-started-guides/mesos.md delete mode 100644 v1.2/docs/getting-started-guides/ovirt.md delete mode 100644 v1.2/docs/getting-started-guides/rackspace.md delete mode 100644 v1.2/docs/getting-started-guides/ubuntu-calico.md delete mode 100644 v1.2/docs/getting-started-guides/ubuntu.md delete mode 100644 v1.2/docs/getting-started-guides/vagrant.md delete mode 100644 v1.2/docs/getting-started-guides/vsphere.md delete mode 100644 v1.2/docs/index.md delete mode 100644 v1.2/docs/reporting-security-issues.md delete mode 100644 v1.2/docs/roadmap.md delete mode 100644 v1.2/docs/troubleshooting.md delete mode 100644 v1.2/docs/user-guide/application-troubleshooting.md delete mode 100644 v1.2/docs/user-guide/compute-resources.md delete mode 100644 v1.2/docs/user-guide/connecting-applications.md delete mode 100644 v1.2/docs/user-guide/connecting-to-applications-port-forward.md delete mode 100644 v1.2/docs/user-guide/containers.md delete mode 100644 v1.2/docs/user-guide/debugging-services.md delete mode 100644 v1.2/docs/user-guide/deploying-applications.md delete mode 100644 v1.2/docs/user-guide/docker-cli-to-kubectl.md delete mode 100644 v1.2/docs/user-guide/downward-api.md delete mode 100644 v1.2/docs/user-guide/downward-api/dapi-pod.yaml delete mode 100644 v1.2/docs/user-guide/downward-api/volume/dapi-volume.yaml delete mode 100644 v1.2/docs/user-guide/downward-api/volume/index.md delete mode 100644 v1.2/docs/user-guide/environment-guide/backend-rc.yaml delete mode 100644 v1.2/docs/user-guide/environment-guide/backend-srv.yaml delete mode 100644 v1.2/docs/user-guide/environment-guide/containers/backend/Dockerfile delete mode 100644 v1.2/docs/user-guide/environment-guide/containers/backend/backend.go delete mode 100644 v1.2/docs/user-guide/environment-guide/containers/index.md delete mode 100644 v1.2/docs/user-guide/environment-guide/containers/show/Dockerfile delete mode 100644 v1.2/docs/user-guide/environment-guide/containers/show/show.go delete mode 100644 v1.2/docs/user-guide/environment-guide/show-rc.yaml delete mode 100644 v1.2/docs/user-guide/environment-guide/show-srv.yaml delete mode 100644 v1.2/docs/user-guide/getting-into-containers.md delete mode 100644 v1.2/docs/user-guide/horizontal-pod-autoscaler.md delete mode 100644 v1.2/docs/user-guide/horizontal-pod-autoscaling/hpa-php-apache.yaml delete mode 100644 v1.2/docs/user-guide/horizontal-pod-autoscaling/image/Dockerfile delete mode 100755 v1.2/docs/user-guide/horizontal-pod-autoscaling/image/index.php delete mode 100644 v1.2/docs/user-guide/identifiers.md delete mode 100644 v1.2/docs/user-guide/images.md delete mode 100644 v1.2/docs/user-guide/index.md delete mode 100644 v1.2/docs/user-guide/ingress.md delete mode 100644 v1.2/docs/user-guide/ingress.yaml delete mode 100644 v1.2/docs/user-guide/introspection-and-debugging.md delete mode 100644 v1.2/docs/user-guide/job.yaml delete mode 100644 v1.2/docs/user-guide/jobs.md delete mode 100644 v1.2/docs/user-guide/jsonpath.md delete mode 100644 v1.2/docs/user-guide/known-issues.md delete mode 100644 v1.2/docs/user-guide/liveness/exec-liveness.yaml delete mode 100644 v1.2/docs/user-guide/liveness/http-liveness.yaml delete mode 100644 v1.2/docs/user-guide/liveness/image/Dockerfile delete mode 100644 v1.2/docs/user-guide/liveness/image/Makefile delete mode 100644 v1.2/docs/user-guide/liveness/image/server.go delete mode 100644 v1.2/docs/user-guide/liveness/index.md delete mode 100644 v1.2/docs/user-guide/logging-demo/Makefile delete mode 100644 v1.2/docs/user-guide/logging-demo/index.md delete mode 100644 v1.2/docs/user-guide/logging-demo/synthetic_0_25lps.yaml delete mode 100644 v1.2/docs/user-guide/logging-demo/synthetic_10lps.yaml delete mode 100644 v1.2/docs/user-guide/managing-deployments.md delete mode 100644 v1.2/docs/user-guide/monitoring.md delete mode 100644 v1.2/docs/user-guide/multi-pod.yaml delete mode 100644 v1.2/docs/user-guide/new-nginx-deployment.yaml delete mode 100644 v1.2/docs/user-guide/nginx-deployment.yaml delete mode 100644 v1.2/docs/user-guide/node-selection/index.md delete mode 100644 v1.2/docs/user-guide/node-selection/pod.yaml delete mode 100644 v1.2/docs/user-guide/overview.md delete mode 100644 v1.2/docs/user-guide/persistent-volumes/claims/claim-01.yaml delete mode 100644 v1.2/docs/user-guide/persistent-volumes/claims/claim-02.yaml delete mode 100644 v1.2/docs/user-guide/persistent-volumes/claims/claim-03.json delete mode 100644 v1.2/docs/user-guide/persistent-volumes/index.md delete mode 100644 v1.2/docs/user-guide/persistent-volumes/simpletest/namespace.json delete mode 100644 v1.2/docs/user-guide/persistent-volumes/simpletest/pod.yaml delete mode 100644 v1.2/docs/user-guide/persistent-volumes/simpletest/service.json delete mode 100644 v1.2/docs/user-guide/persistent-volumes/volumes/gce.yaml delete mode 100644 v1.2/docs/user-guide/persistent-volumes/volumes/local-01.yaml delete mode 100644 v1.2/docs/user-guide/persistent-volumes/volumes/local-02.yaml delete mode 100644 v1.2/docs/user-guide/persistent-volumes/volumes/nfs.yaml delete mode 100644 v1.2/docs/user-guide/pod-states.md delete mode 100644 v1.2/docs/user-guide/pod.yaml delete mode 100644 v1.2/docs/user-guide/pods.md delete mode 100644 v1.2/docs/user-guide/prereqs.md delete mode 100644 v1.2/docs/user-guide/production-pods.md delete mode 100644 v1.2/docs/user-guide/replication.yaml delete mode 100644 v1.2/docs/user-guide/resourcequota/index.md delete mode 100644 v1.2/docs/user-guide/secrets/index.md delete mode 100644 v1.2/docs/user-guide/secrets/secret-pod.yaml delete mode 100644 v1.2/docs/user-guide/secrets/secret.yaml delete mode 100644 v1.2/docs/user-guide/security-context.md delete mode 100644 v1.2/docs/user-guide/services-firewalls.md delete mode 100644 v1.2/docs/user-guide/sharing-clusters.md delete mode 100644 v1.2/docs/user-guide/simple-nginx.md delete mode 100644 v1.2/docs/user-guide/simple-yaml.md delete mode 100644 v1.2/docs/user-guide/ui.md delete mode 100755 v1.2/docs/user-guide/update-demo/build-images.sh delete mode 100644 v1.2/docs/user-guide/update-demo/images/kitten/Dockerfile delete mode 100644 v1.2/docs/user-guide/update-demo/images/kitten/html/data.json delete mode 100644 v1.2/docs/user-guide/update-demo/images/kitten/html/kitten.jpg delete mode 100644 v1.2/docs/user-guide/update-demo/images/nautilus/Dockerfile delete mode 100644 v1.2/docs/user-guide/update-demo/images/nautilus/html/data.json delete mode 100644 v1.2/docs/user-guide/update-demo/images/nautilus/html/nautilus.jpg delete mode 100644 v1.2/docs/user-guide/update-demo/kitten-rc.yaml delete mode 100644 v1.2/docs/user-guide/update-demo/local/LICENSE.angular delete mode 100644 v1.2/docs/user-guide/update-demo/local/angular.min.js delete mode 100644 v1.2/docs/user-guide/update-demo/local/angular.min.js.map delete mode 100644 v1.2/docs/user-guide/update-demo/local/index.html delete mode 100644 v1.2/docs/user-guide/update-demo/local/script.js delete mode 100644 v1.2/docs/user-guide/update-demo/local/style.css delete mode 100644 v1.2/docs/user-guide/update-demo/nautilus-rc.yaml delete mode 100644 v1.2/docs/user-guide/volumes.md delete mode 100644 v1.2/docs/user-guide/walkthrough/index.md delete mode 100644 v1.2/docs/user-guide/walkthrough/pod-nginx-with-label.yaml delete mode 100644 v1.2/docs/user-guide/walkthrough/pod-nginx.yaml delete mode 100644 v1.2/docs/user-guide/walkthrough/pod-redis.yaml delete mode 100644 v1.2/docs/user-guide/walkthrough/pod-with-http-healthcheck.yaml delete mode 100644 v1.2/docs/user-guide/walkthrough/podtemplate.json delete mode 100644 v1.2/docs/user-guide/walkthrough/replication-controller.yaml delete mode 100644 v1.2/docs/user-guide/walkthrough/service.yaml delete mode 100644 v1.2/docs/user-guide/working-with-resources.md delete mode 100644 v1.2/docs/whatisk8s.md delete mode 100644 v1.2/editdocs.md delete mode 100644 v1.2/index.md delete mode 100644 v1.2/reference.md delete mode 100644 v1.2/samples.md diff --git a/_config.yml b/_config.yml index 4acb94edca..acdccbee88 100644 --- a/_config.yml +++ b/_config.yml @@ -14,20 +14,10 @@ lsi: false defaults: - scope: - path: "v1.1" + path: "docs" values: version: "v1.1" - versionfilesafe: "v1_1" layout: docwithnav showedit: true githubbranch: "release-1.1" - - - scope: - path: "v1.2" - values: - version: "v1.2" - versionfilesafe: "v1_2" - layout: docwithnav - showedit: true - githubbranch: "release-1.2" permalink: pretty diff --git a/_data/v1_1/globals.yml b/_data/globals.yml similarity index 100% rename from _data/v1_1/globals.yml rename to _data/globals.yml diff --git a/_data/v1_1/guides.yml b/_data/guides.yml similarity index 54% rename from _data/v1_1/guides.yml rename to _data/guides.yml index 8409e4e615..08c3470553 100644 --- a/_data/v1_1/guides.yml +++ b/_data/guides.yml @@ -2,178 +2,178 @@ bigheader: "Guides" abstract: "How to get started, and acheive tasks, using Kubernetes" toc: - title: Guides - path: /v1.1/ + path: /docs/ - title: Quickstarts section: - title: What is Kubernetes? - path: /v1.1/docs/whatisk8s/ + path: /docs/whatisk8s/ - title: TODO - 5-minute Quickstart - path: /v1.1/docs/hellonode/ + path: /docs/hellonode/ - title: Kubernetes 101 - path: /v1.1/docs/user-guide/walkthrough/ + path: /docs/user-guide/walkthrough/ - title: Kubernetes 201 - path: /v1.1/docs/user-guide/walkthrough/k8s201/ + path: /docs/user-guide/walkthrough/k8s201/ - title: Running Kubernetes section: - title: Picking the Right Solution - path: /v1.1/docs/getting-started-guides/ + path: /docs/getting-started-guides/ - title: Running Kubernetes on Your Local Machine section: - title: Running Kubernetes Locally via Docker - path: /v1.1/docs/getting-started-guides/docker/ + path: /docs/getting-started-guides/docker/ - title: Running Kubernetes Locally via Vagrant - path: /v1.1/docs/getting-started-guides/vagrant/ + path: /docs/getting-started-guides/vagrant/ - title: Running Kubernetes Locally with No VM - path: /v1.1/docs/getting-started-guides/locally/ + path: /docs/getting-started-guides/locally/ - title: Running Kubernetes on Turn-key Cloud Solutions section: - title: Running Kubernetes on Google Container Engine path: https://cloud.google.com/container-engine/docs/before-you-begin/ - title: Running Kubernetes on Google Compute Engine - path: /v1.1/docs/getting-started-guides/gce/ + path: /docs/getting-started-guides/gce/ - title: Running Kubernetes on AWS EC2 - path: /v1.1/docs/getting-started-guides/aws/ + path: /docs/getting-started-guides/aws/ - title: Running Kubernetes on Azure - path: /v1.1/docs/getting-started-guides/coreos/azure/ + path: /docs/getting-started-guides/coreos/azure/ - title: Running Kubernetes on Custom Solutions section: - title: Getting Started From Scratch - path: /v1.1/docs/getting-started-guides/scratch/ + path: /docs/getting-started-guides/scratch/ - title: Custom Cloud Solutions section: - title: AWS or GCE on CoreOS - path: /v1.1/docs/getting-started-guides/coreos/ + path: /docs/getting-started-guides/coreos/ - title: AWS or Joyent on Ubuntu - path: /v1.1/docs/getting-started-guides/juju/ + path: /docs/getting-started-guides/juju/ - title: Rackspace on CoreOS - path: /v1.1/docs/getting-started-guides/rackspace/ + path: /docs/getting-started-guides/rackspace/ - title: On-Premise VMs section: - title: Vagrant or VMware - path: /v1.1/docs/getting-started-guides/coreos/ + path: /docs/getting-started-guides/coreos/ - title: Cloudstack - path: /v1.1/docs/getting-started-guides/cloudstack/ + path: /docs/getting-started-guides/cloudstack/ - title: VMWare - path: /v1.1/docs/getting-started-guides/vsphere/ + path: /docs/getting-started-guides/vsphere/ - title: Juju - path: /v1.1/docs/getting-started-guides/juju/ + path: /docs/getting-started-guides/juju/ - title: libvirt on CoreOS - path: /v1.1/docs/getting-started-guides/libvirt-coreos/ + path: /docs/getting-started-guides/libvirt-coreos/ - title: oVirt - path: /v1.1/docs/getting-started-guides/ovirt/ + path: /docs/getting-started-guides/ovirt/ - title: libvirt or KVM - path: /v1.1/docs/getting-started-guides/fedora/flannel_multi_node_cluster/ + path: /docs/getting-started-guides/fedora/flannel_multi_node_cluster/ - title: Bare Metal section: - title: Offline - path: /v1.1/docs/getting-started-guides/coreos/bare_metal_offline/ + path: /docs/getting-started-guides/coreos/bare_metal_offline/ - title: Fedora via Ansible - path: /v1.1/docs/getting-started-guides/fedora/fedora_ansible_config/ + path: /docs/getting-started-guides/fedora/fedora_ansible_config/ - title: Fedora (Single Node) - path: /v1.1/docs/getting-started-guides/fedora/fedora_manual_config/ + path: /docs/getting-started-guides/fedora/fedora_manual_config/ - title: Fedora (Multi Node) - path: /v1.1/docs/getting-started-guides/fedora/flannel_multi_node_cluster/ + path: /docs/getting-started-guides/fedora/flannel_multi_node_cluster/ - title: Centos - path: /v1.1/docs/getting-started-guides/centos/centos_manual_config/ + path: /docs/getting-started-guides/centos/centos_manual_config/ - title: Ubuntu - path: /v1.1/docs/getting-started-guides/ubuntu/ + path: /docs/getting-started-guides/ubuntu/ - title: Docker (Multi Node) - path: /v1.1/docs/getting-started-guides/docker-multinode/ + path: /docs/getting-started-guides/docker-multinode/ - title: Administering Clusters section: - title: Kubernetes Cluster Admin Guide - path: /v1.1/docs/admin/ + path: /docs/admin/ - title: Using Multiple Clusters - path: /v1.1/docs/admin/multi-cluster/ + path: /docs/admin/multi-cluster/ - title: Using Large Clusters - path: /v1.1/docs/admin/cluster-large/ + path: /docs/admin/cluster-large/ - title: Building High-Availability Clusters - path: /v1.1/docs/admin/high-availability/ + path: /docs/admin/high-availability/ - title: Accessing Clusters - path: /v1.1/docs/user-guide/accessing-the-cluster/ + path: /docs/user-guide/accessing-the-cluster/ - title: Sharing a Cluster - path: /v1.1/docs/admin/namespaces/ + path: /docs/admin/namespaces/ - title: Changing Cluster Size path: https://github.com/kubernetes/kubernetes/wiki/User-FAQ#how-do-i-change-the-size-of-my-cluster/ - title: Creating a Custom Cluster from Scratch - path: /v1.1/docs/getting-started-guides/scratch/ + path: /docs/getting-started-guides/scratch/ - title: Authenticating Across Clusters with kubeconfig - path: /v1.1/docs/user-guide/kubeconfig-file/ + path: /docs/user-guide/kubeconfig-file/ - title: Using Nodes, Pods, and Containers section: - title: Assigning Pods to Nodes - path: /v1.1/docs/user-guide/node-selection/ + path: /docs/user-guide/node-selection/ - title: Working with Containers - path: /v1.1/docs/user-guide/production-pods/ + path: /docs/user-guide/production-pods/ - title: Creating Pods with the Downward API - path: /v1.1/docs/user-guide/downward-api/ + path: /docs/user-guide/downward-api/ - title: Updating Live Pods - path: /v1.1/docs/user-guide/update-demo/ + path: /docs/user-guide/update-demo/ - title: Running Commands in a Container with kubectl exec - path: /v1.1/docs/user-guide/getting-into-containers/ + path: /docs/user-guide/getting-into-containers/ - title: Networking section: - title: Networking in Kubernetes - path: /v1.1/docs/admin/networking/ + path: /docs/admin/networking/ - title: Setting Up and Configuring DNS path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/cluster-dns - title: Connecting Applications - path: /v1.1/docs/user-guide/connecting-applications/ + path: /docs/user-guide/connecting-applications/ - title: Creating Servers with External IPs path: https://github.com/kubernetes/kubernetes/blob/release-1.1/examples/simple-nginx.md - title: Using DNS Pods and Services - path: /v1.1/docs/admin/dns/ + path: /docs/admin/dns/ - title: Connect with Proxies - path: /v1.1/docs/user-guide/connecting-to-applications-proxy/ + path: /docs/user-guide/connecting-to-applications-proxy/ - title: Connect with Port Forwarding - path: /v1.1/docs/user-guide/connecting-to-applications-port-forward/ + path: /docs/user-guide/connecting-to-applications-port-forward/ - title: Configuring Kubernetes section: - title: Using Configuration Files - path: /v1.1/docs/user-guide/simple-yaml/ + path: /docs/user-guide/simple-yaml/ - title: Configuring Containers - path: /v1.1/docs/user-guide/configuring-containers/ + path: /docs/user-guide/configuring-containers/ - title: Using Environment Variables - path: /v1.1/docs/user-guide/environment-guide/ + path: /docs/user-guide/environment-guide/ - title: Managing Compute Resources - path: /v1.1/docs/user-guide/compute-resources/ + path: /docs/user-guide/compute-resources/ - title: Applying Resource Quotas and Limits - path: /v1.1/docs/admin/resourcequota/ + path: /docs/admin/resourcequota/ - title: Setting Pod CPU and Memory Limits - path: /v1.1/docs/admin/limitrange/ + path: /docs/admin/limitrange/ - title: Configuring Garbage Collection - path: /v1.1/docs/admin/garbage-collection/ + path: /docs/admin/garbage-collection/ - title: Configuring Kubernetes with Salt - path: /v1.1/docs/admin/salt/ + path: /docs/admin/salt/ - title: Best Practices for Configuration - path: /v1.1/docs/user-guide/config-best-practices/ + path: /docs/user-guide/config-best-practices/ - title: Application Management and Deployment section: - title: "Managing Applications: Prerequisites" - path: /v1.1/docs/user-guide/prereqs/ + path: /docs/user-guide/prereqs/ - title: Managing Deployments - path: /v1.1/docs/user-guide/managing-deployments/ + path: /docs/user-guide/managing-deployments/ - title: Deploying Applications - path: /v1.1/docs/user-guide/deploying-applications/ + path: /docs/user-guide/deploying-applications/ - title: Launching, Exposing, and Killing Applications - path: /v1.1/docs/user-guide/quick-start/ + path: /docs/user-guide/quick-start/ - title: Testing and Monitoring section: - title: Simulating Large Test Loads path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/k8petstore - title: Checking Pod Health - path: /v1.1/docs/user-guide/liveness/ + path: /docs/user-guide/liveness/ - title: Using Explorer to Examine the Runtime Environment path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/explorer - title: Resource Usage Monitoring - path: /v1.1/docs/user-guide/monitoring/ + path: /docs/user-guide/monitoring/ - title: Logging - path: /v1.1/docs/user-guide/logging/ + path: /docs/user-guide/logging/ diff --git a/_data/overrides.yml b/_data/overrides.yml index a6de4e8739..cbb44bd518 100644 --- a/_data/overrides.yml +++ b/_data/overrides.yml @@ -1,15 +1,8 @@ overrides: -- path: v1.1/docs/api-reference -- path: v1.1/docs/user-guide/kubectl -- path: v1.1/docs/admin/kube-apiserver.md -- path: v1.1/docs/admin/kube-controller-manager.md -- path: v1.1/docs/admin/kube-proxy.md -- path: v1.1/docs/admin/kube-scheduler.md -- path: v1.1/docs/admin/kubelet.md -- path: v1.2/docs/api-reference -- path: v1.2/docs/user-guide/kubectl -- path: v1.2/docs/admin/kube-apiserver.md -- path: v1.2/docs/admin/kube-controller-manager.md -- path: v1.2/docs/admin/kube-proxy.md -- path: v1.2/docs/admin/kube-scheduler.md -- path: v1.2/docs/admin/kubelet.md \ No newline at end of file +- path: docs/api-reference +- path: docs/user-guide/kubectl +- path: docs/admin/kube-apiserver.md +- path: docs/admin/kube-controller-manager.md +- path: docs/admin/kube-proxy.md +- path: docs/admin/kube-scheduler.md +- path: docs/admin/kubelet.md \ No newline at end of file diff --git a/_data/reference.yml b/_data/reference.yml new file mode 100644 index 0000000000..0516f033a9 --- /dev/null +++ b/_data/reference.yml @@ -0,0 +1,184 @@ +bigheader: "Reference Documentation" +abstract: "Design docs, concept definitions, and references for APIs and CLIs." +toc: +- title: Reference Documentation + path: /docs/reference/ + +- title: Kubernetes API + section: + - title: Kubernetes API Overview + path: /docs/api/ + - title: Kubernetes API Operations + path: /docs/api-reference/v1/operations/ + - title: Kubernetes API Definitions + path: /docs/api-reference/v1/definitions/ + +- title: Extensions API + section: + - title: Extensions API Operations + path: /docs/api-reference/extensions/v1beta1/operations/ + - title: Extensions API Definitions + path: /docs/api-reference/extensions/v1beta1/definitions/ + +- title: kubectl + section: + - title: kubectl Overview + path: /docs/user-guide/kubectl-overview/ + - title: kubectl for Docker Users + path: /docs/user-guide/docker-cli-to-kubectl/ + - title: kubectl Commands + section: + - title: kubectl + path: /docs/user-guide/kubectl/kubectl/ + - title: kubectl annotate + path: /docs/user-guide/kubectl/kubectl_annotate/ + - title: kubectl api-versions + path: /docs/user-guide/kubectl/kubectl_api-versions/ + - title: kubectl apply + path: /docs/user-guide/kubectl/kubectl_apply/ + - title: kubectl attach + path: /docs/user-guide/kubectl/kubectl_attach/ + - title: kubectl autoscale + path: /docs/user-guide/kubectl/kubectl_autoscale/ + - title: kubectl cluster-info + path: /docs/user-guide/kubectl/kubectl_cluster-info/ + - title: kubectl config + path: /docs/user-guide/kubectl/kubectl_config/ + - title: kubectl config set-cluster + path: /docs/user-guide/kubectl/kubectl_config_set-cluster/ + - title: kubectl config set-context + path: /docs/user-guide/kubectl/kubectl_config_set-context/ + - title: kubectl set-credentials + path: /docs/user-guide/kubectl/kubectl_config_set-credentials/ + - title: kubectl config set + path: /docs/user-guide/kubectl/kubectl_config_set/ + - title: kubectl config unset + path: /docs/user-guide/kubectl/kubectl_config_unset/ + - title: kubectl config use-context + path: /docs/user-guide/kubectl/kubectl_config_use-context/ + - title: kubectl config view + path: /docs/user-guide/kubectl/kubectl_config_view/ + - title: kubectl create + path: /docs/user-guide/kubectl/kubectl_create/ + - title: kubectl delete + path: /docs/user-guide/kubectl/kubectl_delete/ + - title: kubectl describe + path: /docs/user-guide/kubectl/kubectl_describe/ + - title: kubectl edit + path: /docs/user-guide/kubectl/kubectl_edit/ + - title: kubectl exec + path: /docs/user-guide/kubectl/kubectl_exec/ + - title: kubectl expose + path: /docs/user-guide/kubectl/kubectl_expose/ + - title: kubectl get + path: /docs/user-guide/kubectl/kubectl_get/ + - title: kubectl label + path: /docs/user-guide/kubectl/kubectl_label/ + - title: kubectl logs + path: /docs/user-guide/kubectl/kubectl_logs/ + - title: kubectl patch + path: /docs/user-guide/kubectl/kubectl_patch/ + - title: kubectl port-forward + path: /docs/user-guide/kubectl/kubectl_port-forward/ + - title: kubectl proxy + path: /docs/user-guide/kubectl/kubectl_proxy/ + - title: kubectl replace + path: /docs/user-guide/kubectl/kubectl_replace/ + - title: kubectl rolling-update + path: /docs/user-guide/kubectl/kubectl_rolling-update/ + - title: kubectl run + path: /docs/user-guide/kubectl/kubectl_run/ + - title: kubectl scale + path: /docs/user-guide/kubectl/kubectl_scale/ + - title: kubectl stop + path: /docs/user-guide/kubectl/kubectl_stop/ + - title: kubectl version + path: /docs/user-guide/kubectl/kubectl_version/ + +- title: kube-apiserver + section: + - title: Overview + path: /docs/admin/kube-apiserver/ + - title: Authorization Plugins + path: /docs/admin/authorization/ + - title: Authentication + path: /docs/admin/authentication/ + - title: Accessing the API + path: /docs/admin/accessing-the-api/ + - title: Admission Controllers + path: /docs/admin/admission-controllers/ + - title: Managing Service Accounts + path: /docs/admin/service-accounts-admin/ + +- title: kub-scheduler + path: /docs/admin/kube-scheduler/ + +- title: kubelet + path: /docs/admin/kubelet.md + +- title: kube-proxy + path: /docs/admin/kube-proxy/ + +- title: JSONpath + path: /docs/user-guide/jsonpath/ + +- title: etcd + path: /docs/admin/etcd/ + +- title: Concept Definitions + section: + - title: Container Environment + path: /docs/user-guide/container-environment/ + - title: Images + path: /docs/user-guide/images/ + - title: Pods + path: /docs/user-guide/pods/ + - title: Labels and Selectors + path: /docs/user-guide/labels/ + - title: Replication Controller + path: /docs/user-guide/replication-controller/ + - title: Services + path: /docs/user-guide/services/ + - title: Volumes + path: /docs/user-guide/volumes/ + - title: Persistent Volumes + path: /docs/user-guide/persistent-volumes/ + - title: Secrets + path: /docs/user-guide/secrets/ + - title: Names + path: /docs/user-guide/identifiers/ + - title: Namespaces + path: /docs/user-guide/namespaces/ + - title: Nodes + path: /docs/admin/node/ + - title: Service Accounts + path: /docs/user-guide/service-accounts/ + - title: Annotations + path: /docs/user-guide/annotations/ + - title: Daemon Sets + path: /docs/admin/daemons/ + - title: Deployments + path: /docs/user-guide/deployments/ + - title: Ingress Resources + path: /docs/user-guide/ingress/ + - title: Horizontal Pod Autoscaling + path: /docs/user-guide/horizontal-pod-autoscaler/ + - title: Jobs + path: /docs/user-guide/jobs/ + - title: Resource Quotas + path: /docs/admin/resource-quota/ + +- title: Kubernetes Design Docs + section: + - title: Kubernetes Architecture + path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/architecture.md + - title: Kubernetes Design Overview + path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/ + - title: Security in Kubernetes + path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/security.md + - title: Kubernetes Identity and Access Management + path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/access.md + - title: Security Contexts + path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/security_context.md + - title: Kubernetes OpenVSwitch GRE/VxLAN networking + path: /docs/admin/ovs-networking/ \ No newline at end of file diff --git a/_data/v1_2/samples.yml b/_data/samples.yml similarity index 97% rename from _data/v1_2/samples.yml rename to _data/samples.yml index 3ae4cf2f37..632d4039e4 100644 --- a/_data/v1_2/samples.yml +++ b/_data/samples.yml @@ -2,7 +2,7 @@ bigheader: "Samples" abstract: "A collection of example applications that show how to use Kubernetes." toc: - title: Samples - path: /v1.2/samples/ + path: /docs/samples/ - title: Clustered Application Samples section: @@ -31,7 +31,7 @@ toc: - title: Ceph path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/rbd/ - title: MEAN stack on Google Cloud Platform - path: /v1.2/docs/getting-started-guides/meanstack/ + path: /docs/getting-started-guides/meanstack/ - title: Persistent Volume Samples section: diff --git a/_data/v1_1/support.yml b/_data/support.yml similarity index 73% rename from _data/v1_1/support.yml rename to _data/support.yml index 18445ec996..84bdc593f3 100644 --- a/_data/v1_1/support.yml +++ b/_data/support.yml @@ -2,16 +2,16 @@ bigheader: "Support" abstract: "Troubleshooting resources, frequently asked questions, and community support channels." toc: - title: Support - path: /v1.1/docs/troubleshooting/ + path: /docs/troubleshooting/ - title: Troubleshooting section: - title: Web Interface - path: /v1.1/docs/user-guide/ui/ + path: /docs/user-guide/ui/ - title: Troubleshooting Applications - path: /v1.1/docs/user-guide/application-troubleshooting/ + path: /docs/user-guide/application-troubleshooting/ - title: Troubleshooting Clusters - path: /v1.1/docs/admin/cluster-troubleshooting/ + path: /docs/admin/cluster-troubleshooting/ - title: Frequently Asked Questions section: @@ -25,16 +25,16 @@ toc: - title: Other Resources section: - title: Known Issues - path: /v1.1/docs/user-guide/known-issues/ + path: /docs/user-guide/known-issues/ - title: Kubernetes Issue Tracker on GitHub path: https://github.com/kubernetes/kubernetes/issues/ - title: Report a Security Vulnerability - path: /v1.1/docs/reporting-security-issues/ + path: /docs/reporting-security-issues/ - title: Release Notes path: https://github.com/kubernetes/kubernetes/releases/ - title: Release Roadmap - path: /v1.1/docs/roadmap/ + path: /docs/roadmap/ - title: Contributing to Kubernetes Documentation - path: /v1.1/editdocs/ + path: /docs/editdocs/ - title: Sitemap for v1.1 - path: /v1.1/pagelist/ + path: /docs/pagelist/ diff --git a/_data/v1_1/reference.yml b/_data/v1_1/reference.yml deleted file mode 100644 index d98defda46..0000000000 --- a/_data/v1_1/reference.yml +++ /dev/null @@ -1,184 +0,0 @@ -bigheader: "Reference Documentation" -abstract: "Design docs, concept definitions, and references for APIs and CLIs." -toc: -- title: Reference Documentation - path: /v1.1/reference/ - -- title: Kubernetes API - section: - - title: Kubernetes API Overview - path: /v1.1/docs/api/ - - title: Kubernetes API Operations - path: http://kubernetes.io/v1.1/docs/api-reference/v1/operations.html - - title: Kubernetes API Definitions - path: http://kubernetes.io/v1.1/docs/api-reference/v1/definitions.html - -- title: Extensions API - section: - - title: Extensions API Operations - path: http://kubernetes.io/v1.1/docs/api-reference/extensions/v1beta1/operations.html - - title: Extensions API Definitions - path: http://kubernetes.io/v1.1/docs/api-reference/extensions/v1beta1/definitions.html - -- title: kubectl - section: - - title: kubectl Overview - path: /v1.1/docs/user-guide/kubectl-overview/ - - title: kubectl for Docker Users - path: /v1.1/docs/user-guide/docker-cli-to-kubectl/ - - title: kubectl Commands - section: - - title: kubectl - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl.md - - title: kubectl annotate - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_annotate.md - - title: kubectl api-versions - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_api-versions.md - - title: kubectl apply - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_apply.md - - title: kubectl attach - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_attach.md - - title: kubectl autoscale - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_autoscale.md - - title: kubectl cluster-info - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_cluster-info.md - - title: kubectl config - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_config.md - - title: kubectl config set-cluster - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_config_set-cluster.md - - title: kubectl config set-context - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_config_set-context.md - - title: kubectl set-credentials - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_config_set-credentials.md - - title: kubectl config set - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_config_set.md - - title: kubectl config unset - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_config_unset.md - - title: kubectl config use-context - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_config_use-context.md - - title: kubectl config view - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_config_view.md - - title: kubectl create - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_create.md - - title: kubectl delete - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_delete.md - - title: kubectl describe - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_describe.md - - title: kubectl edit - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_edit.md - - title: kubectl exec - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_exec.md - - title: kubectl expose - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_expose.md - - title: kubectl get - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_get.md - - title: kubectl label - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_label.md - - title: kubectl logs - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_logs.md - - title: kubectl patch - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_patch.md - - title: kubectl port-forward - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_port-forward.md - - title: kubectl proxy - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_proxy.md - - title: kubectl replace - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_replace.md - - title: kubectl rolling-update - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_rolling-update.md - - title: kubectl run - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_run.md - - title: kubectl scale - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_scale.md - - title: kubectl stop - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_stop.md - - title: kubectl version - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_version.md - -- title: kube-apiserver - section: - - title: Overview - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/admin/kube-apiserver.md - - title: Authorization Plugins - path: /v1.1/docs/admin/authorization/ - - title: Authentication - path: /v1.1/docs/admin/authentication/ - - title: Accessing the API - path: /v1.1/docs/admin/accessing-the-api/ - - title: Admission Controllers - path: /v1.1/docs/admin/admission-controllers/ - - title: Managing Service Accounts - path: /v1.1/docs/admin/service-accounts-admin/ - -- title: kub-scheduler - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/admin/kube-scheduler.md - -- title: kubelet - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/admin/kubelet.md - -- title: kube-proxy - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/admin/kube-proxy.md - -- title: JSONpath - path: /v1.1/docs/user-guide/jsonpath/ - -- title: etcd - path: /v1.1/docs/admin/etcd/ - -- title: Concept Definitions - section: - - title: Container Environment - path: /v1.1/docs/user-guide/container-environment/ - - title: Images - path: /v1.1/docs/user-guide/images/ - - title: Pods - path: /v1.1/docs/user-guide/pods/ - - title: Labels and Selectors - path: /v1.1/docs/user-guide/labels/ - - title: Replication Controller - path: /v1.1/docs/user-guide/replication-controller/ - - title: Services - path: /v1.1/docs/user-guide/services/ - - title: Volumes - path: /v1.1/docs/user-guide/volumes/ - - title: Persistent Volumes - path: /v1.1/docs/user-guide/persistent-volumes/ - - title: Secrets - path: /v1.1/docs/user-guide/secrets/ - - title: Names - path: /v1.1/docs/user-guide/identifiers/ - - title: Namespaces - path: /v1.1/docs/user-guide/namespaces/ - - title: Nodes - path: /v1.1/docs/admin/node/ - - title: Service Accounts - path: /v1.1/docs/user-guide/service-accounts/ - - title: Annotations - path: /v1.1/docs/user-guide/annotations/ - - title: Daemon Sets - path: /v1.1/docs/admin/daemons/ - - title: Deployments - path: /v1.1/docs/user-guide/deployments/ - - title: Ingress Resources - path: /v1.1/docs/user-guide/ingress/ - - title: Horizontal Pod Autoscaling - path: /v1.1/docs/user-guide/horizontal-pod-autoscaler/ - - title: Jobs - path: /v1.1/docs/user-guide/jobs/ - - title: Resource Quotas - path: /v1.1/docs/admin/resource-quota/ - -- title: Kubernetes Design Docs - section: - - title: Kubernetes Architecture - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/architecture.md - - title: Kubernetes Design Overview - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/ - - title: Security in Kubernetes - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/security.md - - title: Kubernetes Identity and Access Management - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/access.md - - title: Security Contexts - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/security_context.md - - title: Kubernetes OpenVSwitch GRE/VxLAN networking - path: /v1.1/docs/admin/ovs-networking/ \ No newline at end of file diff --git a/_data/v1_1/samples.yml b/_data/v1_1/samples.yml deleted file mode 100644 index fb7240d0ef..0000000000 --- a/_data/v1_1/samples.yml +++ /dev/null @@ -1,54 +0,0 @@ -bigheader: "Samples" -abstract: "A collection of example applications that show how to use Kubernetes." -toc: -- title: Samples - path: /v1.1/samples/ - -- title: Clustered Application Samples - section: - - title: Apache Cassandra Database - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/cassandra - - title: Apache Spark - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/spark - - title: Apache Storm - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/storm - - title: Distributed Task Queue - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/celery-rabbitmq - - title: Hazelcast - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/hazelcast - - title: Meteor Applications - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/meteor/ - - title: Redis - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/redis/ - - title: RethinkDB - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/rethinkdb/ - - title: Elasticsearch/Kibana Logging Demonstration - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/logging-demo/ - - title: Elasticsearch - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/elasticsearch/ - - title: OpenShift Origin - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/openshift-origin/ - - title: Ceph - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/rbd/ - - title: MEAN stack on Google Cloud Platform - path: /v1.1/docs/getting-started-guides/meanstack/ - -- title: Persistent Volume Samples - section: - - title: WordPress on a Kubernetes Persistent Volume - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/mysql-wordpress-pd/ - - title: GlusterFS - path: /https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/glusterfs/ - - title: iSCSI - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/iscsi/ - - title: NFS - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/nfs/ - -- title: Multi-tier Application Samples - section: - - title: Guestbook - Go Server - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/guestbook-go/ - - title: GuestBook - PHP Server - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/guestbook/ - - title: MySQL - Phabricator Server - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/phabricator/ diff --git a/_data/v1_2/globals.yml b/_data/v1_2/globals.yml deleted file mode 100644 index fd3be92a16..0000000000 --- a/_data/v1_2/globals.yml +++ /dev/null @@ -1,5 +0,0 @@ -tocs: -- guides -- reference -- samples -- support \ No newline at end of file diff --git a/_data/v1_2/guides.yml b/_data/v1_2/guides.yml deleted file mode 100644 index b36d4a5101..0000000000 --- a/_data/v1_2/guides.yml +++ /dev/null @@ -1,179 +0,0 @@ -bigheader: "Guides" -abstract: "How to get started, and acheive tasks, using Kubernetes" -toc: -- title: Guides - path: /v1.2/ - -- title: Quickstarts - section: - - title: What is Kubernetes? - path: /v1.2/docs/whatisk8s/ - - title: TODO - 5-minute Quickstart - path: /v1.2/docs/hellonode/ - - title: Kubernetes 101 - path: /v1.2/docs/user-guide/walkthrough/ - - title: Kubernetes 201 - path: /v1.2/docs/user-guide/walkthrough/k8s201/ - -- title: Running Kubernetes - section: - - title: Picking the Right Solution - path: /v1.2/docs/getting-started-guides/ - - title: Running Kubernetes on Your Local Machine - section: - - title: Running Kubernetes Locally via Docker - path: /v1.2/docs/getting-started-guides/docker/ - - title: Running Kubernetes Locally via Vagrant - path: /v1.2/docs/getting-started-guides/vagrant/ - - title: Running Kubernetes Locally with No VM - path: /v1.2/docs/getting-started-guides/locally/ - - title: Running Kubernetes on Turn-key Cloud Solutions - section: - - title: Running Kubernetes on Google Container Engine - path: https://cloud.google.com/container-engine/docs/before-you-begin/ - - title: Running Kubernetes on Google Compute Engine - path: /v1.2/docs/getting-started-guides/gce/ - - title: Running Kubernetes on AWS EC2 - path: /v1.2/docs/getting-started-guides/aws/ - - title: Running Kubernetes on Azure - path: /v1.2/docs/getting-started-guides/coreos/azure/ - - title: Running Kubernetes on Custom Solutions - section: - - title: Getting Started From Scratch - path: /v1.2/docs/getting-started-guides/scratch/ - - title: Custom Cloud Solutions - section: - - title: AWS or GCE on CoreOS - path: /v1.2/docs/getting-started-guides/coreos/ - - title: AWS or Joyent on Ubuntu - path: /v1.2/docs/getting-started-guides/juju/ - - title: Rackspace on CoreOS - path: /v1.2/docs/getting-started-guides/rackspace/ - - title: On-Premise VMs - section: - - title: Vagrant or VMware - path: /v1.2/docs/getting-started-guides/coreos/ - - title: Cloudstack - path: /v1.2/docs/getting-started-guides/cloudstack/ - - title: VMWare - path: /v1.2/docs/getting-started-guides/vsphere/ - - title: Juju - path: /v1.2/docs/getting-started-guides/juju/ - - title: libvirt on CoreOS - path: /v1.2/docs/getting-started-guides/libvirt-coreos/ - - title: oVirt - path: /v1.2/docs/getting-started-guides/ovirt/ - - title: libvirt or KVM - path: /v1.2/docs/getting-started-guides/fedora/flannel_multi_node_cluster/ - - title: Bare Metal - section: - - title: Offline - path: /v1.2/docs/getting-started-guides/coreos/bare_metal_offline/ - - title: Fedora via Ansible - path: /v1.2/docs/getting-started-guides/fedora/fedora_ansible_config/ - - title: Fedora (Single Node) - path: /v1.2/docs/getting-started-guides/fedora/fedora_manual_config/ - - title: Fedora (Multi Node) - path: /v1.2/docs/getting-started-guides/fedora/flannel_multi_node_cluster/ - - title: Centos - path: /v1.2/docs/getting-started-guides/centos/centos_manual_config/ - - title: Ubuntu - path: /v1.2/docs/getting-started-guides/ubuntu/ - - title: Docker (Multi Node) - path: /v1.2/docs/getting-started-guides/docker-multinode/ - -- title: Administering Clusters - section: - - title: Kubernetes Cluster Admin Guide - path: /v1.2/docs/admin/ - - title: Using Multiple Clusters - path: /v1.2/docs/admin/multi-cluster/ - - title: Using Large Clusters - path: /v1.2/docs/admin/cluster-large/ - - title: Building High-Availability Clusters - path: /v1.2/docs/admin/high-availability/ - - title: Accessing Clusters - path: /v1.2/docs/user-guide/accessing-the-cluster/ - - title: Sharing a Cluster - path: /v1.2/docs/admin/namespaces/ - - title: Changing Cluster Size - path: https://github.com/kubernetes/kubernetes/wiki/User-FAQ#how-do-i-change-the-size-of-my-cluster/ - - title: Creating a Custom Cluster from Scratch - path: /v1.2/docs/getting-started-guides/scratch/ - - title: Authenticating Across Clusters with kubeconfig - path: /v1.2/docs/user-guide/kubeconfig-file/ - -- title: Using Nodes, Pods, and Containers - section: - - title: Assigning Pods to Nodes - path: /v1.2/docs/user-guide/node-selection/ - - title: Working with Containers - path: /v1.2/docs/user-guide/production-pods/ - - title: Creating Pods with the Downward API - path: /v1.2/docs/user-guide/downward-api/ - - title: Updating Live Pods - path: /v1.2/docs/user-guide/update-demo/ - - title: Running Commands in a Container with kubectl exec - path: /v1.2/docs/user-guide/getting-into-containers/ - -- title: Networking - section: - - title: Networking in Kubernetes - path: /v1.2/docs/admin/networking/ - - title: Setting Up and Configuring DNS - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/cluster-dns - - title: Connecting Applications - path: /v1.2/docs/user-guide/connecting-applications/ - - title: Creating Servers with External IPs - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/examples/simple-nginx.md - - title: Using DNS Pods and Services - path: /v1.2/docs/admin/dns/ - - title: Connect with Proxies - path: /v1.2/docs/user-guide/connecting-to-applications-proxy/ - - title: Connect with Port Forwarding - path: /v1.2/docs/user-guide/connecting-to-applications-port-forward/ - -- title: Configuring Kubernetes - section: - - title: Using Configuration Files - path: /v1.2/docs/user-guide/simple-yaml/ - - title: Configuring Containers - path: /v1.2/docs/user-guide/configuring-containers/ - - title: Using Environment Variables - path: /v1.2/docs/user-guide/environment-guide/ - - title: Managing Compute Resources - path: /v1.2/docs/user-guide/compute-resources/ - - title: Applying Resource Quotas and Limits - path: /v1.2/docs/admin/resourcequota/ - - title: Setting Pod CPU and Memory Limits - path: /v1.2/docs/admin/limitrange/ - - title: Configuring Garbage Collection - path: /v1.2/docs/admin/garbage-collection/ - - title: Configuring Kubernetes with Salt - path: /v1.2/docs/admin/salt/ - - title: Best Practices for Configuration - path: /v1.2/docs/user-guide/config-best-practices/ - -- title: Application Management and Deployment - section: - - title: "Managing Applications: Prerequisites" - path: /v1.2/docs/user-guide/prereqs/ - - title: Managing Deployments - path: /v1.2/docs/user-guide/managing-deployments/ - - title: Deploying Applications - path: /v1.2/docs/user-guide/deploying-applications/ - - title: Launching, Exposing, and Killing Applications - path: /v1.2/docs/user-guide/quick-start/ - -- title: Testing and Monitoring - section: - - title: Simulating Large Test Loads - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/k8petstore - - title: Checking Pod Health - path: /v1.2/docs/user-guide/liveness/ - - title: Using Explorer to Examine the Runtime Environment - path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/explorer - - title: Resource Usage Monitoring - path: /v1.2/docs/user-guide/monitoring/ - - title: Logging - path: /v1.2/docs/user-guide/logging/ diff --git a/_data/v1_2/reference.yml b/_data/v1_2/reference.yml deleted file mode 100644 index c1062cd972..0000000000 --- a/_data/v1_2/reference.yml +++ /dev/null @@ -1,184 +0,0 @@ -bigheader: "Reference Documentation" -abstract: "Design docs, concept definitions, and references for APIs and CLIs." -toc: -- title: Reference Documentation - path: /v1.2/reference/ - -- title: Kubernetes API - section: - - title: Kubernetes API Overview - path: /v1.2/docs/api/ - - title: Kubernetes API Operations - path: http://kubernetes.io/v1.2/docs/api-reference/v1/operations.html - - title: Kubernetes API Definitions - path: http://kubernetes.io/v1.2/docs/api-reference/v1/definitions.html - -- title: Extensions API - section: - - title: Extensions API Operations - path: http://kubernetes.io/v1.2/docs/api-reference/extensions/v1beta1/operations.html - - title: Extensions API Definitions - path: http://kubernetes.io/v1.2/docs/api-reference/extensions/v1beta1/definitions.html - -- title: kubectl - section: - - title: kubectl Overview - path: /v1.2/docs/user-guide/kubectl-overview/ - - title: kubectl for Docker Users - path: /v1.2/docs/user-guide/docker-cli-to-kubectl/ - - title: kubectl Commands - section: - - title: kubectl - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl.md - - title: kubectl annotate - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_annotate.md - - title: kubectl api-versions - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_api-versions.md - - title: kubectl apply - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_apply.md - - title: kubectl attach - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_attach.md - - title: kubectl autoscale - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_autoscale.md - - title: kubectl cluster-info - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_cluster-info.md - - title: kubectl config - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_config.md - - title: kubectl config set-cluster - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_config_set-cluster.md - - title: kubectl config set-context - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_config_set-context.md - - title: kubectl set-credentials - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_config_set-credentials.md - - title: kubectl config set - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_config_set.md - - title: kubectl config unset - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_config_unset.md - - title: kubectl config use-context - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_config_use-context.md - - title: kubectl config view - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_config_view.md - - title: kubectl create - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_create.md - - title: kubectl delete - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_delete.md - - title: kubectl describe - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_describe.md - - title: kubectl edit - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_edit.md - - title: kubectl exec - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_exec.md - - title: kubectl expose - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_expose.md - - title: kubectl get - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_get.md - - title: kubectl label - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_label.md - - title: kubectl logs - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_logs.md - - title: kubectl patch - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_patch.md - - title: kubectl port-forward - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_port-forward.md - - title: kubectl proxy - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_proxy.md - - title: kubectl replace - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_replace.md - - title: kubectl rolling-update - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_rolling-update.md - - title: kubectl run - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_run.md - - title: kubectl scale - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_scale.md - - title: kubectl stop - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_stop.md - - title: kubectl version - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/user-guide/kubectl/kubectl_version.md - -- title: kube-apiserver - section: - - title: Overview - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/admin/kube-apiserver.md - - title: Authorization Plugins - path: /v1.2/docs/admin/authorization/ - - title: Authentication - path: /v1.2/docs/admin/authentication/ - - title: Accessing the API - path: /v1.2/docs/admin/accessing-the-api/ - - title: Admission Controllers - path: /v1.2/docs/admin/admission-controllers/ - - title: Managing Service Accounts - path: /v1.2/docs/admin/service-accounts-admin/ - -- title: kub-scheduler - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/admin/kube-scheduler.md - -- title: kubelet - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/admin/kubelet.md - -- title: kube-proxy - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/admin/kube-proxy.md - -- title: JSONpath - path: /v1.2/docs/user-guide/jsonpath/ - -- title: etcd - path: /v1.2/docs/admin/etcd/ - -- title: Concept Definitions - section: - - title: Container Environment - path: /v1.2/docs/user-guide/container-environment/ - - title: Images - path: /v1.2/docs/user-guide/images/ - - title: Pods - path: /v1.2/docs/user-guide/pods/ - - title: Labels and Selectors - path: /v1.2/docs/user-guide/labels/ - - title: Replication Controller - path: /v1.2/docs/user-guide/replication-controller/ - - title: Services - path: /v1.2/docs/user-guide/services/ - - title: Volumes - path: /v1.2/docs/user-guide/volumes/ - - title: Persistent Volumes - path: /v1.2/docs/user-guide/persistent-volumes/ - - title: Secrets - path: /v1.2/docs/user-guide/secrets/ - - title: Names - path: /v1.2/docs/user-guide/identifiers/ - - title: Namespaces - path: /v1.2/docs/user-guide/namespaces/ - - title: Nodes - path: /v1.2/docs/admin/node/ - - title: Service Accounts - path: /v1.2/docs/user-guide/service-accounts/ - - title: Annotations - path: /v1.2/docs/user-guide/annotations/ - - title: Daemon Sets - path: /v1.2/docs/admin/daemons/ - - title: Deployments - path: /v1.2/docs/user-guide/deployments/ - - title: Ingress Resources - path: /v1.2/docs/user-guide/ingress/ - - title: Horizontal Pod Autoscaling - path: /v1.2/docs/user-guide/horizontal-pod-autoscaler/ - - title: Jobs - path: /v1.2/docs/user-guide/jobs/ - - title: Resource Quotas - path: /v1.2/docs/admin/resource-quota/ - -- title: Kubernetes Design Docs - section: - - title: Kubernetes Architecture - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/architecture.md - - title: Kubernetes Design Overview - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/ - - title: Security in Kubernetes - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/security.md - - title: Kubernetes Identity and Access Management - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/access.md - - title: Security Contexts - path: https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/security_context.md - - title: Kubernetes OpenVSwitch GRE/VxLAN networking - path: /v1.2/docs/admin/ovs-networking/ \ No newline at end of file diff --git a/_data/v1_2/support.yml b/_data/v1_2/support.yml deleted file mode 100644 index 4185295cc8..0000000000 --- a/_data/v1_2/support.yml +++ /dev/null @@ -1,40 +0,0 @@ -bigheader: "Support" -abstract: "Troubleshooting resources, frequently asked questions, and community support channels." -toc: -- title: Support - path: /v1.2/docs/troubleshooting/ - -- title: Troubleshooting - section: - - title: Web Interface - path: /v1.2/docs/user-guide/ui/ - - title: Troubleshooting Applications - path: /v1.2/docs/user-guide/application-troubleshooting/ - - title: Troubleshooting Clusters - path: /v1.2/docs/admin/cluster-troubleshooting/ - -- title: Frequently Asked Questions - section: - - title: User FAQ - path: https://github.com/kubernetes/kubernetes/wiki/User-FAQ/ - - title: Debugging FAQ - path: https://github.com/kubernetes/kubernetes/wiki/Debugging-FAQ/ - - title: Services FAQ - path: https://github.com/kubernetes/kubernetes/wiki/Services-FAQ/ - -- title: Other Resources - section: - - title: Known Issues - path: /v1.2/docs/user-guide/known-issues/ - - title: Kubernetes Issue Tracker on GitHub - path: https://github.com/kubernetes/kubernetes/issues/ - - title: Report a Security Vulnerability - path: /v1.2/docs/reporting-security-issues/ - - title: Release Notes - path: https://github.com/kubernetes/kubernetes/releases/ - - title: Release Roadmap - path: /v1.2/docs/roadmap/ - - title: Contributing to Kubernetes Documentation - path: /v1.2/editdocs/ - - title: Sitemap for v1.2 - path: /v1.2/pagelist/ diff --git a/_layouts/docwithnav.html b/_layouts/docwithnav.html index 2c4ffe9c45..c06e0a6942 100755 --- a/_layouts/docwithnav.html +++ b/_layouts/docwithnav.html @@ -1,6 +1,6 @@ --- --- -{% for thistoc in site.data[page.versionfilesafe].globals.tocs %}{% if foundTOC %}{% break %}{% else %}{% assign tree = site.data[page.versionfilesafe][thistoc].toc %}{% include tocsearch.html %}{% endif %}{% endfor %} +{% for thistoc in site.data.globals.tocs %}{% if foundTOC %}{% break %}{% else %}{% assign tree = site.data[thistoc].toc %}{% include tocsearch.html %}{% endif %}{% endfor %} {% if page.title %}{% assign title=page.title %}{% endif %} @@ -69,14 +69,14 @@
-

{{ site.data[page.versionfilesafe][foundTOC].bigheader }}

-
{{ site.data[page.versionfilesafe][foundTOC].abstract }}
+

{{ site.data[foundTOC].bigheader }}

+
{{ site.data[foundTOC].abstract }}
@@ -90,10 +90,10 @@
- {% assign tree = site.data[page.versionfilesafe][foundTOC].toc %}{% include tree.html %} + {% assign tree = site.data[foundTOC].toc %}{% include tree.html %}
-
Edit This Page +
Edit This Page

{{ title }}

{{ content }}

Analytics diff --git a/v1.1/docs/admin/accessing-the-api.md b/docs/admin/accessing-the-api.md similarity index 90% rename from v1.1/docs/admin/accessing-the-api.md rename to docs/admin/accessing-the-api.md index deaf67185b..18532f5155 100644 --- a/v1.1/docs/admin/accessing-the-api.md +++ b/docs/admin/accessing-the-api.md @@ -7,7 +7,7 @@ cluster administrators who want to customize their cluster or understand the details. Most questions about accessing the cluster are covered -in [Accessing the cluster](/{{page.version}}/docs/user-guide/accessing-the-cluster). +in [Accessing the cluster](/docs/user-guide/accessing-the-cluster). ## Ports and IPs Served On @@ -27,10 +27,10 @@ By default the Kubernetes APIserver serves HTTP on 2 ports: - default is port 6443, change with `--secure-port` flag. - default IP is first non-localhost network interface, change with `--bind-address` flag. - serves HTTPS. Set cert with `--tls-cert-file` and key with `--tls-private-key-file` flag. - - uses token-file or client-certificate based [authentication](/{{page.version}}/docs/admin/authentication). - - uses policy-based [authorization](/{{page.version}}/docs/admin/authorization). + - uses token-file or client-certificate based [authentication](/docs/admin/authentication). + - uses policy-based [authorization](/docs/admin/authorization). 3. Removed: ReadOnly Port - - For security reasons, this had to be removed. Use the [service account](/{{page.version}}/docs/user-guide/service-accounts) feature instead. + - For security reasons, this had to be removed. Use the [service account](/docs/user-guide/service-accounts) feature instead. ## Proxies and Firewall rules @@ -54,7 +54,7 @@ variety of uses cases: running on the `kubernetes-master` machine. The proxy can use cert-based authentication or token-based authentication. 2. Processes running in Containers on Kubernetes that need to read from - the apiserver. Currently, these can use a [service account](/{{page.version}}/docs/user-guide/service-accounts). + the apiserver. Currently, these can use a [service account](/docs/user-guide/service-accounts). 3. Scheduler and Controller-manager processes, which need to do read-write API operations. Currently, these have to run on the same host as the apiserver and use the Localhost Port. In the future, these will be diff --git a/v1.2/docs/admin/admission-controllers.md b/docs/admin/admission-controllers.md similarity index 92% rename from v1.2/docs/admin/admission-controllers.md rename to docs/admin/admission-controllers.md index ae0330ccaf..7596b98fb2 100644 --- a/v1.2/docs/admin/admission-controllers.md +++ b/docs/admin/admission-controllers.md @@ -62,12 +62,12 @@ enabling this plug-in. ### ServiceAccount -This plug-in implements automation for [serviceAccounts](/{{page.version}}/docs/user-guide/service-accounts). +This plug-in implements automation for [serviceAccounts](/docs/user-guide/service-accounts). We strongly recommend using this plug-in if you intend to make use of Kubernetes `ServiceAccount` objects. ### SecurityContextDeny -This plug-in will deny any pod with a [SecurityContext](/{{page.version}}/docs/user-guide/security-context) that defines options that were not available on the `Container`. +This plug-in will deny any pod with a [SecurityContext](/docs/user-guide/security-context) that defines options that were not available on the `Container`. ### ResourceQuota @@ -75,7 +75,7 @@ This plug-in will observe the incoming request and ensure that it does not viola enumerated in the `ResourceQuota` object in a `Namespace`. If you are using `ResourceQuota` objects in your Kubernetes deployment, you MUST use this plug-in to enforce quota constraints. -See the [resourceQuota design doc](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/admission_control_resource_quota.md) and the [example of Resource Quota](/{{page.version}}/docs/admin/resourcequota/) for more details. +See the [resourceQuota design doc](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/admission_control_resource_quota.md) and the [example of Resource Quota](/docs/admin/resourcequota/) for more details. It is strongly encouraged that this plug-in is configured last in the sequence of admission control plug-ins. This is so that quota is not prematurely incremented only for the request to be rejected later in admission control. @@ -88,7 +88,7 @@ your Kubernetes deployment, you MUST use this plug-in to enforce those constrain be used to apply default resource requests to Pods that don't specify any; currently, the default LimitRanger applies a 0.1 CPU requirement to all Pods in the `default` namespace. -See the [limitRange design doc](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/admission_control_limit_range.md) and the [example of Limit Range](/{{page.version}}/docs/admin/limitrange/) for more details. +See the [limitRange design doc](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/admission_control_limit_range.md) and the [example of Limit Range](/docs/admin/limitrange/) for more details. ### InitialResources (experimental) diff --git a/v1.1/docs/admin/authentication.md b/docs/admin/authentication.md similarity index 100% rename from v1.1/docs/admin/authentication.md rename to docs/admin/authentication.md diff --git a/v1.1/docs/admin/authorization.md b/docs/admin/authorization.md similarity index 98% rename from v1.1/docs/admin/authorization.md rename to docs/admin/authorization.md index 3f49467808..3c266085b1 100644 --- a/v1.1/docs/admin/authorization.md +++ b/docs/admin/authorization.md @@ -2,7 +2,7 @@ --- In Kubernetes, authorization happens as a separate step from authentication. -See the [authentication documentation](/{{page.version}}/docs/admin/authentication) for an +See the [authentication documentation](/docs/admin/authentication) for an overview of authentication. Authorization applies to all HTTP accesses on the main (secure) apiserver port. diff --git a/v1.2/docs/admin/cluster-components.md b/docs/admin/cluster-components.md similarity index 77% rename from v1.2/docs/admin/cluster-components.md rename to docs/admin/cluster-components.md index 0aae00ff96..6a8e42f84b 100644 --- a/v1.2/docs/admin/cluster-components.md +++ b/docs/admin/cluster-components.md @@ -15,7 +15,7 @@ unsatisfied). Master components could in theory be run on any node in the cluster. However, for simplicity, current set up scripts typically start all master components on the same VM, and does not run user containers on this VM. See -[high-availability.md](/{{page.version}}/docs/admin/high-availability) for an example multi-master-VM setup. +[high-availability.md](/docs/admin/high-availability) for an example multi-master-VM setup. Even in the future, when Kubernetes is fully self-hosting, it will probably be wise to only allow master components to schedule on a subset of nodes, to limit @@ -24,19 +24,19 @@ node-compromising security exploit. ### kube-apiserver -[kube-apiserver](/{{page.version}}/docs/admin/kube-apiserver) exposes the Kubernetes API; it is the front-end for the +[kube-apiserver](/docs/admin/kube-apiserver) exposes the Kubernetes API; it is the front-end for the Kubernetes control plane. It is designed to scale horizontally (i.e., one scales -it by running more of them-- [high-availability.md](/{{page.version}}/docs/admin/high-availability)). +it by running more of them-- [high-availability.md](/docs/admin/high-availability)). ### etcd -[etcd](/{{page.version}}/docs/admin/etcd) is used as Kubernetes' backing store. All cluster data is stored here. +[etcd](/docs/admin/etcd) is used as Kubernetes' backing store. All cluster data is stored here. Proper administration of a Kubernetes cluster includes a backup plan for etcd's data. ### kube-controller-manager -[kube-controller-manager](/{{page.version}}/docs/admin/kube-controller-manager) is a binary that runs controllers, which are the +[kube-controller-manager](/docs/admin/kube-controller-manager) is a binary that runs controllers, which are the background threads that handle routine tasks in the cluster. Logically, each controller is a separate process, but to reduce the number of moving pieces in the system, they are all compiled into a single binary and run in a single @@ -57,7 +57,7 @@ These controllers include: ### kube-scheduler -[kube-scheduler](/{{page.version}}/docs/admin/kube-scheduler) watches newly created pods that have no node assigned, and +[kube-scheduler](/docs/admin/kube-scheduler) watches newly created pods that have no node assigned, and selects a node for them to run on. ### addons @@ -83,16 +83,16 @@ in their DNS searches. #### User interface The kube-ui provides a read-only overview of the cluster state. Access -[the UI using kubectl proxy](/{{page.version}}/docs/user-guide/connecting-to-applications-proxy/#connecting-to-the-kube-ui-service-from-your-local-workstation) +[the UI using kubectl proxy](/docs/user-guide/connecting-to-applications-proxy/#connecting-to-the-kube-ui-service-from-your-local-workstation) #### Container Resource Monitoring -[Container Resource Monitoring](/{{page.version}}/docs/user-guide/monitoring) records generic time-series metrics +[Container Resource Monitoring](/docs/user-guide/monitoring) records generic time-series metrics about containers in a central database, and provides a UI for browsing that data. #### Cluster-level Logging -[Container Logging](/{{page.version}}/docs/user-guide/monitoring.md) saves container logs +[Container Logging](/docs/user-guide/monitoring.md) saves container logs to a central log store with search/browsing interface. There are two implementations: @@ -109,7 +109,7 @@ the Kubernetes runtime environment. ### kubelet -[kubelet](/{{page.version}}/docs/admin/kubelet) is the primary node agent. It: +[kubelet](/docs/admin/kubelet) is the primary node agent. It: * Watches for pods that have been assigned to its node (either by apiserver or via local configuration file) and: * Mounts the pod's required volumes @@ -122,7 +122,7 @@ the Kubernetes runtime environment. ### kube-proxy -[kube-proxy](/{{page.version}}/docs/admin/kube-proxy) enables the Kubernetes service abstraction by maintaining +[kube-proxy](/docs/admin/kube-proxy) enables the Kubernetes service abstraction by maintaining network rules on the host and performing connection forwarding. ### docker diff --git a/v1.2/docs/admin/cluster-large.md b/docs/admin/cluster-large.md similarity index 97% rename from v1.2/docs/admin/cluster-large.md rename to docs/admin/cluster-large.md index 6c3ade5a91..e1e02d14d6 100644 --- a/v1.2/docs/admin/cluster-large.md +++ b/docs/admin/cluster-large.md @@ -66,4 +66,4 @@ To avoid running into cluster addon resource issues, when creating a cluster wit * [FluentD with ElasticSearch Plugin](http://releases.k8s.io/{{page.githubbranch}}/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml) * [FluentD with GCP Plugin](http://releases.k8s.io/{{page.githubbranch}}/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml) -For directions on how to detect if addon containers are hitting resource limits, see the [Troubleshooting section of Compute Resources](/{{page.version}}/docs/user-guide/compute-resources/#troubleshooting). \ No newline at end of file +For directions on how to detect if addon containers are hitting resource limits, see the [Troubleshooting section of Compute Resources](/docs/user-guide/compute-resources/#troubleshooting). \ No newline at end of file diff --git a/v1.2/docs/admin/cluster-management.md b/docs/admin/cluster-management.md similarity index 97% rename from v1.2/docs/admin/cluster-management.md rename to docs/admin/cluster-management.md index 8f76f2b16c..f2d340ec62 100644 --- a/v1.2/docs/admin/cluster-management.md +++ b/docs/admin/cluster-management.md @@ -8,7 +8,7 @@ running cluster. ## Creating and configuring a Cluster -To install Kubernetes on a set of machines, consult one of the existing [Getting Started guides](/{{page.version}}/docs/getting-started-guides/) depending on your environment. +To install Kubernetes on a set of machines, consult one of the existing [Getting Started guides](/docs/getting-started-guides/) depending on your environment. ## Upgrading a cluster @@ -63,7 +63,7 @@ recommend testing the upgrade on an experimental cluster before performing the u ## Resizing a cluster -If your cluster runs short on resources you can easily add more machines to it if your cluster is running in [Node self-registration mode](/{{page.version}}/docs/admin/node/#self-registration-of-nodes). +If your cluster runs short on resources you can easily add more machines to it if your cluster is running in [Node self-registration mode](/docs/admin/node/#self-registration-of-nodes). If you're using GCE or GKE it's done by resizing Instance Group managing your Nodes. It can be accomplished by modifying number of instances on `Compute > Compute Engine > Instance groups > your group > Edit group` [Google Cloud Console page](https://console.developers.google.com) or using gcloud CLI: ```shell @@ -145,7 +145,7 @@ kubectl replace nodes $NODENAME --patch='{"apiVersion": "v1", "spec": {"unschedu If you deleted the node's VM instance and created a new one, then a new schedulable node resource will be created automatically when you create a new VM instance (if you're using a cloud provider that supports -node discovery; currently this is only Google Compute Engine, not including CoreOS on Google Compute Engine using kube-register). See [Node](/{{page.version}}/docs/admin/node) for more details. +node discovery; currently this is only Google Compute Engine, not including CoreOS on Google Compute Engine using kube-register). See [Node](/docs/admin/node) for more details. ## Advanced Topics diff --git a/v1.1/docs/admin/cluster-troubleshooting.md b/docs/admin/cluster-troubleshooting.md similarity index 89% rename from v1.1/docs/admin/cluster-troubleshooting.md rename to docs/admin/cluster-troubleshooting.md index cd1c95847f..22d461cd70 100644 --- a/v1.1/docs/admin/cluster-troubleshooting.md +++ b/docs/admin/cluster-troubleshooting.md @@ -3,8 +3,8 @@ This doc is about cluster troubleshooting; we assume you have already ruled out your application as the root cause of the problem you are experiencing. See -the [application troubleshooting guide](/{{page.version}}/docs/user-guide/application-troubleshooting) for tips on application debugging. -You may also visit [troubleshooting document](/{{page.version}}/docs/troubleshooting/) for more information. +the [application troubleshooting guide](/docs/user-guide/application-troubleshooting) for tips on application debugging. +You may also visit [troubleshooting document](/docs/troubleshooting/) for more information. ## Listing your cluster @@ -89,7 +89,7 @@ Mitigations: - Action use IaaS providers reliable storage (e.g GCE PD or AWS EBS volume) for VMs with apiserver+etcd - Mitigates: Apiserver backing storage lost -- Action: Use (experimental) [high-availability](/{{page.version}}/docs/admin/high-availability) configuration +- Action: Use (experimental) [high-availability](/docs/admin/high-availability) configuration - Mitigates: Master VM shutdown or master components (scheduler, API server, controller-managing) crashing - Will tolerate one or more simultaneous node or component failures - Mitigates: Apiserver backing storage (i.e., etcd's data directory) lost @@ -108,5 +108,5 @@ Mitigations: - Mitigates: Node shutdown - Mitigates: Kubelet software fault -- Action: [Multiple independent clusters](/{{page.version}}/docs/admin/multi-cluster) (and avoid making risky changes to all clusters at once) +- Action: [Multiple independent clusters](/docs/admin/multi-cluster) (and avoid making risky changes to all clusters at once) - Mitigates: Everything listed above. \ No newline at end of file diff --git a/v1.1/docs/admin/daemon.yaml b/docs/admin/daemon.yaml similarity index 100% rename from v1.1/docs/admin/daemon.yaml rename to docs/admin/daemon.yaml diff --git a/v1.1/docs/admin/daemons.md b/docs/admin/daemons.md similarity index 83% rename from v1.1/docs/admin/daemons.md rename to docs/admin/daemons.md index 5645403d21..a8f3dfba5e 100644 --- a/v1.1/docs/admin/daemons.md +++ b/docs/admin/daemons.md @@ -26,30 +26,30 @@ but with different flags and/or different memory and cpu requests for different ### Required Fields As with all other Kubernetes config, a DaemonSet needs `apiVersion`, `kind`, and `metadata` fields. For -general information about working with config files, see [here](/{{page.version}}/docs/user-guide/simple-yaml), -[here](/{{page.version}}/docs/user-guide/configuring-containers), and [here](/{{page.version}}/docs/user-guide/working-with-resources). +general information about working with config files, see [here](/docs/user-guide/simple-yaml), +[here](/docs/user-guide/configuring-containers), and [here](/docs/user-guide/working-with-resources). -A DaemonSet also needs a [`.spec`](/{{page.version}}/docs/devel/api-conventions/#spec-and-status) section. +A DaemonSet also needs a [`.spec`](/docs/devel/api-conventions/#spec-and-status) section. ### Pod Template The `.spec.template` is the only required field of the `.spec`. -The `.spec.template` is a [pod template](/{{page.version}}/docs/user-guide/replication-controller/#pod-template). -It has exactly the same schema as a [pod](/{{page.version}}/docs/user-guide/pods), except +The `.spec.template` is a [pod template](/docs/user-guide/replication-controller/#pod-template). +It has exactly the same schema as a [pod](/docs/user-guide/pods), except it is nested and does not have an `apiVersion` or `kind`. In addition to required fields for a pod, a pod template in a DaemonSet has to specify appropriate labels (see [pod selector](#pod-selector)). -A pod template in a DaemonSet must have a [`RestartPolicy`](/{{page.version}}/docs/user-guide/pod-states) +A pod template in a DaemonSet must have a [`RestartPolicy`](/docs/user-guide/pod-states) equal to `Always`, or be unspecified, which defaults to `Always`. ### Pod Selector The `.spec.selector` field is a pod selector. It works the same as the `.spec.selector` of -a [ReplicationController](/{{page.version}}/docs/user-guide/replication-controller) or -[Job](/{{page.version}}/docs/user-guide/jobs). +a [ReplicationController](/docs/user-guide/replication-controller) or +[Job](/docs/user-guide/jobs). If the `.spec.selector` is specified, it must equal the `.spec.template.metadata.labels`. If not specified, the are default to be equal. Config with these unequal will be rejected by the API. @@ -64,7 +64,7 @@ a node for testing. If you specify a `.spec.template.spec.nodeSelector`, then the DaemonSet controller will create pods on nodes which match that [node -selector](/{{page.version}}/docs/user-guide/node-selection/). +selector](/docs/user-guide/node-selection/). If you do not specify a `.spec.template.spec.nodeSelector`, then the DaemonSet controller will create pods on all nodes. @@ -75,7 +75,7 @@ Normally, the machine that a pod runs on is selected by the Kubernetes scheduler created by the Daemon controller have the machine already selected (`.spec.nodeName` is specified when the pod is created, so it is ignored by the scheduler). Therefore: - - the [`unschedulable`](/{{page.version}}/docs/admin/node/#manual-node-administration) field of a node is not respected + - the [`unschedulable`](/docs/admin/node/#manual-node-administration) field of a node is not respected by the daemon set controller. - daemon set controller can make pods even when the scheduler has not been started, which can help cluster bootstrap. @@ -88,7 +88,7 @@ Some possible patterns for communicating with pods in a DaemonSet are: as a stats database. They do not have clients. - **NodeIP and Known Port**: Pods in the Daemon Set use a `hostPort`, so that the pods are reachable via the node IPs. Clients knows the the list of nodes ips somehow, and know the port by convention. -- **DNS**: Create a [headless service](/{{page.version}}/docs/user-guide/services/#headless-services) with the same pod selector, +- **DNS**: Create a [headless service](/docs/user-guide/services/#headless-services) with the same pod selector, and then discover DaemonSets using the `endpoints` resource or retrieve multiple A records from DNS. - **Service**: Create a service with the same pod selector, and use the service to reach a @@ -140,14 +140,14 @@ use a Daemon Set rather than creating individual pods. ### Static Pods It is possible to create pods by writing a file to a certain directory watched by Kubelet. These -are called [static pods](/{{page.version}}/docs/admin/static-pods). +are called [static pods](/docs/admin/static-pods). Unlike DaemonSet, static pods cannot be managed with kubectl or other Kubernetes API clients. Static pods do not depend on the apiserver, making them useful in cluster bootstrapping cases. Also, static pods may be deprecated in the future. ### Replication Controller -Daemon Set are similar to [Replication Controllers](/{{page.version}}/docs/user-guide/replication-controller) in that +Daemon Set are similar to [Replication Controllers](/docs/user-guide/replication-controller) in that they both create pods, and those pods have processes which are not expected to terminate (e.g. web servers, storage servers). @@ -158,12 +158,12 @@ all or certain hosts, and when it needs to start before other pods. ## Caveats -DaemonSet objects are in the [`extensions` API Group](/{{page.version}}/docs/api/#api-groups). +DaemonSet objects are in the [`extensions` API Group](/docs/api/#api-groups). DaemonSet is not enabled by default. Enable it by setting `--runtime-config=extensions/v1beta1/daemonsets=true` on the api server. This can be achieved by exporting ENABLE_DAEMONSETS=true before running kube-up.sh script on GCE. -DaemonSet objects effectively have [API version `v1alpha1`](/{{page.version}}/docs/api/)#api-versioning). +DaemonSet objects effectively have [API version `v1alpha1`](/docs/api/)#api-versioning). Alpha objects may change or even be discontinued in future software releases. However, due to to a known issue, they will appear as API version `v1beta1` if enabled. \ No newline at end of file diff --git a/v1.1/docs/admin/dns.md b/docs/admin/dns.md similarity index 100% rename from v1.1/docs/admin/dns.md rename to docs/admin/dns.md diff --git a/v1.1/docs/admin/etcd.md b/docs/admin/etcd.md similarity index 88% rename from v1.1/docs/admin/etcd.md rename to docs/admin/etcd.md index e3cb1aa980..2db4077729 100644 --- a/v1.1/docs/admin/etcd.md +++ b/docs/admin/etcd.md @@ -13,7 +13,7 @@ internet at large), because access to etcd is equivalent to root in your cluster. Data Reliability: for reasonable safety, either etcd needs to be run as a -[cluster](/{{page.version}}/docs/admin/high-availability/#clustering-etcd) (multiple machines each running +[cluster](/docs/admin/high-availability/#clustering-etcd) (multiple machines each running etcd) or etcd's data directory should be located on durable storage (e.g., GCE's persistent disk). In either case, if high availability is required--as it might be in a production cluster--the data directory ought to be [backed up @@ -30,7 +30,7 @@ be run on master VMs. The default location that kubelet scans for manifests is ## Kubernetes's usage of etcd By default, Kubernetes objects are stored under the `/registry` key in etcd. -This path can be prefixed by using the [kube-apiserver](/{{page.version}}/docs/admin/kube-apiserver) flag +This path can be prefixed by using the [kube-apiserver](/docs/admin/kube-apiserver) flag `--etcd-prefix="/foo"`. `etcd` is the only place that Kubernetes keeps state. diff --git a/v1.1/docs/admin/garbage-collection.md b/docs/admin/garbage-collection.md similarity index 100% rename from v1.1/docs/admin/garbage-collection.md rename to docs/admin/garbage-collection.md diff --git a/v1.1/docs/admin/high-availability.md b/docs/admin/high-availability.md similarity index 90% rename from v1.1/docs/admin/high-availability.md rename to docs/admin/high-availability.md index 0d28e3dad6..986aae6285 100644 --- a/v1.1/docs/admin/high-availability.md +++ b/docs/admin/high-availability.md @@ -3,7 +3,7 @@ This document describes how to build a high-availability (HA) Kubernetes cluster. This is a fairly advanced topic. Users who merely want to experiment with Kubernetes are encouraged to use configurations that are simpler to set up such as -the simple [Docker based single node cluster instructions](/{{page.version}}/docs/getting-started-guides/docker), +the simple [Docker based single node cluster instructions](/docs/getting-started-guides/docker), or try [Google Container Engine](https://cloud.google.com/container-engine/) for hosted Kubernetes. Also, at this time high availability support for Kubernetes is not continuously tested in our end-to-end (e2e) testing. We will @@ -53,11 +53,11 @@ choices. For example, on systemd-based systems (e.g. RHEL, CentOS), you can run If you are extending from a standard Kubernetes installation, the `kubelet` binary should already be present on your system. You can run `which kubelet` to determine if the binary is in fact installed. If it is not installed, you should install the [kubelet binary](https://storage.googleapis.com/kubernetes-release/release/v0.19.3/bin/linux/amd64/kubelet), the -[kubelet init file](http://releases.k8s.io/{{page.githubbranch}}/cluster/saltbase/salt/kubelet/initd) and [high-availability/default-kubelet](/{{page.version}}/docs/admin/high-availability/default-kubelet) +[kubelet init file](http://releases.k8s.io/{{page.githubbranch}}/cluster/saltbase/salt/kubelet/initd) and [high-availability/default-kubelet](/docs/admin/high-availability/default-kubelet) scripts. -If you are using monit, you should also install the monit daemon (`apt-get install monit`) and the [high-availability/monit-kubelet](/{{page.version}}/docs/admin/high-availability/monit-kubelet) and -[high-availability/monit-docker](/{{page.version}}/docs/admin/high-availability/monit-docker) configs. +If you are using monit, you should also install the monit daemon (`apt-get install monit`) and the [high-availability/monit-kubelet](/docs/admin/high-availability/monit-kubelet) and +[high-availability/monit-docker](/docs/admin/high-availability/monit-docker) configs. On systemd systems you `systemctl enable kubelet` and `systemctl enable docker`. @@ -86,7 +86,7 @@ First, hit the etcd discovery service to create a new token: curl https://discovery.etcd.io/new?size=3 ``` -On each node, copy the [etcd.yaml](/{{page.version}}/docs/admin/high-availability/etcd.yaml) file into `/etc/kubernetes/manifests/etcd.yaml` +On each node, copy the [etcd.yaml](/docs/admin/high-availability/etcd.yaml) file into `/etc/kubernetes/manifests/etcd.yaml` The kubelet on each node actively monitors the contents of that directory, and it will create an instance of the `etcd` server from the definition of the pod specified in `etcd.yaml`. @@ -156,7 +156,7 @@ The easiest way to create this directory, may be to copy it from the master node ### Starting the API Server -Once these files exist, copy the [kube-apiserver.yaml](/{{page.version}}/docs/admin/high-availability/kube-apiserver.yaml) into `/etc/kubernetes/manifests/` on each master node. +Once these files exist, copy the [kube-apiserver.yaml](/docs/admin/high-availability/kube-apiserver.yaml) into `/etc/kubernetes/manifests/` on each master node. The kubelet monitors this directory, and will automatically create an instance of the `kube-apiserver` container using the pod definition specified in the file. @@ -197,11 +197,11 @@ touch /var/log/kube-controller-manager.log ``` Next, set up the descriptions of the scheduler and controller manager pods on each node. -by copying [kube-scheduler.yaml](/{{page.version}}/docs/admin/high-availability/kube-scheduler.yaml) and [kube-controller-manager.yaml](high-availability//{{page.version}}/docs/admin/kube-controller-manager.yaml) into the `/srv/kubernetes/` directory. +by copying [kube-scheduler.yaml](/docs/admin/high-availability/kube-scheduler.yaml) and [kube-controller-manager.yaml](high-availability//{{page.version}}/docs/admin/kube-controller-manager.yaml) into the `/srv/kubernetes/` directory. ### Running the podmaster -Now that the configuration files are in place, copy the [podmaster.yaml](/{{page.version}}/docs/admin/high-availability/podmaster.yaml) config file into `/etc/kubernetes/manifests/` +Now that the configuration files are in place, copy the [podmaster.yaml](/docs/admin/high-availability/podmaster.yaml) config file into `/etc/kubernetes/manifests/` As before, the kubelet on the node monitors this directory, and will start an instance of the podmaster using the pod specification provided in `podmaster.yaml`. diff --git a/v1.1/docs/admin/high-availability/default-kubelet b/docs/admin/high-availability/default-kubelet similarity index 100% rename from v1.1/docs/admin/high-availability/default-kubelet rename to docs/admin/high-availability/default-kubelet diff --git a/v1.1/docs/admin/high-availability/etcd.yaml b/docs/admin/high-availability/etcd.yaml similarity index 100% rename from v1.1/docs/admin/high-availability/etcd.yaml rename to docs/admin/high-availability/etcd.yaml diff --git a/v1.1/docs/admin/high-availability/kube-apiserver.yaml b/docs/admin/high-availability/kube-apiserver.yaml similarity index 100% rename from v1.1/docs/admin/high-availability/kube-apiserver.yaml rename to docs/admin/high-availability/kube-apiserver.yaml diff --git a/v1.1/docs/admin/high-availability/kube-controller-manager.yaml b/docs/admin/high-availability/kube-controller-manager.yaml similarity index 100% rename from v1.1/docs/admin/high-availability/kube-controller-manager.yaml rename to docs/admin/high-availability/kube-controller-manager.yaml diff --git a/v1.1/docs/admin/high-availability/kube-scheduler.yaml b/docs/admin/high-availability/kube-scheduler.yaml similarity index 100% rename from v1.1/docs/admin/high-availability/kube-scheduler.yaml rename to docs/admin/high-availability/kube-scheduler.yaml diff --git a/v1.1/docs/admin/high-availability/monit-docker b/docs/admin/high-availability/monit-docker similarity index 100% rename from v1.1/docs/admin/high-availability/monit-docker rename to docs/admin/high-availability/monit-docker diff --git a/v1.1/docs/admin/high-availability/monit-kubelet b/docs/admin/high-availability/monit-kubelet similarity index 100% rename from v1.1/docs/admin/high-availability/monit-kubelet rename to docs/admin/high-availability/monit-kubelet diff --git a/v1.1/docs/admin/high-availability/podmaster.yaml b/docs/admin/high-availability/podmaster.yaml similarity index 100% rename from v1.1/docs/admin/high-availability/podmaster.yaml rename to docs/admin/high-availability/podmaster.yaml diff --git a/v1.2/docs/admin/index.md b/docs/admin/index.md similarity index 60% rename from v1.2/docs/admin/index.md rename to docs/admin/index.md index b9d0f41a33..95a1aec99a 100644 --- a/v1.2/docs/admin/index.md +++ b/docs/admin/index.md @@ -2,7 +2,7 @@ --- The cluster admin guide is for anyone creating or administering a Kubernetes cluster. -It assumes some familiarity with concepts in the [User Guide](/{{page.version}}/docs/user-guide/). +It assumes some familiarity with concepts in the [User Guide](/docs/user-guide/). * TOC {:toc} @@ -10,7 +10,7 @@ It assumes some familiarity with concepts in the [User Guide](/{{page.version}}/ ## Planning a cluster There are many different examples of how to setup a kubernetes cluster. Many of them are listed in this -[matrix](/{{page.version}}/docs/getting-started-guides/). We call each of the combinations in this matrix a *distro*. +[matrix](/docs/getting-started-guides/). We call each of the combinations in this matrix a *distro*. Before choosing a particular guide, here are some things to consider: @@ -27,52 +27,52 @@ Before choosing a particular guide, here are some things to consider: - Not all distros are maintained as actively. Prefer ones which are listed as tested on a more recent version of Kubernetes. - If you are configuring kubernetes on-premises, you will need to consider what [networking - model](/{{page.version}}/docs/admin/networking) fits best. - - If you are designing for very high-availability, you may want [clusters in multiple zones](/{{page.version}}/docs/admin/multi-cluster). + model](/docs/admin/networking) fits best. + - If you are designing for very high-availability, you may want [clusters in multiple zones](/docs/admin/multi-cluster). - You may want to familiarize yourself with the various - [components](/{{page.version}}/docs/admin/cluster-components) needed to run a cluster. + [components](/docs/admin/cluster-components) needed to run a cluster. ## Setting up a cluster -Pick one of the Getting Started Guides from the [matrix](/{{page.version}}/docs/getting-started-guides/) and follow it. +Pick one of the Getting Started Guides from the [matrix](/docs/getting-started-guides/) and follow it. If none of the Getting Started Guides fits, you may want to pull ideas from several of the guides. -One option for custom networking is *OpenVSwitch GRE/VxLAN networking* ([ovs-networking.md](/{{page.version}}/docs/admin/ovs-networking)), which +One option for custom networking is *OpenVSwitch GRE/VxLAN networking* ([ovs-networking.md](/docs/admin/ovs-networking)), which uses OpenVSwitch to set up networking between pods across Kubernetes nodes. If you are modifying an existing guide which uses Salt, this document explains [how Salt is used in the Kubernetes -project](/{{page.version}}/docs/admin/salt). +project](/docs/admin/salt). ## Managing a cluster, including upgrades -[Managing a cluster](/{{page.version}}/docs/admin/cluster-management). +[Managing a cluster](/docs/admin/cluster-management). ## Managing nodes -[Managing nodes](/{{page.version}}/docs/admin/node). +[Managing nodes](/docs/admin/node). ## Optional Cluster Services -* **DNS Integration with SkyDNS** ([dns.md](/{{page.version}}/docs/admin/dns)): +* **DNS Integration with SkyDNS** ([dns.md](/docs/admin/dns)): Resolving a DNS name directly to a Kubernetes service. -* **Logging** with [Kibana](/{{page.version}}/docs/user-guide/logging) +* **Logging** with [Kibana](/docs/user-guide/logging) ## Multi-tenant support -* **Resource Quota** ([resource-quota.md](/{{page.version}}/docs/admin/resource-quota)) +* **Resource Quota** ([resource-quota.md](/docs/admin/resource-quota)) ## Security -* **Kubernetes Container Environment** ([docs/user-guide/container-environment.md](/{{page.version}}/docs/user-guide/container-environment)): +* **Kubernetes Container Environment** ([docs/user-guide/container-environment.md](/docs/user-guide/container-environment)): Describes the environment for Kubelet managed containers on a Kubernetes node. -* **Securing access to the API Server** [accessing the api](/{{page.version}}/docs/admin/accessing-the-api) +* **Securing access to the API Server** [accessing the api](/docs/admin/accessing-the-api) -* **Authentication** [authentication](/{{page.version}}/docs/admin/authentication) +* **Authentication** [authentication](/docs/admin/authentication) -* **Authorization** [authorization](/{{page.version}}/docs/admin/authorization) +* **Authorization** [authorization](/docs/admin/authorization) -* **Admission Controllers** [admission_controllers](/{{page.version}}/docs/admin/admission-controllers) \ No newline at end of file +* **Admission Controllers** [admission_controllers](/docs/admin/admission-controllers) \ No newline at end of file diff --git a/v1.1/docs/admin/kube-apiserver.md b/docs/admin/kube-apiserver.md similarity index 100% rename from v1.1/docs/admin/kube-apiserver.md rename to docs/admin/kube-apiserver.md diff --git a/v1.1/docs/admin/kube-controller-manager.md b/docs/admin/kube-controller-manager.md similarity index 100% rename from v1.1/docs/admin/kube-controller-manager.md rename to docs/admin/kube-controller-manager.md diff --git a/v1.1/docs/admin/kube-proxy.md b/docs/admin/kube-proxy.md similarity index 100% rename from v1.1/docs/admin/kube-proxy.md rename to docs/admin/kube-proxy.md diff --git a/v1.1/docs/admin/kube-scheduler.md b/docs/admin/kube-scheduler.md similarity index 100% rename from v1.1/docs/admin/kube-scheduler.md rename to docs/admin/kube-scheduler.md diff --git a/v1.1/docs/admin/kubelet.md b/docs/admin/kubelet.md similarity index 100% rename from v1.1/docs/admin/kubelet.md rename to docs/admin/kubelet.md diff --git a/v1.1/docs/admin/limitrange/index.md b/docs/admin/limitrange/index.md similarity index 95% rename from v1.1/docs/admin/limitrange/index.md rename to docs/admin/limitrange/index.md index 5475b8fc32..efa212d19a 100644 --- a/v1.1/docs/admin/limitrange/index.md +++ b/docs/admin/limitrange/index.md @@ -26,11 +26,11 @@ This example demonstrates how limits can be applied to a Kubernetes namespace to min/max resource limits per pod. In addition, this example demonstrates how you can apply default resource limits to pods in the absence of an end-user specified value. -See [LimitRange design doc](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/admission_control_limit_range.md) for more information. For a detailed description of the Kubernetes resource model, see [Resources](/{{page.version}}/docs/user-guide/compute-resources) +See [LimitRange design doc](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/admission_control_limit_range.md) for more information. For a detailed description of the Kubernetes resource model, see [Resources](/docs/user-guide/compute-resources) ## Step 0: Prerequisites -This example requires a running Kubernetes cluster. See the [Getting Started guides](/{{page.version}}/docs/getting-started-guides/) for how to get started. +This example requires a running Kubernetes cluster. See the [Getting Started guides](/docs/getting-started-guides/) for how to get started. Change to the `` directory if you're not already there. diff --git a/v1.1/docs/admin/limitrange/invalid-pod.yaml b/docs/admin/limitrange/invalid-pod.yaml similarity index 100% rename from v1.1/docs/admin/limitrange/invalid-pod.yaml rename to docs/admin/limitrange/invalid-pod.yaml diff --git a/v1.1/docs/admin/limitrange/limits.yaml b/docs/admin/limitrange/limits.yaml similarity index 100% rename from v1.1/docs/admin/limitrange/limits.yaml rename to docs/admin/limitrange/limits.yaml diff --git a/v1.1/docs/admin/limitrange/namespace.yaml b/docs/admin/limitrange/namespace.yaml similarity index 100% rename from v1.1/docs/admin/limitrange/namespace.yaml rename to docs/admin/limitrange/namespace.yaml diff --git a/v1.1/docs/admin/limitrange/valid-pod.yaml b/docs/admin/limitrange/valid-pod.yaml similarity index 100% rename from v1.1/docs/admin/limitrange/valid-pod.yaml rename to docs/admin/limitrange/valid-pod.yaml diff --git a/v1.1/docs/admin/multi-cluster.md b/docs/admin/multi-cluster.md similarity index 100% rename from v1.1/docs/admin/multi-cluster.md rename to docs/admin/multi-cluster.md diff --git a/v1.2/docs/admin/namespaces.md b/docs/admin/namespaces.md similarity index 90% rename from v1.2/docs/admin/namespaces.md rename to docs/admin/namespaces.md index 0ea405250f..6a5265eadd 100644 --- a/v1.2/docs/admin/namespaces.md +++ b/docs/admin/namespaces.md @@ -37,7 +37,7 @@ The Namespace provides a unique scope for: ## Usage -Look [here](/{{page.version}}/docs/admin/namespaces/) for an in depth example of namespaces. +Look [here](/docs/admin/namespaces/) for an in depth example of namespaces. ### Viewing namespaces @@ -115,8 +115,8 @@ $ kubectl create -f ./my-namespace.yaml ### Working in namespaces -See [Setting the namespace for a request](/{{page.version}}/docs/user-guide/namespaces/#setting-the-namespace-for-a-request) -and [Setting the namespace preference](/{{page.version}}/docs/user-guide/namespaces/#setting-the-namespace-preference). +See [Setting the namespace for a request](/docs/user-guide/namespaces/#setting-the-namespace-for-a-request) +and [Setting the namespace preference](/docs/user-guide/namespaces/#setting-the-namespace-preference). ### Deleting a namespace @@ -132,7 +132,7 @@ This delete is asynchronous, so for a time you will see the namespace in the `Te ## Namespaces and DNS -When you create a [Service](/{{page.version}}/docs/user-guide/services), it creates a corresponding [DNS entry](/{{page.version}}/docs/admin/dns). +When you create a [Service](/docs/user-guide/services), it creates a corresponding [DNS entry](/docs/admin/dns). This entry is of the form `..svc.cluster.local`, which means that if a container just uses `` it will resolve to the service which is local to a namespace. This is useful for using the same configuration across diff --git a/v1.2/docs/admin/namespaces/index.md b/docs/admin/namespaces/index.md similarity index 92% rename from v1.2/docs/admin/namespaces/index.md rename to docs/admin/namespaces/index.md index 27b2631ecb..9a8e96c57b 100644 --- a/v1.2/docs/admin/namespaces/index.md +++ b/docs/admin/namespaces/index.md @@ -5,7 +5,7 @@ Kubernetes _namespaces_ help different projects, teams, or customers to share a It does this by providing the following: -1. A scope for [Names](/{{page.version}}/docs/user-guide/identifiers). +1. A scope for [Names](/docs/user-guide/identifiers). 2. A mechanism to attach authorization and policy to a subsection of the cluster. Use of multiple namespaces is optional. @@ -16,8 +16,8 @@ This example demonstrates how to use Kubernetes namespaces to subdivide your clu This example assumes the following: -1. You have an [existing Kubernetes cluster](/{{page.version}}/docs/getting-started-guides/). -2. You have a basic understanding of Kubernetes _[pods](/{{page.version}}/docs/user-guide/pods)_, _[services](/{{page.version}}/docs/user-guide/services)_, and _[replication controllers](/{{page.version}}/docs/user-guide/replication-controller)_. +1. You have an [existing Kubernetes cluster](/docs/getting-started-guides/). +2. You have a basic understanding of Kubernetes _[pods](/docs/user-guide/pods)_, _[services](/docs/user-guide/services)_, and _[replication controllers](/docs/user-guide/replication-controller)_. ### Step One: Understand the default namespace @@ -49,7 +49,7 @@ One pattern this organization could follow is to partition the Kubernetes cluste Let's create two new namespaces to hold our work. -Use the file [`namespace-dev.json`](/{{page.version}}/docs/admin/namespacesnamespace-dev.json) which describes a development namespace: +Use the file [`namespace-dev.json`](/docs/admin/namespacesnamespace-dev.json) which describes a development namespace: @@ -66,7 +66,7 @@ Use the file [`namespace-dev.json`](/{{page.version}}/docs/admin/namespacesnames } ``` -[Download example](/{{page.version}}/docs/admin/namespacesnamespace-dev.json) +[Download example](/docs/admin/namespacesnamespace-dev.json) Create the development namespace using kubectl. diff --git a/v1.1/docs/admin/namespaces/namespace-dev.json b/docs/admin/namespaces/namespace-dev.json similarity index 100% rename from v1.1/docs/admin/namespaces/namespace-dev.json rename to docs/admin/namespaces/namespace-dev.json diff --git a/v1.1/docs/admin/namespaces/namespace-prod.json b/docs/admin/namespaces/namespace-prod.json similarity index 100% rename from v1.1/docs/admin/namespaces/namespace-prod.json rename to docs/admin/namespaces/namespace-prod.json diff --git a/v1.1/docs/admin/networking.md b/docs/admin/networking.md similarity index 96% rename from v1.1/docs/admin/networking.md rename to docs/admin/networking.md index 9fd86e9c1e..d408c1e590 100644 --- a/v1.1/docs/admin/networking.md +++ b/docs/admin/networking.md @@ -5,10 +5,10 @@ Kubernetes approaches networking somewhat differently than Docker does by default. There are 4 distinct networking problems to solve: 1. Highly-coupled container-to-container communications: this is solved by - [pods](/{{page.version}}/docs/user-guide/pods) and `localhost` communications. + [pods](/docs/user-guide/pods) and `localhost` communications. 2. Pod-to-Pod communications: this is the primary focus of this document. -3. Pod-to-Service communications: this is covered by [services](/{{page.version}}/docs/user-guide/services). -4. External-to-Service communications: this is covered by [services](/{{page.version}}/docs/user-guide/services). +3. Pod-to-Service communications: this is covered by [services](/docs/user-guide/services). +4. External-to-Service communications: this is covered by [services](/docs/user-guide/services). * TOC {:toc} @@ -163,7 +163,7 @@ people have reported success with Flannel and Kubernetes. ### OpenVSwitch -[OpenVSwitch](/{{page.version}}/docs/admin/ovs-networking) is a somewhat more mature but also +[OpenVSwitch](/docs/admin/ovs-networking) is a somewhat more mature but also complicated way to build an overlay network. This is endorsed by several of the "Big Shops" for networking. diff --git a/v1.2/docs/admin/node.md b/docs/admin/node.md similarity index 97% rename from v1.2/docs/admin/node.md rename to docs/admin/node.md index 1844b2376f..2539e05450 100644 --- a/v1.2/docs/admin/node.md +++ b/docs/admin/node.md @@ -8,7 +8,7 @@ `Node` is a worker machine in Kubernetes, previously known as `Minion`. Node may be a VM or physical machine, depending on the cluster. Each node has -the services necessary to run [Pods](/{{page.version}}/docs/user-guide/pods) and is managed by the master +the services necessary to run [Pods](/docs/user-guide/pods) and is managed by the master components. The services on a node include docker, kubelet and network proxy. See [The Kubernetes Node](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/architecture.md#the-kubernetes-node) section in the architecture design doc for more details. @@ -82,7 +82,7 @@ The information is gathered by Kubelet from the node. ## Node Management -Unlike [Pods](/{{page.version}}/docs/user-guide/pods) and [Services](/{{page.version}}/docs/user-guide/services), a Node is not inherently +Unlike [Pods](/docs/user-guide/pods) and [Services](/docs/user-guide/services), a Node is not inherently created by Kubernetes: it is either taken from cloud providers like Google Compute Engine, or from your pool of physical or virtual machines. What this means is that when Kubernetes creates a node, it is really just creating an object that represents the node in its internal state. diff --git a/v1.1/docs/admin/ovs-networking.md b/docs/admin/ovs-networking.md similarity index 100% rename from v1.1/docs/admin/ovs-networking.md rename to docs/admin/ovs-networking.md diff --git a/v1.1/docs/admin/resource-quota.md b/docs/admin/resource-quota.md similarity index 90% rename from v1.1/docs/admin/resource-quota.md rename to docs/admin/resource-quota.md index 494f014987..03679248fe 100755 --- a/v1.1/docs/admin/resource-quota.md +++ b/docs/admin/resource-quota.md @@ -18,7 +18,7 @@ work like this: their resource requests defaulted to match their defined limits. The user is only charged for the resources they request in the Resource Quota versus their limits because the request is the minimum amount of resource guaranteed by the cluster during scheduling. For more information on over commit, - see [compute-resources](/{{page.version}}/docs/user-guide/compute-resources). + see [compute-resources](/docs/user-guide/compute-resources). - If creating a pod would cause the namespace to exceed any of the limits specified in the the Resource Quota for that namespace, then the request will fail with HTTP status code `403 FORBIDDEN`. @@ -26,7 +26,7 @@ work like this: of the resources for which quota is enabled, then the POST of the pod will fail with HTTP status code `403 FORBIDDEN`. Hint: Use the LimitRange admission controller to force default values of *limits* (then resource *requests* would be equal to *limits* by default, see - [admission controller](/{{page.version}}/docs/admin/admission-controllers)) before the quota is checked to avoid this problem. + [admission controller](/docs/admin/admission-controllers)) before the quota is checked to avoid this problem. Examples of policies that could be created using namespaces and quotas are: @@ -52,7 +52,7 @@ Resource Quota is enforced in a particular namespace when there is a ## Compute Resource Quota -The total sum of [compute resources](/{{page.version}}/docs/user-guide/compute-resources) requested by pods +The total sum of [compute resources](/docs/user-guide/compute-resources) requested by pods in a namespace can be limited. The following compute resource types are supported: | ResourceName | Description | @@ -73,9 +73,9 @@ are supported: | pods | Total number of pods | | services | Total number of services | | replicationcontrollers | Total number of replication controllers | -| resourcequotas | Total number of [resource quotas](/{{page.version}}/docs/admin/admission-controllers/#resourcequota) | +| resourcequotas | Total number of [resource quotas](/docs/admin/admission-controllers/#resourcequota) | | secrets | Total number of secrets | -| persistentvolumeclaims | Total number of [persistent volume claims](/{{page.version}}/docs/user-guide/persistent-volumes/#persistentvolumeclaims) | +| persistentvolumeclaims | Total number of [persistent volume claims](/docs/user-guide/persistent-volumes/#persistentvolumeclaims) | For example, `pods` quota counts and enforces a maximum on the number of `pods` created in a single namespace. @@ -147,7 +147,7 @@ restrictions around nodes: pods from several namespaces may run on the same node ## Example -See a [detailed example for how to use resource quota](/{{page.version}}/docs/admin/resourcequota/). +See a [detailed example for how to use resource quota](/docs/admin/resourcequota/). ## Read More diff --git a/v1.1/docs/admin/resourcequota/index.md b/docs/admin/resourcequota/index.md similarity index 95% rename from v1.1/docs/admin/resourcequota/index.md rename to docs/admin/resourcequota/index.md index 9011d51d37..dab2e6ca64 100644 --- a/v1.1/docs/admin/resourcequota/index.md +++ b/docs/admin/resourcequota/index.md @@ -1,8 +1,8 @@ --- --- -This example demonstrates how [resource quota](/{{page.version}}/docs/admin/admission-controllers/#resourcequota) and -[limitsranger](/{{page.version}}/docs/admin/admission-controllers/#limitranger) can be applied to a Kubernetes namespace. +This example demonstrates how [resource quota](/docs/admin/admission-controllers/#resourcequota) and +[limitsranger](/docs/admin/admission-controllers/#limitranger) can be applied to a Kubernetes namespace. See [ResourceQuota design doc](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/admission_control_resource_quota.md) for more information. This example assumes you have a functional Kubernetes setup. diff --git a/v1.1/docs/admin/resourcequota/limits.yaml b/docs/admin/resourcequota/limits.yaml similarity index 100% rename from v1.1/docs/admin/resourcequota/limits.yaml rename to docs/admin/resourcequota/limits.yaml diff --git a/v1.1/docs/admin/resourcequota/namespace.yaml b/docs/admin/resourcequota/namespace.yaml similarity index 100% rename from v1.1/docs/admin/resourcequota/namespace.yaml rename to docs/admin/resourcequota/namespace.yaml diff --git a/v1.1/docs/admin/resourcequota/quota.yaml b/docs/admin/resourcequota/quota.yaml similarity index 100% rename from v1.1/docs/admin/resourcequota/quota.yaml rename to docs/admin/resourcequota/quota.yaml diff --git a/v1.1/docs/admin/salt.md b/docs/admin/salt.md similarity index 100% rename from v1.1/docs/admin/salt.md rename to docs/admin/salt.md diff --git a/v1.2/docs/admin/service-accounts-admin.md b/docs/admin/service-accounts-admin.md similarity index 94% rename from v1.2/docs/admin/service-accounts-admin.md rename to docs/admin/service-accounts-admin.md index d68383e640..d58922dc07 100644 --- a/v1.2/docs/admin/service-accounts-admin.md +++ b/docs/admin/service-accounts-admin.md @@ -2,7 +2,7 @@ --- *This is a Cluster Administrator guide to service accounts. It assumes knowledge of -the [User Guide to Service Accounts](/{{page.version}}/docs/user-guide/service-accounts).* +the [User Guide to Service Accounts](/docs/user-guide/service-accounts).* *Support for authorization and user accounts is planned but incomplete. Sometimes incomplete features are referred to in order to better describe service accounts.* @@ -38,7 +38,7 @@ Three separate components cooperate to implement the automation around service a ### Service Account Admission Controller The modification of pods is implemented via a plugin -called an [Admission Controller](/{{page.version}}/docs/admin/admission-controllers). It is part of the apiserver. +called an [Admission Controller](/docs/admin/admission-controllers). It is part of the apiserver. It acts synchronously to modify pods as they are created or updated. When this plugin is active (and it is by default on most distributions), then it does the following when a pod is created or modified: diff --git a/v1.1/docs/admin/static-pods.md b/docs/admin/static-pods.md similarity index 96% rename from v1.1/docs/admin/static-pods.md rename to docs/admin/static-pods.md index 1f53fcfa8c..b322f23fc6 100644 --- a/v1.1/docs/admin/static-pods.md +++ b/docs/admin/static-pods.md @@ -85,7 +85,7 @@ static-web-my-minion1 172.17.0.3 my-minion1/192.1 Labels from the static pod are propagated into the mirror-pod and can be used as usual for filtering. -Notice we cannot delete the pod with the API server (e.g. via [`kubectl`](/{{page.version}}/docs/user-guide/kubectl/kubectl) command), kubelet simply won't remove it. +Notice we cannot delete the pod with the API server (e.g. via [`kubectl`](/docs/user-guide/kubectl/kubectl) command), kubelet simply won't remove it. ```shell [joe@my-master ~] $ kubectl delete pod static-web-my-minion1 diff --git a/v1.1/docs/api-reference/extensions/v1beta1/definitions.md b/docs/api-reference/extensions/v1beta1/definitions.md similarity index 100% rename from v1.1/docs/api-reference/extensions/v1beta1/definitions.md rename to docs/api-reference/extensions/v1beta1/definitions.md diff --git a/v1.1/docs/api-reference/extensions/v1beta1/operations.md b/docs/api-reference/extensions/v1beta1/operations.md similarity index 100% rename from v1.1/docs/api-reference/extensions/v1beta1/operations.md rename to docs/api-reference/extensions/v1beta1/operations.md diff --git a/v1.1/docs/api-reference/v1/definitions.md b/docs/api-reference/v1/definitions.md similarity index 100% rename from v1.1/docs/api-reference/v1/definitions.md rename to docs/api-reference/v1/definitions.md diff --git a/v1.1/docs/api-reference/v1/operations.md b/docs/api-reference/v1/operations.md similarity index 100% rename from v1.1/docs/api-reference/v1/operations.md rename to docs/api-reference/v1/operations.md diff --git a/v1.1/docs/api.md b/docs/api.md similarity index 86% rename from v1.1/docs/api.md rename to docs/api.md index 720817c275..f5bd67a745 100644 --- a/v1.1/docs/api.md +++ b/docs/api.md @@ -1,15 +1,15 @@ --- --- -Primary system and API concepts are documented in the [User guide](/{{page.version}}/docs/user-guide/). +Primary system and API concepts are documented in the [User guide](/docs/user-guide/). -Overall API conventions are described in the [API conventions doc](/{{page.version}}/docs/devel/api-conventions). +Overall API conventions are described in the [API conventions doc](/docs/devel/api-conventions). Complete API details are documented via [Swagger](http://swagger.io/). The Kubernetes apiserver (aka "master") exports an API that can be used to retrieve the [Swagger spec](https://github.com/swagger-api/swagger-spec/tree/master/schemas/v1.2) for the Kubernetes API, by default at `/swaggerapi`, and a UI you can use to browse the API documentation at `/swagger-ui`. We also periodically update a [statically generated UI](http://kubernetes.io/third_party/swagger-ui/). -Remote access to the API is discussed in the [access doc](/{{page.version}}/docs/admin/accessing-the-api). +Remote access to the API is discussed in the [access doc](/docs/admin/accessing-the-api). -The Kubernetes API also serves as the foundation for the declarative configuration schema for the system. The [Kubectl](/{{page.version}}/docs/user-guide/kubectl/kubectl) command-line tool can be used to create, update, delete, and get API objects. +The Kubernetes API also serves as the foundation for the declarative configuration schema for the system. The [Kubectl](/docs/user-guide/kubectl/kubectl) command-line tool can be used to create, update, delete, and get API objects. Kubernetes also stores its serialized state (currently in [etcd](https://coreos.com/docs/distributed-configuration/getting-started-with-etcd/)) in terms of the API resources. @@ -19,7 +19,7 @@ Kubernetes itself is decomposed into multiple components, which interact through In our experience, any system that is successful needs to grow and change as new use cases emerge or existing ones change. Therefore, we expect the Kubernetes API to continuously change and grow. However, we intend to not break compatibility with existing clients, for an extended period of time. In general, new API resources and new resource fields can be expected to be added frequently. Elimination of resources or fields will require following a deprecation process. The precise deprecation policy for eliminating features is TBD, but once we reach our 1.0 milestone, there will be a specific policy. -What constitutes a compatible change and how to change the API are detailed by the [API change document](/{{page.version}}/docs/devel/api_changes). +What constitutes a compatible change and how to change the API are detailed by the [API change document](/docs/devel/api_changes). ## API versioning @@ -35,7 +35,7 @@ software versioning. Different API versions imply different levels of stability and support. The criteria for each level are described -in more detail in the [API Changes documentation](/{{page.version}}/docs/devel/api_changes/#alpha-beta-and-stable-versions). They are summarized here: +in more detail in the [API Changes documentation](/docs/devel/api_changes/#alpha-beta-and-stable-versions). They are summarized here: - Alpha level: - The version names contain `alpha` (e.g. `v1alpha1`). @@ -88,17 +88,17 @@ As of June 4, 2015, the Kubernetes v1 API has been enabled by default. The v1bet ### v1 conversion tips (from v1beta3) -We're working to convert all documentation and examples to v1. A simple [API conversion tool](/{{page.version}}/docs/admin/cluster-management/#switching-your-config-files-to-a-new-api-version) has been written to simplify the translation process. Use `kubectl create --validate` in order to validate your json or yaml against our Swagger spec. +We're working to convert all documentation and examples to v1. A simple [API conversion tool](/docs/admin/cluster-management/#switching-your-config-files-to-a-new-api-version) has been written to simplify the translation process. Use `kubectl create --validate` in order to validate your json or yaml against our Swagger spec. Changes to services are the most significant difference between v1beta3 and v1. * The `service.spec.portalIP` property is renamed to `service.spec.clusterIP`. * The `service.spec.createExternalLoadBalancer` property is removed. Specify `service.spec.type: "LoadBalancer"` to create an external load balancer instead. -* The `service.spec.publicIPs` property is deprecated and now called `service.spec.deprecatedPublicIPs`. This property will be removed entirely when v1beta3 is removed. The vast majority of users of this field were using it to expose services on ports on the node. Those users should specify `service.spec.type: "NodePort"` instead. Read [External Services](/{{page.version}}/docs/user-guide/services/#external-services) for more info. If this is not sufficient for your use case, please file an issue or contact @thockin. +* The `service.spec.publicIPs` property is deprecated and now called `service.spec.deprecatedPublicIPs`. This property will be removed entirely when v1beta3 is removed. The vast majority of users of this field were using it to expose services on ports on the node. Those users should specify `service.spec.type: "NodePort"` instead. Read [External Services](/docs/user-guide/services/#external-services) for more info. If this is not sufficient for your use case, please file an issue or contact @thockin. Some other difference between v1beta3 and v1: -* The `pod.spec.containers[*].privileged` and `pod.spec.containers[*].capabilities` properties are now nested under the `pod.spec.containers[*].securityContext` property. See [Security Contexts](/{{page.version}}/docs/user-guide/security-context). +* The `pod.spec.containers[*].privileged` and `pod.spec.containers[*].capabilities` properties are now nested under the `pod.spec.containers[*].securityContext` property. See [Security Contexts](/docs/user-guide/security-context). * The `pod.spec.host` property is renamed to `pod.spec.nodeName`. * The `endpoints.subsets[*].addresses.IP` property is renamed to `endpoints.subsets[*].addresses.ip`. * The `pod.status.containerStatuses[*].state.termination` and `pod.status.containerStatuses[*].lastState.termination` properties are renamed to `pod.status.containerStatuses[*].state.terminated` and `pod.status.containerStatuses[*].lastState.terminated` respectively. @@ -119,11 +119,8 @@ Some important differences between v1beta1/2 and v1beta3: * The `labels` query parameter has been renamed to `labelSelector`. * The `fields` query parameter has been renamed to `fieldSelector`. * The container `entrypoint` has been renamed to `command`, and `command` has been renamed to `args`. -* Container, volume, and node resources are expressed as nested maps (e.g., `resources{cpu:1}`) rather than as individual fields, and resource values support [scaling suffixes](/{{page.version}}/docs/user-guide/compute-resources/#specifying-resource-quantities) rather than fixed scales (e.g., milli-cores). +* Container, volume, and node resources are expressed as nested maps (e.g., `resources{cpu:1}`) rather than as individual fields, and resource values support [scaling suffixes](/docs/user-guide/compute-resources/#specifying-resource-quantities) rather than fixed scales (e.g., milli-cores). * Restart policy is represented simply as a string (e.g., `"Always"`) rather than as a nested map (`always{}`). * Pull policies changed from `PullAlways`, `PullNever`, and `PullIfNotPresent` to `Always`, `Never`, and `IfNotPresent`. * The volume `source` is inlined into `volume` rather than nested. -* Host volumes have been changed from `hostDir` to `hostPath` to better reflect that they can be files or directories. - - - +* Host volumes have been changed from `hostDir` to `hostPath` to better reflect that they can be files or directories. \ No newline at end of file diff --git a/v1.1/docs/devel/api-conventions.md b/docs/devel/api-conventions.md similarity index 94% rename from v1.1/docs/devel/api-conventions.md rename to docs/devel/api-conventions.md index 806a4fac07..5ae751ad2c 100644 --- a/v1.1/docs/devel/api-conventions.md +++ b/docs/devel/api-conventions.md @@ -5,12 +5,12 @@ Updated: 9/20/2015 *This document is oriented at users who want a deeper understanding of the Kubernetes API structure, and developers wanting to extend the Kubernetes API. An introduction to -using resources with kubectl can be found in [Working with resources](/{{page.version}}/docs/user-guide/working-with-resources).* +using resources with kubectl can be found in [Working with resources](/docs/user-guide/working-with-resources).* * TOC {:toc} -The conventions of the [Kubernetes API](/{{page.version}}/docs/api/) (and related APIs in the ecosystem) are intended to ease client development and ensure that configuration mechanisms can be implemented that work across a diverse set of use cases consistently. +The conventions of the [Kubernetes API](/docs/api/) (and related APIs in the ecosystem) are intended to ease client development and ensure that configuration mechanisms can be implemented that work across a diverse set of use cases consistently. The general style of the Kubernetes API is RESTful - clients create, update, delete, or retrieve a description of an object via the standard HTTP verbs (POST, PUT, DELETE, and GET) - and those APIs preferentially accept and return JSON. Kubernetes also exposes additional endpoints for non-standard verbs and allows alternative content types. All of the JSON accepted and returned by the server has a schema, identified by the "kind" and "apiVersion" fields. Where relevant HTTP header fields exist, they should mirror the content of JSON fields, but the information should not be represented only in the HTTP header. @@ -44,7 +44,7 @@ Kinds are grouped into three categories: Most objects defined in the system should have an endpoint that returns the full set of resources, as well as zero or more endpoints that return subsets of the full list. Some objects may be singletons (the current user, the system defaults) and may not have lists. - In addition, all lists that return objects with labels should support label filtering (see [docs/user-guide/labels.md](/{{page.version}}/docs/user-guide/labels), and most lists should support filtering by fields. + In addition, all lists that return objects with labels should support label filtering (see [docs/user-guide/labels.md](/docs/user-guide/labels), and most lists should support filtering by fields. Examples: PodLists, ServiceLists, NodeLists @@ -62,7 +62,7 @@ Kinds are grouped into three categories: * `/status`: Used to write just the status portion of a resource. For example, the `/pods` endpoint only allows updates to `metadata` and `spec`, since those reflect end-user intent. An automated process should be able to modify status for users to see by sending an updated Pod kind to the server to the "/pods/<name>/status" endpoint - the alternate endpoint allows different rules to be applied to the update, and access to be appropriately restricted. * `/scale`: Used to read and write the count of a resource in a manner that is independent of the specific resource schema. - Two additional subresources, `proxy` and `portforward`, provide access to cluster resources as described in [docs/user-guide/accessing-the-cluster.md](/{{page.version}}/docs/user-guide/accessing-the-cluster). + Two additional subresources, `proxy` and `portforward`, provide access to cluster resources as described in [docs/user-guide/accessing-the-cluster.md](/docs/user-guide/accessing-the-cluster). The standard REST verbs (defined below) MUST return singular JSON objects. Some API endpoints may deviate from the strict REST pattern and return resources that are not singular JSON objects, such as streams of JSON objects or unstructured text log data. @@ -83,9 +83,9 @@ These fields are required for proper decoding of the object. They may be populat Every object kind MUST have the following metadata in a nested object field called "metadata": -* namespace: a namespace is a DNS compatible subdomain that objects are subdivided into. The default namespace is 'default'. See [docs/user-guide/namespaces.md](/{{page.version}}/docs/user-guide/namespaces) for more. -* name: a string that uniquely identifies this object within the current namespace (see [docs/user-guide/identifiers.md](/{{page.version}}/docs/user-guide/identifiers)). This value is used in the path when retrieving an individual object. -* uid: a unique in time and space value (typically an RFC 4122 generated identifier, see [docs/user-guide/identifiers.md](/{{page.version}}/docs/user-guide/identifiers)) used to distinguish between objects with the same name that have been deleted and recreated +* namespace: a namespace is a DNS compatible subdomain that objects are subdivided into. The default namespace is 'default'. See [docs/user-guide/namespaces.md](/docs/user-guide/namespaces) for more. +* name: a string that uniquely identifies this object within the current namespace (see [docs/user-guide/identifiers.md](/docs/user-guide/identifiers)). This value is used in the path when retrieving an individual object. +* uid: a unique in time and space value (typically an RFC 4122 generated identifier, see [docs/user-guide/identifiers.md](/docs/user-guide/identifiers)) used to distinguish between objects with the same name that have been deleted and recreated Every object SHOULD have the following metadata in a nested object field called "metadata": @@ -93,8 +93,8 @@ Every object SHOULD have the following metadata in a nested object field called * generation: a sequence number representing a specific generation of the desired state. Set by the system and monotonically increasing, per-resource. May be compared, such as for RAW and WAW consistency. * creationTimestamp: a string representing an RFC 3339 date of the date and time an object was created * deletionTimestamp: a string representing an RFC 3339 date of the date and time after which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource will be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. -* labels: a map of string keys and values that can be used to organize and categorize objects (see [docs/user-guide/labels.md](/{{page.version}}/docs/user-guide/labels)) -* annotations: a map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about this object (see [docs/user-guide/annotations.md](/{{page.version}}/docs/user-guide/annotations)) +* labels: a map of string keys and values that can be used to organize and categorize objects (see [docs/user-guide/labels.md](/docs/user-guide/labels)) +* annotations: a map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about this object (see [docs/user-guide/annotations.md](/docs/user-guide/annotations)) Labels are intended for organizational purposes by end users (select the pods that match this label query). Annotations enable third-party automation and tooling to decorate objects with additional metadata for their own use. @@ -139,7 +139,7 @@ In general, condition values may change back and forth, but some condition trans A typical oscillating condition type is `Ready`, which indicates the object was believed to be fully operational at the time it was last probed. A possible monotonic condition could be `Succeeded`. A `False` status for `Succeeded` would imply failure. An object that was still active would not have a `Succeeded` condition, or its status would be `Unknown`. -Some resources in the v1 API contain fields called **`phase`**, and associated `message`, `reason`, and other status fields. The pattern of using `phase` is deprecated. Newer API types should use conditions instead. Phase was essentially a state-machine enumeration field, that contradicted [system-design principles](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/principles.md#control-logic) and hampered evolution, since [adding new enum values breaks backward compatibility](/{{page.version}}/docs/devel/api_changes). Rather than encouraging clients to infer implicit properties from phases, we intend to explicitly expose the conditions that clients need to monitor. Conditions also have the benefit that it is possible to create some conditions with uniform meaning across all resource types, while still exposing others that are unique to specific resource types. See [#7856](http://issues.k8s.io/7856) for more details and discussion. +Some resources in the v1 API contain fields called **`phase`**, and associated `message`, `reason`, and other status fields. The pattern of using `phase` is deprecated. Newer API types should use conditions instead. Phase was essentially a state-machine enumeration field, that contradicted [system-design principles](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/principles.md#control-logic) and hampered evolution, since [adding new enum values breaks backward compatibility](/docs/devel/api_changes). Rather than encouraging clients to infer implicit properties from phases, we intend to explicitly expose the conditions that clients need to monitor. Conditions also have the benefit that it is possible to create some conditions with uniform meaning across all resource types, while still exposing others that are unique to specific resource types. See [#7856](http://issues.k8s.io/7856) for more details and discussion. In condition types, and everywhere else they appear in the API, **`Reason`** is intended to be a one-word, CamelCase representation of the category of cause of the current status, and **`Message`** is intended to be a human-readable phrase or sentence, which may contain specific details of the individual occurrence. `Reason` is intended to be used in concise output, such as one-line `kubectl get` output, and in summarizing occurrences of causes, whereas `Message` is intended to be presented to users in detailed status explanations, such as `kubectl describe` output. @@ -151,7 +151,7 @@ Some resources report the `observedGeneration`, which is the `generation` most r #### References to related objects -References to loosely coupled sets of objects, such as [pods](/{{page.version}}/docs/user-guide/pods) overseen by a [replication controller](/{{page.version}}/docs/user-guide/replication-controller), are usually best referred to using a [label selector](/{{page.version}}/docs/user-guide/labels). In order to ensure that GETs of individual objects remain bounded in time and space, these sets may be queried via separate API queries, but will not be expanded in the referring object's status. +References to loosely coupled sets of objects, such as [pods](/docs/user-guide/pods) overseen by a [replication controller](/docs/user-guide/replication-controller), are usually best referred to using a [label selector](/docs/user-guide/labels). In order to ensure that GETs of individual objects remain bounded in time and space, these sets may be queried via separate API queries, but will not be expanded in the referring object's status. References to specific objects, especially specific resource versions and/or specific fields of those objects, are specified using the `ObjectReference` type (or other types representing strict subsets of it). Unlike partial URLs, the ObjectReference type facilitates flexible defaulting of fields from the referring object or other contextual information. @@ -298,7 +298,7 @@ labels: ## Idempotency -All compatible Kubernetes APIs MUST support "name idempotency" and respond with an HTTP status code 409 when a request is made to POST an object that has the same name as an existing object in the system. See [docs/user-guide/identifiers.md](/{{page.version}}/docs/user-guide/identifiers) for details. +All compatible Kubernetes APIs MUST support "name idempotency" and respond with an HTTP status code 409 when a request is made to POST an object that has the same name as an existing object in the system. See [docs/user-guide/identifiers.md](/docs/user-guide/identifiers) for details. Names generated by the system may be requested using `metadata.generateName`. GenerateName indicates that the name should be made unique by the server prior to persisting it. A non-empty value for the field indicates the name will be made unique (and the name returned to the client will be different than the name passed). The value of this field will be combined with a unique suffix on the server if the Name field has not been provided. The provided value must be valid within the rules for Name, and may be truncated by the length of the suffix required to make the value unique on the server. If this field is specified, and Name is not present, the server will NOT return a 409 if the generated name exists - instead, it will either return 201 Created or 504 with Reason `ServerTimeout` indicating a unique name could not be found in the time allotted, and the client should retry (optionally after the time indicated in the Retry-After header). @@ -637,7 +637,7 @@ However, we should support conveniences for common cases by default. For example If the user wants to apply additional labels to the pods that it doesn't select upon, such as to facilitate adoption of pods or in the expectation that some label values will change, they can set the selector to a subset of the pod labels. Similarly, the RC's labels could be initialized to a subset of the pod template's labels, or could include additional/different labels. -For disciplined users managing resources within their own namespaces, it's not that hard to consistently apply schemas that ensure uniqueness. One just needs to ensure that at least one value of some label key in common differs compared to all other comparable resources. We could/should provide a verification tool to check that. However, development of conventions similar to the examples in [Labels](/{{page.version}}/docs/user-guide/labels) make uniqueness straightforward. Furthermore, relatively narrowly used namespaces (e.g., per environment, per application) can be used to reduce the set of resources that could potentially cause overlap. +For disciplined users managing resources within their own namespaces, it's not that hard to consistently apply schemas that ensure uniqueness. One just needs to ensure that at least one value of some label key in common differs compared to all other comparable resources. We could/should provide a verification tool to check that. However, development of conventions similar to the examples in [Labels](/docs/user-guide/labels) make uniqueness straightforward. Furthermore, relatively narrowly used namespaces (e.g., per environment, per application) can be used to reduce the set of resources that could potentially cause overlap. In cases where users could be running misc. examples with inconsistent schemas, or where tooling or components need to programmatically generate new objects to be selected, there needs to be a straightforward way to generate unique label sets. A simple way to ensure uniqueness of the set is to ensure uniqueness of a single label value, such as by using a resource name, uid, resource hash, or generation number. diff --git a/v1.1/docs/devel/api_changes.md b/docs/devel/api_changes.md similarity index 98% rename from v1.1/docs/devel/api_changes.md rename to docs/devel/api_changes.md index 907c6d04fc..16da5a8ebd 100644 --- a/v1.1/docs/devel/api_changes.md +++ b/docs/devel/api_changes.md @@ -3,7 +3,7 @@ Before attempting a change to the API, you should familiarize yourself with a number of existing API types and with the [API -conventions](/{{page.version}}/docs/devel/api-conventions). If creating a new API +conventions](/docs/devel/api-conventions). If creating a new API type/resource, we also recommend that you first send a PR containing just a proposal for the new API types, and that you initially target the extensions API (pkg/apis/extensions). @@ -182,7 +182,7 @@ pass (e.g., `heightInInches` from `height`, and vice versa), which runs just pri to conversion. That works fine when the user creates a resource from a hand-written configuration -- clients can write either field and read either field, but what about creation or update from the output of GET, or update via PATCH (see -[In-place updates](/{{page.version}}/docs/user-guide/managing-deployments/#in-place-updates-of-resources))? +[In-place updates](/docs/user-guide/managing-deployments/#in-place-updates-of-resources))? In this case, the two fields will conflict, because only one field would be updated in the case of an old client that was only aware of the old field (e.g., `height`). @@ -252,7 +252,7 @@ Compatibility for experimental or alpha APIs is not strictly required, but breaking compatibility should not be done lightly, as it disrupts all users of the feature. Experimental APIs may be removed. Alpha and beta API versions may be deprecated and eventually removed wholesale, as described in the [versioning document](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/versioning.md). -Document incompatible changes across API versions under the [conversion tips](/{{page.version}}/docs/api/). +Document incompatible changes across API versions under the [conversion tips](/docs/api/). If your change is going to be backward incompatible or might be a breaking change for API consumers, please send an announcement to `kubernetes-dev@googlegroups.com` before @@ -494,7 +494,7 @@ doing! ## Write end-to-end tests -Check out the [E2E docs](/{{page.version}}/docs/devel/e2e-tests) for detailed information about how to write end-to-end +Check out the [E2E docs](/docs/devel/e2e-tests) for detailed information about how to write end-to-end tests for your feature. ## Examples and docs @@ -564,7 +564,7 @@ New feature development proceeds through a series of stages of increasing maturi upgrade may require downtime for anything relying on the new feature, and may require manual conversion of objects to the new version; when manual conversion is necessary, the project will provide documentation on the process (for an example, see [v1 conversion - tips](/{{page.version}}/docs/api/)) + tips](/docs/api/)) - Cluster Reliability: since the feature has e2e tests, enabling the feature via a flag should not create new bugs in unrelated features; because the feature is new, it may have minor bugs - Support: the project commits to complete the feature, in some form, in a subsequent Stable diff --git a/v1.1/docs/devel/automation.md b/docs/devel/automation.md similarity index 100% rename from v1.1/docs/devel/automation.md rename to docs/devel/automation.md diff --git a/v1.1/docs/devel/cherry-picks.md b/docs/devel/cherry-picks.md similarity index 100% rename from v1.1/docs/devel/cherry-picks.md rename to docs/devel/cherry-picks.md diff --git a/v1.1/docs/devel/cli-roadmap.md b/docs/devel/cli-roadmap.md similarity index 100% rename from v1.1/docs/devel/cli-roadmap.md rename to docs/devel/cli-roadmap.md diff --git a/v1.1/docs/devel/client-libraries.md b/docs/devel/client-libraries.md similarity index 100% rename from v1.1/docs/devel/client-libraries.md rename to docs/devel/client-libraries.md diff --git a/v1.2/docs/devel/coding-conventions.md b/docs/devel/coding-conventions.md similarity index 89% rename from v1.2/docs/devel/coding-conventions.md rename to docs/devel/coding-conventions.md index 31e8762a60..1d5f87ef3f 100644 --- a/v1.2/docs/devel/coding-conventions.md +++ b/docs/devel/coding-conventions.md @@ -6,7 +6,7 @@ - https://google-styleguide.googlecode.com/svn/trunk/shell.xml - Ensure that build, release, test, and cluster-management scripts run on OS X - Go - - Ensure your code passes the [presubmit checks](/{{page.version}}/docs/devel/development/#hooks) + - Ensure your code passes the [presubmit checks](/docs/devel/development/#hooks) - [Go Code Review Comments](https://github.com/golang/go/wiki/CodeReviewComments) - [Effective Go](https://golang.org/doc/effective_go) - Comment your code. @@ -23,10 +23,10 @@ - Importers can use a different name if they need to disambiguate. - Locks should be called `lock` and should never be embedded (always `lock sync.Mutex`). When multiple locks are present, give each lock a distinct name following Go conventions - `stateLock`, `mapLock` etc. - API conventions - - [API changes](/{{page.version}}/docs/devel/api_changes) - - [API conventions](/{{page.version}}/docs/devel/api-conventions) - - [Kubectl conventions](/{{page.version}}/docs/devel/kubectl-conventions) - - [Logging conventions](/{{page.version}}/docs/devel/logging) + - [API changes](/docs/devel/api_changes) + - [API conventions](/docs/devel/api-conventions) + - [Kubectl conventions](/docs/devel/kubectl-conventions) + - [Logging conventions](/docs/devel/logging) Testing conventions @@ -45,7 +45,7 @@ Directory and file conventions - Package directories should generally avoid using separators as much as possible (when packages are multiple words, they usually should be in nested subdirectories). - Document directories and filenames should use dashes rather than underscores - Contrived examples that illustrate system features belong in /docs/user-guide or /docs/admin, depending on whether it is a feature primarily intended for users that deploy applications or cluster administrators, respectively. Actual application examples belong in /examples. - - Examples should also illustrate [best practices for using the system](/{{page.version}}/docs/user-guide/config-best-practices) + - Examples should also illustrate [best practices for using the system](/docs/user-guide/config-best-practices) - Third-party code - Third-party Go code is managed using Godeps - Other third-party code belongs in /third_party diff --git a/v1.1/docs/devel/collab.md b/docs/devel/collab.md similarity index 100% rename from v1.1/docs/devel/collab.md rename to docs/devel/collab.md diff --git a/v1.2/docs/devel/developer-guides/vagrant.md b/docs/devel/developer-guides/vagrant.md similarity index 99% rename from v1.2/docs/devel/developer-guides/vagrant.md rename to docs/devel/developer-guides/vagrant.md index a338bf2ac4..2ad83e9214 100644 --- a/v1.2/docs/devel/developer-guides/vagrant.md +++ b/docs/devel/developer-guides/vagrant.md @@ -11,7 +11,7 @@ Running kubernetes with Vagrant (and VirtualBox) is an easy way to run/test/deve 2. [VMWare Fusion](https://www.vmware.com/products/fusion/) version 5 or greater as well as the appropriate [Vagrant VMWare Fusion provider](https://www.vagrantup.com/vmware) 3. [VMWare Workstation](https://www.vmware.com/products/workstation/) version 9 or greater as well as the [Vagrant VMWare Workstation provider](https://www.vagrantup.com/vmware) 4. [Parallels Desktop](https://www.parallels.com/products/desktop/) version 9 or greater as well as the [Vagrant Parallels provider](https://parallels.github.io/vagrant-parallels/) -3. Get or build a [binary release](/{{page.version}}/docs/getting-started-guides/binary_release) +3. Get or build a [binary release](/docs/getting-started-guides/binary_release) ### Setup diff --git a/v1.1/docs/devel/development.md b/docs/devel/development.md similarity index 96% rename from v1.1/docs/devel/development.md rename to docs/devel/development.md index aa9dd687fa..881ae4351a 100644 --- a/v1.1/docs/devel/development.md +++ b/docs/devel/development.md @@ -66,7 +66,7 @@ git push -f origin myfeature 1. Visit https://github.com/$YOUR_GITHUB_USERNAME/kubernetes 2. Click the "Compare and pull request" button next to your "myfeature" branch. -3. Check out the pull request [process](/{{page.version}}/docs/devel/pull-requests) for more details +3. Check out the pull request [process](/docs/devel/pull-requests) for more details ### When to retain commits and when to squash @@ -80,7 +80,7 @@ fixups (e.g. automated doc formatting), use one or more commits for the changes to tooling and a final commit to apply the fixup en masse. This makes reviews much easier. -See [Faster Reviews](/{{page.version}}/docs/devel/faster_reviews) for more details. +See [Faster Reviews](/docs/devel/faster_reviews) for more details. ## godep and dependency management @@ -297,8 +297,8 @@ go run hack/e2e.go -v -ctl='delete pod foobar' ## Conformance testing End-to-end testing, as described above, is for [development -distributions](/{{page.version}}/docs/devel/writing-a-getting-started-guide). A conformance test is used on -a [versioned distro](/{{page.version}}/docs/devel/writing-a-getting-started-guide). +distributions](/docs/devel/writing-a-getting-started-guide). A conformance test is used on +a [versioned distro](/docs/devel/writing-a-getting-started-guide). The conformance test runs a subset of the e2e-tests against a manually-created cluster. It does not require support for up/push/down and other operations. To run a conformance test, you need to know the @@ -308,7 +308,7 @@ See [conformance-test.sh](http://releases.k8s.io/{{page.githubbranch}}/hack/conf ## Testing out flaky tests -[Instructions here](/{{page.version}}/docs/devel/flaky-tests) +[Instructions here](/docs/devel/flaky-tests) ## Regenerating the CLI documentation diff --git a/v1.1/docs/devel/e2e-tests.md b/docs/devel/e2e-tests.md similarity index 100% rename from v1.1/docs/devel/e2e-tests.md rename to docs/devel/e2e-tests.md diff --git a/v1.2/docs/devel/faster_reviews.md b/docs/devel/faster_reviews.md similarity index 97% rename from v1.2/docs/devel/faster_reviews.md rename to docs/devel/faster_reviews.md index 8545d609d7..26d3b9dc81 100644 --- a/v1.2/docs/devel/faster_reviews.md +++ b/docs/devel/faster_reviews.md @@ -23,10 +23,10 @@ Let's talk about how to avoid this. ## 0. Familiarize yourself with project conventions -* [Development guide](/{{page.version}}/docs/devel/development) -* [Coding conventions](/{{page.version}}/docs/devel/coding-conventions) -* [API conventions](/{{page.version}}/docs/devel/api-conventions) -* [Kubectl conventions](/{{page.version}}/docs/devel/kubectl-conventions) +* [Development guide](/docs/devel/development) +* [Coding conventions](/docs/devel/coding-conventions) +* [API conventions](/docs/devel/api-conventions) +* [Kubectl conventions](/docs/devel/kubectl-conventions) ## 1. Don't build a cathedral in one PR diff --git a/v1.1/docs/devel/flaky-tests.md b/docs/devel/flaky-tests.md similarity index 100% rename from v1.1/docs/devel/flaky-tests.md rename to docs/devel/flaky-tests.md diff --git a/v1.1/docs/devel/getting-builds.md b/docs/devel/getting-builds.md similarity index 100% rename from v1.1/docs/devel/getting-builds.md rename to docs/devel/getting-builds.md diff --git a/docs/devel/index.md b/docs/devel/index.md new file mode 100644 index 0000000000..81f3017ac8 --- /dev/null +++ b/docs/devel/index.md @@ -0,0 +1,78 @@ +--- +--- + +The developer guide is for anyone wanting to either write code which directly accesses the +Kubernetes API, or to contribute directly to the Kubernetes project. +It assumes some familiarity with concepts in the [User Guide](/docs/user-guide/) and the [Cluster Admin +Guide](/docs/admin/). + + +## The process of developing and contributing code to the Kubernetes project + +* **On Collaborative Development** ([collab.md](/docs/devel/collab)): Info on pull requests and code reviews. + +* **GitHub Issues** ([issues.md](/docs/devel/issues)): How incoming issues are reviewed and prioritized. + +* **Pull Request Process** ([pull-requests.md](/docs/devel/pull-requests)): When and why pull requests are closed. + +* **Faster PR reviews** ([faster_reviews.md](/docs/devel/faster_reviews)): How to get faster PR reviews. + +* **Getting Recent Builds** ([getting-builds.md](/docs/devel/getting-builds)): How to get recent builds including the latest builds that pass CI. + +* **Automated Tools** ([automation.md](/docs/devel/automation)): Descriptions of the automation that is running on our github repository. + + +## Setting up your dev environment, coding, and debugging + +* **Development Guide** ([development.md](/docs/devel/development)): Setting up your development environment. + +* **Hunting flaky tests** ([flaky-tests.md](/docs/devel/flaky-tests)): We have a goal of 99.9% flake free tests. + Here's how to run your tests many times. + +* **Logging Conventions** ([logging.md](/docs/devel/logging)]: Glog levels. + +* **Profiling Kubernetes** ([profiling.md](/docs/devel/profiling)): How to plug in go pprof profiler to Kubernetes. + +* **Instrumenting Kubernetes with a new metric** + ([instrumentation.md](/docs/devel/instrumentation)): How to add a new metrics to the + Kubernetes code base. + +* **Coding Conventions** ([coding-conventions.md](/docs/devel/coding-conventions)): + Coding style advice for contributors. + + +## Developing against the Kubernetes API + +* API objects are explained at [http://kubernetes.io/third_party/swagger-ui/](http://kubernetes.io/third_party/swagger-ui/). + +* **Annotations** ([docs/user-guide/annotations.md](/docs/user-guide/annotations)): are for attaching arbitrary non-identifying metadata to objects. + Programs that automate Kubernetes objects may use annotations to store small amounts of their state. + +* **API Conventions** ([api-conventions.md](/docs/devel/api-conventions)): + Defining the verbs and resources used in the Kubernetes API. + +* **API Client Libraries** ([client-libraries.md](/docs/devel/client-libraries)): + A list of existing client libraries, both supported and user-contributed. + + +## Writing plugins + +* **Authentication Plugins** ([docs/admin/authentication.md](/docs/admin/authentication)): + The current and planned states of authentication tokens. + +* **Authorization Plugins** ([docs/admin/authorization.md](/docs/admin/authorization)): + Authorization applies to all HTTP requests on the main apiserver port. + This doc explains the available authorization implementations. + +* **Admission Control Plugins** ([admission_control](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/admission_control.md)) + + +## Building releases + +* **Making release notes** ([making-release-notes.md](/docs/devel/making-release-notes)): Generating release nodes for a new release. + +* **Releasing Kubernetes** ([releasing.md](/docs/devel/releasing)): How to create a Kubernetes release (as in version) + and how the version information gets embedded into the built binaries. + + + diff --git a/v1.1/docs/devel/instrumentation.md b/docs/devel/instrumentation.md similarity index 100% rename from v1.1/docs/devel/instrumentation.md rename to docs/devel/instrumentation.md diff --git a/v1.1/docs/devel/issues.md b/docs/devel/issues.md similarity index 100% rename from v1.1/docs/devel/issues.md rename to docs/devel/issues.md diff --git a/v1.1/docs/devel/kubectl-conventions.md b/docs/devel/kubectl-conventions.md similarity index 100% rename from v1.1/docs/devel/kubectl-conventions.md rename to docs/devel/kubectl-conventions.md diff --git a/v1.1/docs/devel/logging.md b/docs/devel/logging.md similarity index 100% rename from v1.1/docs/devel/logging.md rename to docs/devel/logging.md diff --git a/v1.1/docs/devel/making-release-notes.md b/docs/devel/making-release-notes.md similarity index 100% rename from v1.1/docs/devel/making-release-notes.md rename to docs/devel/making-release-notes.md diff --git a/v1.1/docs/devel/profiling.md b/docs/devel/profiling.md similarity index 100% rename from v1.1/docs/devel/profiling.md rename to docs/devel/profiling.md diff --git a/v1.2/docs/devel/pull-requests.md b/docs/devel/pull-requests.md similarity index 96% rename from v1.2/docs/devel/pull-requests.md rename to docs/devel/pull-requests.md index 9615079d13..fc7053f60f 100644 --- a/v1.2/docs/devel/pull-requests.md +++ b/docs/devel/pull-requests.md @@ -30,7 +30,7 @@ Additionally, for infrequent or new contributors, we require the on call to appl ## Automation We use a variety of automation to manage pull requests. This automation is described in detail -[elsewhere.](/{{page.version}}/docs/devel/automation) +[elsewhere.](/docs/devel/automation) diff --git a/v1.2/docs/devel/releasing.md b/docs/devel/releasing.md similarity index 98% rename from v1.2/docs/devel/releasing.md rename to docs/devel/releasing.md index f527616ec7..35a63e5474 100644 --- a/v1.2/docs/devel/releasing.md +++ b/docs/devel/releasing.md @@ -87,7 +87,7 @@ In your git repo (you still have `${VER}` set from above right?): #### Writing Release Notes -[This helpful guide](/{{page.version}}/docs/devel/making-release-notes) describes how to write release +[This helpful guide](/docs/devel/making-release-notes) describes how to write release notes for a major/minor release. In the release template on GitHub, leave the last PR number that the tool finds for the `.0` release, so the next releaser doesn't have to hunt. @@ -99,7 +99,7 @@ doesn't have to hunt. We cut `vX.Y.Z` releases from the `release-vX.Y` branch after all cherry picks to the branch have been resolved. You should ensure all outstanding cherry picks have been reviewed and merged and the branch validated on Jenkins (validation -TBD). See the [Cherry Picks](/{{page.version}}/docs/devel/cherry-picks) for more information on how to +TBD). See the [Cherry Picks](/docs/devel/cherry-picks) for more information on how to manage cherry picks prior to cutting the release. #### Tagging and Merging diff --git a/v1.1/docs/devel/scheduler.md b/docs/devel/scheduler.md similarity index 100% rename from v1.1/docs/devel/scheduler.md rename to docs/devel/scheduler.md diff --git a/v1.2/docs/devel/scheduler_algorithm.md b/docs/devel/scheduler_algorithm.md similarity index 89% rename from v1.2/docs/devel/scheduler_algorithm.md rename to docs/devel/scheduler_algorithm.md index d1207f98e3..8360092d4e 100755 --- a/v1.2/docs/devel/scheduler_algorithm.md +++ b/docs/devel/scheduler_algorithm.md @@ -1,7 +1,7 @@ --- --- -For each unscheduled Pod, the Kubernetes scheduler tries to find a node across the cluster according to a set of rules. A general introduction to the Kubernetes scheduler can be found at [scheduler.md](/{{page.version}}/docs/devel/scheduler). In this document, the algorithm of how to select a node for the Pod is explained. There are two steps before a destination node of a Pod is chosen. The first step is filtering all the nodes and the second is ranking the remaining nodes to find a best fit for the Pod. +For each unscheduled Pod, the Kubernetes scheduler tries to find a node across the cluster according to a set of rules. A general introduction to the Kubernetes scheduler can be found at [scheduler.md](/docs/devel/scheduler). In this document, the algorithm of how to select a node for the Pod is explained. There are two steps before a destination node of a Pod is chosen. The first step is filtering all the nodes and the second is ranking the remaining nodes to find a best fit for the Pod. ## Filtering the nodes @@ -11,7 +11,7 @@ The purpose of filtering the nodes is to filter out the nodes that do not meet c - `PodFitsResources`: Check if the free resource (CPU and Memory) meets the requirement of the Pod. The free resource is measured by the capacity minus the sum of requests of all Pods on the node. To learn more about the resource QoS in Kubernetes, please check [QoS proposal](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/proposals/resource-qos.md). - `PodFitsHostPorts`: Check if any HostPort required by the Pod is already occupied on the node. - `PodFitsHost`: Filter out all nodes except the one specified in the PodSpec's NodeName field. -- `PodSelectorMatches`: Check if the labels of the node match the labels specified in the Pod's `nodeSelector` field ([Here](/{{page.version}}/docs/user-guide/node-selection/) is an example of how to use `nodeSelector` field). +- `PodSelectorMatches`: Check if the labels of the node match the labels specified in the Pod's `nodeSelector` field ([Here](/docs/user-guide/node-selection/) is an example of how to use `nodeSelector` field). - `CheckNodeLabelPresence`: Check if all the specified labels exist on a node or not, regardless of the value. The details of the above predicates can be found in [plugin/pkg/scheduler/algorithm/predicates/predicates.go](http://releases.k8s.io/{{page.githubbranch}}/plugin/pkg/scheduler/algorithm/predicates/predicates.go). All predicates mentioned above can be used in combination to perform a sophisticated filtering policy. Kubernetes uses some, but not all, of these predicates by default. You can see which ones are used by default in [plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go](http://releases.k8s.io/{{page.githubbranch}}/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go). @@ -32,7 +32,7 @@ Currently, Kubernetes scheduler provides some practical priority functions, incl - `CalculateSpreadPriority`: Spread Pods by minimizing the number of Pods belonging to the same service on the same node. - `CalculateAntiAffinityPriority`: Spread Pods by minimizing the number of Pods belonging to the same service on nodes with the same value for a particular label. -The details of the above priority functions can be found in [plugin/pkg/scheduler/algorithm/priorities](http://releases.k8s.io/{{page.githubbranch}}/plugin/pkg/scheduler/algorithm/priorities/). Kubernetes uses some, but not all, of these priority functions by default. You can see which ones are used by default in [plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go](http://releases.k8s.io/{{page.githubbranch}}/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go). Similar as predicates, you can combine the above priority functions and assign weight factors (positive number) to them as you want (check [scheduler.md](/{{page.version}}/docs/devel/scheduler) for how to customize). +The details of the above priority functions can be found in [plugin/pkg/scheduler/algorithm/priorities](http://releases.k8s.io/{{page.githubbranch}}/plugin/pkg/scheduler/algorithm/priorities/). Kubernetes uses some, but not all, of these priority functions by default. You can see which ones are used by default in [plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go](http://releases.k8s.io/{{page.githubbranch}}/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go). Similar as predicates, you can combine the above priority functions and assign weight factors (positive number) to them as you want (check [scheduler.md](/docs/devel/scheduler) for how to customize). diff --git a/v1.1/docs/devel/writing-a-getting-started-guide.md b/docs/devel/writing-a-getting-started-guide.md similarity index 92% rename from v1.1/docs/devel/writing-a-getting-started-guide.md rename to docs/devel/writing-a-getting-started-guide.md index 65e615eb9a..4741bbf7d3 100644 --- a/v1.1/docs/devel/writing-a-getting-started-guide.md +++ b/docs/devel/writing-a-getting-started-guide.md @@ -12,7 +12,7 @@ A guide refers to scripts, Configuration Management files, and/or binary assets the combination of all these things needed to run on a particular type of infrastructure a **distro**. -[The Matrix](/{{page.version}}/docs/getting-started-guides/) lists the distros. If there is already a guide +[The Matrix](/docs/getting-started-guides/) lists the distros. If there is already a guide which is similar to the one you have planned, consider improving that one. @@ -35,9 +35,9 @@ These guidelines say *what* to do. See the Rationale section for *why*. search for uses of flags by guides. - We may ask that you host binary assets or large amounts of code in our `contrib` directory or on your own repo. - - Add or update a row in [The Matrix](/{{page.version}}/docs/getting-started-guides/). + - Add or update a row in [The Matrix](/docs/getting-started-guides/). - State the binary version of Kubernetes that you tested clearly in your Guide doc. - - Setup a cluster and run the [conformance test](/{{page.version}}/docs/devel/development/#conformance-testing) against it, and report the + - Setup a cluster and run the [conformance test](/docs/devel/development/#conformance-testing) against it, and report the results in your PR. - Versioned distros should typically not modify or add code in `cluster/`. That is just scripts for developer distros. @@ -46,7 +46,7 @@ These guidelines say *what* to do. See the Rationale section for *why*. If you have a cluster partially working, but doing all the above steps seems like too much work, we still want to hear from you. We suggest you write a blog post or a Gist, and we will link to it on our wiki page. -Just file an issue or chat us on [Slack](/{{page.version}}/docs/troubleshooting/#slack) and one of the committers will link to it from the wiki. +Just file an issue or chat us on [Slack](/docs/troubleshooting/#slack) and one of the committers will link to it from the wiki. ## Development Distro Guidelines diff --git a/v1.1/editdocs.md b/docs/editdocs.md similarity index 100% rename from v1.1/editdocs.md rename to docs/editdocs.md diff --git a/v1.2/docs/getting-started-guides/aws.md b/docs/getting-started-guides/aws.md similarity index 85% rename from v1.2/docs/getting-started-guides/aws.md rename to docs/getting-started-guides/aws.md index 9f0429f438..fe055ed1a1 100644 --- a/v1.2/docs/getting-started-guides/aws.md +++ b/docs/getting-started-guides/aws.md @@ -56,7 +56,7 @@ NOTE: If using an existing keypair named "kubernetes" then you must set the `AWS ### Alternatives -A contributed [example](/{{page.version}}/docs/getting-started-guides/coreos/coreos_multinode_cluster) allows you to setup a Kubernetes cluster based on [CoreOS](http://www.coreos.com), using +A contributed [example](/docs/getting-started-guides/coreos/coreos_multinode_cluster) allows you to setup a Kubernetes cluster based on [CoreOS](http://www.coreos.com), using EC2 with user data (cloud-config). ## Getting started with your cluster @@ -75,14 +75,14 @@ export PATH=/platforms/darwin/amd64:$PATH export PATH=/platforms/linux/amd64:$PATH ``` -An up-to-date documentation page for this tool is available here: [kubectl manual](/{{page.version}}/docs/user-guide/kubectl/kubectl) +An up-to-date documentation page for this tool is available here: [kubectl manual](/docs/user-guide/kubectl/kubectl) By default, `kubectl` will use the `kubeconfig` file generated during the cluster startup for authenticating against the API. -For more information, please read [kubeconfig files](/{{page.version}}/docs/user-guide/kubeconfig-file) +For more information, please read [kubeconfig files](/docs/user-guide/kubeconfig-file) ### Examples -See [a simple nginx example](/{{page.version}}/docs/user-guide/simple-nginx) to try out your new cluster. +See [a simple nginx example](/docs/user-guide/simple-nginx) to try out your new cluster. The "Guestbook" application is another popular example to get started with Kubernetes: [guestbook example](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/guestbook/) @@ -99,5 +99,5 @@ cluster/kube-down.sh ## Further reading -Please see the [Kubernetes docs](/{{page.version}}/docs/) for more details on administering +Please see the [Kubernetes docs](/docs/) for more details on administering and using a Kubernetes cluster. \ No newline at end of file diff --git a/docs/getting-started-guides/azure.md b/docs/getting-started-guides/azure.md new file mode 100644 index 0000000000..b45e438ca7 --- /dev/null +++ b/docs/getting-started-guides/azure.md @@ -0,0 +1,10 @@ +--- +--- + + +## Getting started on Microsoft Azure + +Checkout the [coreos azure getting started guide](/docs/getting-started-guides/coreos/azure/) + + + diff --git a/v1.1/docs/getting-started-guides/binary_release.md b/docs/getting-started-guides/binary_release.md similarity index 100% rename from v1.1/docs/getting-started-guides/binary_release.md rename to docs/getting-started-guides/binary_release.md diff --git a/v1.1/docs/getting-started-guides/centos/centos_manual_config.md b/docs/getting-started-guides/centos/centos_manual_config.md similarity index 91% rename from v1.1/docs/getting-started-guides/centos/centos_manual_config.md rename to docs/getting-started-guides/centos/centos_manual_config.md index 9c7b2638ab..be5892f5a0 100644 --- a/v1.1/docs/getting-started-guides/centos/centos_manual_config.md +++ b/docs/getting-started-guides/centos/centos_manual_config.md @@ -12,7 +12,7 @@ You need two machines with CentOS installed on them. This is a getting started guide for CentOS. It is a manual configuration so you understand all the underlying packages / services / ports, etc... -This guide will only get ONE node working. Multiple nodes requires a functional [networking configuration](/{{page.version}}/docs/admin/networking) done outside of kubernetes. Although the additional Kubernetes configuration requirements should be obvious. +This guide will only get ONE node working. Multiple nodes requires a functional [networking configuration](/docs/admin/networking) done outside of kubernetes. Although the additional Kubernetes configuration requirements should be obvious. The Kubernetes package provides a few services: kube-apiserver, kube-scheduler, kube-controller-manager, kubelet, kube-proxy. These services are managed by systemd and the configuration resides in a central location: /etc/kubernetes. We will break the services up between the hosts. The first host, centos-master, will be the Kubernetes master. This host will run the kube-apiserver, kube-controller-manager, and kube-scheduler. In addition, the master will also run _etcd_. The remaining host, centos-minion will be the node and run kubelet, proxy, cadvisor and docker. @@ -168,4 +168,4 @@ centos-minion Ready **The cluster should be running! Launch a test pod.** -You should have a functional cluster, check out [101](/{{page.version}}/docs/user-guide/walkthrough/)! \ No newline at end of file +You should have a functional cluster, check out [101](/docs/user-guide/walkthrough/)! \ No newline at end of file diff --git a/v1.1/docs/getting-started-guides/cloudstack.md b/docs/getting-started-guides/cloudstack.md similarity index 96% rename from v1.1/docs/getting-started-guides/cloudstack.md rename to docs/getting-started-guides/cloudstack.md index b70bd0f850..5e1b9af4c0 100644 --- a/v1.1/docs/getting-started-guides/cloudstack.md +++ b/docs/getting-started-guides/cloudstack.md @@ -6,7 +6,7 @@ CloudStack is a software to build public and private clouds based on hardware vi [CoreOS](http://coreos.com) templates for CloudStack are built [nightly](http://stable.release.core-os.net/amd64-usr/current/). CloudStack operators need to [register](http://docs.cloudstack.apache.org/projects/cloudstack-administration/en/latest/templates) this template in their cloud before proceeding with these Kubernetes deployment instructions. This guide uses an [Ansible playbook](https://github.com/runseb/ansible-kubernetes). -This is a completely automated, a single playbook deploys Kubernetes based on the coreOS [instructions](/{{page.version}}/docs/getting-started-guides/coreos/coreos_multinode_cluster). +This is a completely automated, a single playbook deploys Kubernetes based on the coreOS [instructions](/docs/getting-started-guides/coreos/coreos_multinode_cluster). This [Ansible](http://ansibleworks.com) playbook deploys Kubernetes on a CloudStack based Cloud using CoreOS images. The playbook, creates an ssh key pair, creates a security group and associated rules and finally starts coreOS instances configured via cloud-init. diff --git a/v1.1/docs/getting-started-guides/coreos.md b/docs/getting-started-guides/coreos.md similarity index 93% rename from v1.1/docs/getting-started-guides/coreos.md rename to docs/getting-started-guides/coreos.md index 82cba8d24b..0f3136a85b 100644 --- a/v1.1/docs/getting-started-guides/coreos.md +++ b/docs/getting-started-guides/coreos.md @@ -30,7 +30,7 @@ A generic guide to setting up an HA cluster on any cloud or bare metal, with ful These guides are maintained by community members, cover specific platforms and use cases, and experiment with different ways of configuring Kubernetes on CoreOS. -[**Multi-node Cluster**](/{{page.version}}/docs/getting-started-guides/coreos/coreos_multinode_cluster) +[**Multi-node Cluster**](/docs/getting-started-guides/coreos/coreos_multinode_cluster) Set up a single master, multi-worker cluster on your choice of platform: AWS, GCE, or VMware Fusion. @@ -60,7 +60,7 @@ Guide to running a single master, multi-worker cluster controlled by an OS X men

-[**Resizable multi-node cluster on Azure with Weave**](/{{page.version}}/docs/getting-started-guides/coreos/azure/) +[**Resizable multi-node cluster on Azure with Weave**](/docs/getting-started-guides/coreos/azure/) Guide to running an HA etcd cluster with a single master on Azure. Uses the Azure node.js CLI to resize the cluster. diff --git a/v1.1/docs/getting-started-guides/coreos/azure/.gitignore b/docs/getting-started-guides/coreos/azure/.gitignore similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/azure/.gitignore rename to docs/getting-started-guides/coreos/azure/.gitignore diff --git a/v1.1/docs/getting-started-guides/coreos/azure/addons/skydns-rc.yaml b/docs/getting-started-guides/coreos/azure/addons/skydns-rc.yaml similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/azure/addons/skydns-rc.yaml rename to docs/getting-started-guides/coreos/azure/addons/skydns-rc.yaml diff --git a/v1.1/docs/getting-started-guides/coreos/azure/addons/skydns-svc.yaml b/docs/getting-started-guides/coreos/azure/addons/skydns-svc.yaml similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/azure/addons/skydns-svc.yaml rename to docs/getting-started-guides/coreos/azure/addons/skydns-svc.yaml diff --git a/v1.1/docs/getting-started-guides/coreos/azure/azure-login.js b/docs/getting-started-guides/coreos/azure/azure-login.js similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/azure/azure-login.js rename to docs/getting-started-guides/coreos/azure/azure-login.js diff --git a/v1.1/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-etcd-node-template.yml b/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-etcd-node-template.yml similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-etcd-node-template.yml rename to docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-etcd-node-template.yml diff --git a/v1.1/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml b/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml rename to docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml diff --git a/v1.1/docs/getting-started-guides/coreos/azure/create-kubernetes-cluster.js b/docs/getting-started-guides/coreos/azure/create-kubernetes-cluster.js similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/azure/create-kubernetes-cluster.js rename to docs/getting-started-guides/coreos/azure/create-kubernetes-cluster.js diff --git a/v1.1/docs/getting-started-guides/coreos/azure/destroy-cluster.js b/docs/getting-started-guides/coreos/azure/destroy-cluster.js similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/azure/destroy-cluster.js rename to docs/getting-started-guides/coreos/azure/destroy-cluster.js diff --git a/v1.1/docs/getting-started-guides/coreos/azure/expose_guestbook_app_port.sh b/docs/getting-started-guides/coreos/azure/expose_guestbook_app_port.sh similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/azure/expose_guestbook_app_port.sh rename to docs/getting-started-guides/coreos/azure/expose_guestbook_app_port.sh diff --git a/v1.1/docs/getting-started-guides/coreos/azure/index.md b/docs/getting-started-guides/coreos/azure/index.md similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/azure/index.md rename to docs/getting-started-guides/coreos/azure/index.md diff --git a/v1.1/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js b/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js rename to docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js diff --git a/v1.1/docs/getting-started-guides/coreos/azure/lib/cloud_config.js b/docs/getting-started-guides/coreos/azure/lib/cloud_config.js similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/azure/lib/cloud_config.js rename to docs/getting-started-guides/coreos/azure/lib/cloud_config.js diff --git a/v1.1/docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js b/docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js rename to docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js diff --git a/v1.1/docs/getting-started-guides/coreos/azure/lib/util.js b/docs/getting-started-guides/coreos/azure/lib/util.js similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/azure/lib/util.js rename to docs/getting-started-guides/coreos/azure/lib/util.js diff --git a/v1.1/docs/getting-started-guides/coreos/azure/package.json b/docs/getting-started-guides/coreos/azure/package.json similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/azure/package.json rename to docs/getting-started-guides/coreos/azure/package.json diff --git a/v1.1/docs/getting-started-guides/coreos/azure/scale-kubernetes-cluster.js b/docs/getting-started-guides/coreos/azure/scale-kubernetes-cluster.js similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/azure/scale-kubernetes-cluster.js rename to docs/getting-started-guides/coreos/azure/scale-kubernetes-cluster.js diff --git a/v1.1/docs/getting-started-guides/coreos/bare_metal_calico.md b/docs/getting-started-guides/coreos/bare_metal_calico.md similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/bare_metal_calico.md rename to docs/getting-started-guides/coreos/bare_metal_calico.md diff --git a/v1.2/docs/getting-started-guides/coreos/bare_metal_offline.md b/docs/getting-started-guides/coreos/bare_metal_offline.md similarity index 98% rename from v1.2/docs/getting-started-guides/coreos/bare_metal_offline.md rename to docs/getting-started-guides/coreos/bare_metal_offline.md index b74b83cb07..f80f90412c 100644 --- a/v1.2/docs/getting-started-guides/coreos/bare_metal_offline.md +++ b/docs/getting-started-guides/coreos/bare_metal_offline.md @@ -228,7 +228,7 @@ Now for the good stuff! The following config files are tailored for the OFFLINE version of a Kubernetes deployment. -These are based on the work found here: [master.yml](/{{page.version}}/docs/getting-started-guides/coreos/cloud-configs/master.yaml), [node.yml](/{{page.version}}/docs/getting-started-guides/coreos/cloud-configs/node.yaml) +These are based on the work found here: [master.yml](/docs/getting-started-guides/coreos/cloud-configs/master.yaml), [node.yml](/docs/getting-started-guides/coreos/cloud-configs/node.yaml) To make the setup work, you need to replace a few placeholders: @@ -646,7 +646,7 @@ Reboot these servers to get the images PXEd and ready for running containers! Now that the CoreOS with Kubernetes installed is up and running lets spin up some Kubernetes pods to demonstrate the system. -See [a simple nginx example](/{{page.version}}/docs/user-guide/simple-nginx) to try out your new cluster. +See [a simple nginx example](/docs/user-guide/simple-nginx) to try out your new cluster. For more complete applications, please look in the [examples directory](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/). diff --git a/v1.1/docs/getting-started-guides/coreos/cloud-configs/master.yaml b/docs/getting-started-guides/coreos/cloud-configs/master.yaml similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/cloud-configs/master.yaml rename to docs/getting-started-guides/coreos/cloud-configs/master.yaml diff --git a/v1.1/docs/getting-started-guides/coreos/cloud-configs/node.yaml b/docs/getting-started-guides/coreos/cloud-configs/node.yaml similarity index 100% rename from v1.1/docs/getting-started-guides/coreos/cloud-configs/node.yaml rename to docs/getting-started-guides/coreos/cloud-configs/node.yaml diff --git a/v1.2/docs/getting-started-guides/coreos/coreos_multinode_cluster.md b/docs/getting-started-guides/coreos/coreos_multinode_cluster.md similarity index 95% rename from v1.2/docs/getting-started-guides/coreos/coreos_multinode_cluster.md rename to docs/getting-started-guides/coreos/coreos_multinode_cluster.md index b86f435e6b..e08345123a 100644 --- a/v1.2/docs/getting-started-guides/coreos/coreos_multinode_cluster.md +++ b/docs/getting-started-guides/coreos/coreos_multinode_cluster.md @@ -1,7 +1,7 @@ --- --- -Use the [master.yaml](/{{page.version}}/docs/getting-started-guides/coreos/cloud-configs/master.yaml) and [node.yaml](/{{page.version}}/docs/getting-started-guides/coreos/cloud-configs/node.yaml) cloud-configs to provision a multi-node Kubernetes cluster. +Use the [master.yaml](/docs/getting-started-guides/coreos/cloud-configs/master.yaml) and [node.yaml](/docs/getting-started-guides/coreos/cloud-configs/node.yaml) cloud-configs to provision a multi-node Kubernetes cluster. > **Attention**: This requires at least CoreOS version **[695.0.0][coreos695]**, which includes `etcd2`. diff --git a/v1.1/docs/getting-started-guides/dcos.md b/docs/getting-started-guides/dcos.md similarity index 97% rename from v1.1/docs/getting-started-guides/dcos.md rename to docs/getting-started-guides/dcos.md index bc2f3441a8..efc64002b7 100644 --- a/v1.1/docs/getting-started-guides/dcos.md +++ b/docs/getting-started-guides/dcos.md @@ -105,7 +105,7 @@ $ dcos kubectl get pods --namespace=kube-system Names and ages may vary. -Now that Kubernetes is installed on DCOS, you may wish to explore the [Kubernetes Examples](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/) or the [Kubernetes User Guide](/{{page.version}}/docs/user-guide/). +Now that Kubernetes is installed on DCOS, you may wish to explore the [Kubernetes Examples](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/) or the [Kubernetes User Guide](/docs/user-guide/). ## Uninstall diff --git a/v1.2/docs/getting-started-guides/docker-multinode.md b/docs/getting-started-guides/docker-multinode.md similarity index 71% rename from v1.2/docs/getting-started-guides/docker-multinode.md rename to docs/getting-started-guides/docker-multinode.md index d2c55f81e0..d42e1d5970 100644 --- a/v1.2/docs/getting-started-guides/docker-multinode.md +++ b/docs/getting-started-guides/docker-multinode.md @@ -10,7 +10,7 @@ Here's a diagram of what the final result will look like: ![Kubernetes Single Node on Docker](/images/docs/k8s-docker.png) _Note_: -These instructions are somewhat significantly more advanced than the [single node](/{{page.version}}/docs/getting-started-guides/docker) instructions. If you are +These instructions are somewhat significantly more advanced than the [single node](/docs/getting-started-guides/docker) instructions. If you are interested in just starting to explore Kubernetes, we recommend that you start there. _Note_: @@ -46,7 +46,7 @@ Otherwise, we'll use latest `hyperkube` image as default k8s version. The first step in the process is to initialize the master node. -Clone the Kubernetes repo, and run [master.sh](/{{page.version}}/docs/getting-started-guides/docker-multinode/master.sh) on the master machine with root: +Clone the Kubernetes repo, and run [master.sh](/docs/getting-started-guides/docker-multinode/master.sh) on the master machine with root: ```shell cd kubernetes/docs/getting-started-guides/docker-multinode/ @@ -55,13 +55,13 @@ cd kubernetes/docs/getting-started-guides/docker-multinode/ `Master done!` ``` -See [here](/{{page.version}}/docs/getting-started-guides/docker-multinode/master) for detailed instructions explanation. +See [here](/docs/getting-started-guides/docker-multinode/master) for detailed instructions explanation. ## Adding a worker node Once your master is up and running you can add one or more workers on different machines. -Clone the Kubernetes repo, and run [worker.sh](/{{page.version}}/docs/getting-started-guides/docker-multinode/worker.sh) on the worker machine with root: +Clone the Kubernetes repo, and run [worker.sh](/docs/getting-started-guides/docker-multinode/worker.sh) on the worker machine with root: ```shell export MASTER_IP= @@ -71,14 +71,14 @@ cd kubernetes/docs/getting-started-guides/docker-multinode/ `Worker done!` ```` -See [here](/{{page.version}}/docs/getting-started-guides/docker-multinode/worker) for detailed instructions explanation. +See [here](/docs/getting-started-guides/docker-multinode/worker) for detailed instructions explanation. ## Deploy a DNS -See [here](/{{page.version}}/docs/getting-started-guides/docker-multinode/deployDNS) for instructions. +See [here](/docs/getting-started-guides/docker-multinode/deployDNS) for instructions. ## Testing your cluster -Once your cluster has been created you can [test it out](/{{page.version}}/docs/getting-started-guides/docker-multinode/testing) +Once your cluster has been created you can [test it out](/docs/getting-started-guides/docker-multinode/testing) For more complete applications, please look in the [examples directory](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/) diff --git a/v1.2/docs/getting-started-guides/docker-multinode/deployDNS.md b/docs/getting-started-guides/docker-multinode/deployDNS.md similarity index 86% rename from v1.2/docs/getting-started-guides/docker-multinode/deployDNS.md rename to docs/getting-started-guides/docker-multinode/deployDNS.md index 896df170f7..9bd738ea13 100644 --- a/v1.2/docs/getting-started-guides/docker-multinode/deployDNS.md +++ b/docs/getting-started-guides/docker-multinode/deployDNS.md @@ -5,9 +5,9 @@ First of all, download the template dns rc and svc file from -[skydns-rc template](/{{page.version}}/docs/getting-started-guides/docker-multinode/skydns-rc.yaml.in) +[skydns-rc template](/docs/getting-started-guides/docker-multinode/skydns-rc.yaml.in) -[skydns-svc template](/{{page.version}}/docs/getting-started-guides/docker-multinode/skydns-svc.yaml.in) +[skydns-svc template](/docs/getting-started-guides/docker-multinode/skydns-svc.yaml.in) ### Set env diff --git a/v1.1/docs/getting-started-guides/docker-multinode/master.md b/docs/getting-started-guides/docker-multinode/master.md similarity index 95% rename from v1.1/docs/getting-started-guides/docker-multinode/master.md rename to docs/getting-started-guides/docker-multinode/master.md index c62fb2bc2b..5867a0de01 100644 --- a/v1.1/docs/getting-started-guides/docker-multinode/master.md +++ b/docs/getting-started-guides/docker-multinode/master.md @@ -171,9 +171,9 @@ NAME LABELS STATUS ``` If the status of the node is `NotReady` or `Unknown` please check that all of the containers you created are successfully running. -If all else fails, ask questions on [Slack](/{{page.version}}/docs/troubleshooting/#slack). +If all else fails, ask questions on [Slack](/docs/troubleshooting/#slack). ### Next steps -Move on to [adding one or more workers](/{{page.version}}/docs/getting-started-guides/docker-multinode/worker) or [deploy a dns](/{{page.version}}/docs/getting-started-guides/docker-multinode/deployDNS) \ No newline at end of file +Move on to [adding one or more workers](/docs/getting-started-guides/docker-multinode/worker) or [deploy a dns](/docs/getting-started-guides/docker-multinode/deployDNS) \ No newline at end of file diff --git a/v1.1/docs/getting-started-guides/docker-multinode/master.sh b/docs/getting-started-guides/docker-multinode/master.sh similarity index 100% rename from v1.1/docs/getting-started-guides/docker-multinode/master.sh rename to docs/getting-started-guides/docker-multinode/master.sh diff --git a/v1.1/docs/getting-started-guides/docker-multinode/skydns-rc.yaml.in b/docs/getting-started-guides/docker-multinode/skydns-rc.yaml.in similarity index 100% rename from v1.1/docs/getting-started-guides/docker-multinode/skydns-rc.yaml.in rename to docs/getting-started-guides/docker-multinode/skydns-rc.yaml.in diff --git a/v1.1/docs/getting-started-guides/docker-multinode/skydns-svc.yaml.in b/docs/getting-started-guides/docker-multinode/skydns-svc.yaml.in similarity index 100% rename from v1.1/docs/getting-started-guides/docker-multinode/skydns-svc.yaml.in rename to docs/getting-started-guides/docker-multinode/skydns-svc.yaml.in diff --git a/v1.1/docs/getting-started-guides/docker-multinode/testing.md b/docs/getting-started-guides/docker-multinode/testing.md similarity index 94% rename from v1.1/docs/getting-started-guides/docker-multinode/testing.md rename to docs/getting-started-guides/docker-multinode/testing.md index 0dc593d6a0..708ecea7a5 100644 --- a/v1.1/docs/getting-started-guides/docker-multinode/testing.md +++ b/docs/getting-started-guides/docker-multinode/testing.md @@ -15,7 +15,7 @@ NAME LABELS STATUS 127.0.0.1 kubernetes.io/hostname=127.0.0.1 Ready ``` -If the status of any node is `Unknown` or `NotReady` your cluster is broken, double check that all containers are running properly, and if all else fails, contact us on [Slack](/{{page.version}}/docs/troubleshooting/#slack). +If the status of any node is `Unknown` or `NotReady` your cluster is broken, double check that all containers are running properly, and if all else fails, contact us on [Slack](/docs/troubleshooting/#slack). ### Run an application diff --git a/v1.2/docs/getting-started-guides/docker-multinode/worker.md b/docs/getting-started-guides/docker-multinode/worker.md similarity index 94% rename from v1.2/docs/getting-started-guides/docker-multinode/worker.md rename to docs/getting-started-guides/docker-multinode/worker.md index be2d42acee..4a0acd58f6 100644 --- a/v1.2/docs/getting-started-guides/docker-multinode/worker.md +++ b/docs/getting-started-guides/docker-multinode/worker.md @@ -3,7 +3,7 @@ These instructions are very similar to the master set-up above, but they are duplicated for clarity. You need to repeat these instructions for each node you want to join the cluster. -We will assume that the IP address of this node is `${NODE_IP}` and you have the IP address of the master in `${MASTER_IP}` that you created in the [master instructions](/{{page.version}}/docs/getting-started-guides/docker-multinode/master). +We will assume that the IP address of this node is `${NODE_IP}` and you have the IP address of the master in `${MASTER_IP}` that you created in the [master instructions](/docs/getting-started-guides/docker-multinode/master). For each worker node, there are three steps: @@ -136,4 +136,4 @@ sudo docker run -d --net=host --privileged gcr.io/google_containers/hyperkube:v1 ### Next steps -Move on to [testing your cluster](/{{page.version}}/docs/getting-started-guides/docker-multinode/testing) or add another node](#). \ No newline at end of file +Move on to [testing your cluster](/docs/getting-started-guides/docker-multinode/testing) or add another node](#). \ No newline at end of file diff --git a/v1.1/docs/getting-started-guides/docker-multinode/worker.sh b/docs/getting-started-guides/docker-multinode/worker.sh similarity index 100% rename from v1.1/docs/getting-started-guides/docker-multinode/worker.sh rename to docs/getting-started-guides/docker-multinode/worker.sh diff --git a/v1.1/docs/getting-started-guides/docker.md b/docs/getting-started-guides/docker.md similarity index 93% rename from v1.1/docs/getting-started-guides/docker.md rename to docs/getting-started-guides/docker.md index 948edafd9d..42468a3dfc 100644 --- a/v1.1/docs/getting-started-guides/docker.md +++ b/docs/getting-started-guides/docker.md @@ -65,7 +65,7 @@ docker run \ /hyperkube kubelet --containerized --hostname-override="127.0.0.1" --address="0.0.0.0" --api-servers=http://localhost:8080 --config=/etc/kubernetes/manifests ``` -This actually runs the kubelet, which in turn runs a [pod](/{{page.version}}/docs/user-guide/pods) that contains the other master components. +This actually runs the kubelet, which in turn runs a [pod](/docs/user-guide/pods) that contains the other master components. ### Step Three: Run the service proxy diff --git a/v1.1/docs/getting-started-guides/fedora/fedora-calico.md b/docs/getting-started-guides/fedora/fedora-calico.md similarity index 100% rename from v1.1/docs/getting-started-guides/fedora/fedora-calico.md rename to docs/getting-started-guides/fedora/fedora-calico.md diff --git a/v1.1/docs/getting-started-guides/fedora/fedora_ansible_config.md b/docs/getting-started-guides/fedora/fedora_ansible_config.md similarity index 100% rename from v1.1/docs/getting-started-guides/fedora/fedora_ansible_config.md rename to docs/getting-started-guides/fedora/fedora_ansible_config.md diff --git a/v1.2/docs/getting-started-guides/fedora/fedora_manual_config.md b/docs/getting-started-guides/fedora/fedora_manual_config.md similarity index 95% rename from v1.2/docs/getting-started-guides/fedora/fedora_manual_config.md rename to docs/getting-started-guides/fedora/fedora_manual_config.md index c865d8a1b2..9b638163a6 100644 --- a/v1.2/docs/getting-started-guides/fedora/fedora_manual_config.md +++ b/docs/getting-started-guides/fedora/fedora_manual_config.md @@ -12,7 +12,7 @@ This is a getting started guide for [Fedora](http://fedoraproject.org). It is a manual configuration so you understand all the underlying packages / services / ports, etc... -This guide will only get ONE node (previously minion) working. Multiple nodes require a functional [networking configuration](/{{page.version}}/docs/admin/networking) +This guide will only get ONE node (previously minion) working. Multiple nodes require a functional [networking configuration](/docs/admin/networking) done outside of Kubernetes. Although the additional Kubernetes configuration requirements should be obvious. The Kubernetes package provides a few services: kube-apiserver, kube-scheduler, kube-controller-manager, kubelet, kube-proxy. These @@ -212,4 +212,4 @@ kubectl delete -f ./node.json **The cluster should be running! Launch a test pod.** -You should have a functional cluster, check out [101](/{{page.version}}/docs/user-guide/walkthrough/)! +You should have a functional cluster, check out [101](/docs/user-guide/walkthrough/)! diff --git a/v1.1/docs/getting-started-guides/fedora/flannel_multi_node_cluster.md b/docs/getting-started-guides/fedora/flannel_multi_node_cluster.md similarity index 87% rename from v1.1/docs/getting-started-guides/fedora/flannel_multi_node_cluster.md rename to docs/getting-started-guides/fedora/flannel_multi_node_cluster.md index e816b545c3..d10eb42fb6 100644 --- a/v1.1/docs/getting-started-guides/fedora/flannel_multi_node_cluster.md +++ b/docs/getting-started-guides/fedora/flannel_multi_node_cluster.md @@ -1,7 +1,7 @@ --- --- -This document describes how to deploy Kubernetes on multiple hosts to set up a multi-node cluster and networking with flannel. Follow fedora [getting started guide](/{{page.version}}/docs/getting-started-guides/fedora/fedora_manual_config) to setup 1 master (fed-master) and 2 or more nodes. Make sure that all nodes have different names (fed-node1, fed-node2 and so on) and labels (fed-node1-label, fed-node2-label, and so on) to avoid any conflict. Also make sure that the Kubernetes master host is running etcd, kube-controller-manager, kube-scheduler, and kube-apiserver services, and the nodes are running docker, kube-proxy and kubelet services. Now install flannel on Kubernetes nodes. flannel on each node configures an overlay network that docker uses. flannel runs on each node to setup a unique class-C container network. +This document describes how to deploy Kubernetes on multiple hosts to set up a multi-node cluster and networking with flannel. Follow fedora [getting started guide](/docs/getting-started-guides/fedora/fedora_manual_config) to setup 1 master (fed-master) and 2 or more nodes. Make sure that all nodes have different names (fed-node1, fed-node2 and so on) and labels (fed-node1-label, fed-node2-label, and so on) to avoid any conflict. Also make sure that the Kubernetes master host is running etcd, kube-controller-manager, kube-scheduler, and kube-apiserver services, and the nodes are running docker, kube-proxy and kubelet services. Now install flannel on Kubernetes nodes. flannel on each node configures an overlay network that docker uses. flannel runs on each node to setup a unique class-C container network. * TOC {:toc} diff --git a/v1.1/docs/getting-started-guides/gce.md b/docs/getting-started-guides/gce.md similarity index 90% rename from v1.1/docs/getting-started-guides/gce.md rename to docs/getting-started-guides/gce.md index 09786b54dc..d987ee66ff 100644 --- a/v1.1/docs/getting-started-guides/gce.md +++ b/docs/getting-started-guides/gce.md @@ -40,7 +40,7 @@ wget -q -O - https://get.k8s.io | bash Once this command completes, you will have a master VM and four worker VMs, running as a Kubernetes cluster. -By default, some containers will already be running on your cluster. Containers like `kibana` and `elasticsearch` provide [logging](/{{page.version}}/docs/getting-started-guides/logging), while `heapster` provides [monitoring](http://releases.k8s.io/{{page.githubbranch}}/cluster/addons/cluster-monitoring/README.md) services. +By default, some containers will already be running on your cluster. Containers like `kibana` and `elasticsearch` provide [logging](/docs/getting-started-guides/logging), while `heapster` provides [monitoring](http://releases.k8s.io/{{page.githubbranch}}/cluster/addons/cluster-monitoring/README.md) services. The script run by the commands above creates a cluster with the name/prefix "kubernetes". It defines one specific cluster config, so you can't run it more than once. @@ -53,8 +53,8 @@ cluster/kube-up.sh If you want more than one cluster running in your project, want to use a different name, or want a different number of worker nodes, see the `/cluster/gce/config-default.sh` file for more fine-grained configuration before you start up your cluster. -If you run into trouble, please see the section on [troubleshooting](/{{page.version}}/docs/getting-started-guides/gce/#troubleshooting), post to the -[google-containers group](https://groups.google.com/forum/#!forum/google-containers), or come ask questions on [Slack](/{{page.version}}/docs/troubleshooting/#slack). +If you run into trouble, please see the section on [troubleshooting](/docs/getting-started-guides/gce/#troubleshooting), post to the +[google-containers group](https://groups.google.com/forum/#!forum/google-containers), or come ask questions on [Slack](/docs/troubleshooting/#slack). The next few steps will show you: @@ -68,7 +68,7 @@ The next few steps will show you: The cluster startup script will leave you with a running cluster and a `kubernetes` directory on your workstation. The next step is to make sure the `kubectl` tool is in your path. -The [kubectl](/{{page.version}}/docs/user-guide/kubectl/kubectl) tool controls the Kubernetes cluster manager. It lets you inspect your cluster resources, create, delete, and update components, and much more. +The [kubectl](/docs/user-guide/kubectl/kubectl) tool controls the Kubernetes cluster manager. It lets you inspect your cluster resources, create, delete, and update components, and much more. You will use it to look at your new cluster and bring up example apps. Add the appropriate binary folder to your `PATH` to access kubectl: @@ -113,7 +113,7 @@ Once `kubectl` is in your path, you can use it to look at your cluster. E.g., ru $ kubectl get --all-namespaces services ``` -should show a set of [services](/{{page.version}}/docs/user-guide/services) that look something like this: +should show a set of [services](/docs/user-guide/services) that look something like this: ```shell NAMESPACE NAME CLUSTER_IP EXTERNAL_IP PORT(S) SELECTOR AGE @@ -123,7 +123,7 @@ kube-system kube-ui 10.0.0.3 80/TCP ... ``` -Similarly, you can take a look at the set of [pods](/{{page.version}}/docs/user-guide/pods) that were created during cluster startup. +Similarly, you can take a look at the set of [pods](/docs/user-guide/pods) that were created during cluster startup. You can do this via the ```shell @@ -150,7 +150,7 @@ Some of the pods may take a few seconds to start up (during this time they'll sh #### Run some examples -Then, see [a simple nginx example](/{{page.version}}/docs/user-guide/simple-nginx) to try out your new cluster. +Then, see [a simple nginx example](/docs/user-guide/simple-nginx) to try out your new cluster. For more complete applications, please look in the [examples directory](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/). The [guestbook example](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/guestbook/) is a good "getting started" walkthrough. diff --git a/docs/getting-started-guides/index.md b/docs/getting-started-guides/index.md new file mode 100644 index 0000000000..09afc7fe9b --- /dev/null +++ b/docs/getting-started-guides/index.md @@ -0,0 +1,177 @@ +--- +--- + +Kubernetes can run on a range of platforms, from your laptop, to VMs on a cloud provider, to rack of +bare metal servers. The effort required to set up a cluster varies from running a single command to +crafting your own customized cluster. We'll guide you in picking a solution that fits for your needs. + +If you just want to "kick the tires" on Kubernetes, we recommend the [local Docker-based](/docs/getting-started-guides/docker) solution. + +The local Docker-based solution is one of several [Local cluster](#local-machine-solutions) solutions +that are quick to set up, but are limited to running on one machine. + +When you are ready to scale up to more machines and higher availability, a [Hosted](#hosted-solutions) +solution is the easiest to create and maintain. + +[Turn-key cloud solutions](#turn-key-cloud-solutions) require only a few commands to create +and cover a wider range of cloud providers. + +[Custom solutions](#custom-solutions) require more effort to setup but cover and even +they vary from step-by-step instructions to general advice for setting up +a Kubernetes cluster from scratch. + +* TOC +{:toc} + +### Local-machine Solutions + +Local-machine solutions create a single cluster with one or more Kubernetes nodes on a single +physical machine. Setup is completely automated and doesn't require a cloud provider account. +But their size and availability is limited to that of a single machine. + +The local-machine solutions are: + +- [Local Docker-based](/docs/getting-started-guides/docker) (recommended starting point) +- [Vagrant](/docs/getting-started-guides/vagrant) (works on any platform with Vagrant: Linux, MacOS, or Windows.) +- [No-VM local cluster](/docs/getting-started-guides/locally) (Linux only) + + +### Hosted Solutions + +[Google Container Engine](https://cloud.google.com/container-engine) offers managed Kubernetes +clusters. + +### Turn-key Cloud Solutions + +These solutions allow you to create Kubernetes clusters on a range of Cloud IaaS providers with only a +few commands, and have active community support. + +- [GCE](/docs/getting-started-guides/gce) +- [AWS](/docs/getting-started-guides/aws) +- [Azure](/docs/getting-started-guides/coreos/azure/) + +### Custom Solutions + +Kubernetes can run on a wide range of Cloud providers and bare-metal environments, and with many +base operating systems. + +If you can find a guide below that matches your needs, use it. It may be a little out of date, but +it will be easier than starting from scratch. If you do want to start from scratch because you +have special requirements or just because you want to understand what is underneath a Kubernetes +cluster, try the [Getting Started from Scratch](/docs/getting-started-guides/scratch) guide. + +If you are interested in supporting Kubernetes on a new platform, check out our [advice for +writing a new solution](/docs/devel/writing-a-getting-started-guide). + +#### Cloud + +These solutions are combinations of cloud provider and OS not covered by the above solutions. + +- [AWS + coreos](/docs/getting-started-guides/coreos) +- [GCE + CoreOS](/docs/getting-started-guides/coreos) +- [AWS + Ubuntu](/docs/getting-started-guides/juju) +- [Joyent + Ubuntu](/docs/getting-started-guides/juju) +- [Rackspace + CoreOS](/docs/getting-started-guides/rackspace) + +#### On-Premises VMs + +- [Vagrant](/docs/getting-started-guides/coreos) (uses CoreOS and flannel) +- [CloudStack](/docs/getting-started-guides/cloudstack) (uses Ansible, CoreOS and flannel) +- [Vmware](/docs/getting-started-guides/vsphere) (uses Debian) +- [juju.md](/docs/getting-started-guides/juju) (uses Juju, Ubuntu and flannel) +- [Vmware](/docs/getting-started-guides/coreos) (uses CoreOS and flannel) +- [libvirt-coreos.md](/docs/getting-started-guides/libvirt-coreos) (uses CoreOS) +- [oVirt](/docs/getting-started-guides/ovirt) +- [libvirt](/docs/getting-started-guides/fedora/flannel_multi_node_cluster) (uses Fedora and flannel) +- [KVM](/docs/getting-started-guides/fedora/flannel_multi_node_cluster) (uses Fedora and flannel) + +#### Bare Metal + +- [Offline](/docs/getting-started-guides/coreos/bare_metal_offline) (no internet required. Uses CoreOS and Flannel) +- [fedora/fedora_ansible_config.md](/docs/getting-started-guides/fedora/fedora_ansible_config) +- [Fedora single node](/docs/getting-started-guides/fedora/fedora_manual_config) +- [Fedora multi node](/docs/getting-started-guides/fedora/flannel_multi_node_cluster) +- [Centos](/docs/getting-started-guides/centos/centos_manual_config) +- [Ubuntu](/docs/getting-started-guides/ubuntu) +- [Docker Multi Node](/docs/getting-started-guides/docker-multinode) + +#### Integrations + +These solutions provide integration with 3rd party schedulers, resource managers, and/or lower level platforms. + +- [Kubernetes on Mesos](/docs/getting-started-guides/mesos) + - Instructions specify GCE, but are generic enough to be adapted to most existing Mesos clusters +- [Kubernetes on DCOS](/docs/getting-started-guides/dcos) + - Community Edition DCOS uses AWS + - Enterprise Edition DCOS supports cloud hosting, on-premise VMs, and bare metal + +## Table of Solutions + +Here are all the solutions mentioned above in table form. + +IaaS Provider | Config. Mgmt | OS | Networking | Docs | Conforms | Support Level +-------------------- | ------------ | ------ | ---------- | --------------------------------------------- | ---------| ---------------------------- +GKE | | | GCE | [docs](https://cloud.google.com/container-engine) | ['œ“][3] | Commercial +Vagrant | Saltstack | Fedora | flannel | [docs](/docs/getting-started-guides/vagrant) | ['œ“][2] | Project +GCE | Saltstack | Debian | GCE | [docs](/docs/getting-started-guides/gce) | ['œ“][1] | Project +Azure | CoreOS | CoreOS | Weave | [docs](/docs/getting-started-guides/coreos/azure/) | | Community ([@errordeveloper](https://github.com/errordeveloper), [@squillace](https://github.com/squillace), [@chanezon](https://github.com/chanezon), [@crossorigin](https://github.com/crossorigin)) +Docker Single Node | custom | N/A | local | [docs](/docs/getting-started-guides/docker) | | Project ([@brendandburns](https://github.com/brendandburns)) +Docker Multi Node | Flannel | N/A | local | [docs](/docs/getting-started-guides/docker-multinode) | | Project ([@brendandburns](https://github.com/brendandburns)) +Bare-metal | Ansible | Fedora | flannel | [docs](/docs/getting-started-guides/fedora/fedora_ansible_config) | | Project +Digital Ocean | custom | Fedora | Calico | [docs](/docs/getting-started-guides/fedora/fedora-calico) | | Community (@djosborne) +Bare-metal | custom | Fedora | _none_ | [docs](/docs/getting-started-guides/fedora/fedora_manual_config) | | Project +Bare-metal | custom | Fedora | flannel | [docs](/docs/getting-started-guides/fedora/flannel_multi_node_cluster) | | Community ([@aveshagarwal](https://github.com/aveshagarwal)) +libvirt | custom | Fedora | flannel | [docs](/docs/getting-started-guides/fedora/flannel_multi_node_cluster) | | Community ([@aveshagarwal](https://github.com/aveshagarwal)) +KVM | custom | Fedora | flannel | [docs](/docs/getting-started-guides/fedora/flannel_multi_node_cluster) | | Community ([@aveshagarwal](https://github.com/aveshagarwal)) +Mesos/Docker | custom | Ubuntu | Docker | [docs](/docs/getting-started-guides/mesos-docker) | | Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md)) +Mesos/GCE | | | | [docs](/docs/getting-started-guides/mesos) | | Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md)) +DCOS | Marathon | CoreOS/Alpine | custom | [docs](/docs/getting-started-guides/dcos) | | Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md)) +AWS | CoreOS | CoreOS | flannel | [docs](/docs/getting-started-guides/coreos) | | Community +GCE | CoreOS | CoreOS | flannel | [docs](/docs/getting-started-guides/coreos) | | Community ([@pires](https://github.com/pires)) +Vagrant | CoreOS | CoreOS | flannel | [docs](/docs/getting-started-guides/coreos) | | Community ([@pires](https://github.com/pires), [@AntonioMeireles](https://github.com/AntonioMeireles)) +Bare-metal (Offline) | CoreOS | CoreOS | flannel | [docs](/docs/getting-started-guides/coreos/bare_metal_offline) | | Community ([@jeffbean](https://github.com/jeffbean)) +Bare-metal | CoreOS | CoreOS | Calico | [docs](/docs/getting-started-guides/coreos/bare_metal_calico) | | Community ([@caseydavenport](https://github.com/caseydavenport)) +CloudStack | Ansible | CoreOS | flannel | [docs](/docs/getting-started-guides/cloudstack) | | Community ([@runseb](https://github.com/runseb)) +Vmware | | Debian | OVS | [docs](/docs/getting-started-guides/vsphere) | | Community ([@pietern](https://github.com/pietern)) +Bare-metal | custom | CentOS | _none_ | [docs](/docs/getting-started-guides/centos/centos_manual_config) | | Community ([@coolsvap](https://github.com/coolsvap)) +AWS | Juju | Ubuntu | flannel | [docs](/docs/getting-started-guides/juju) | | [Community](https://github.com/whitmo/bundle-kubernetes) ( [@whit](https://github.com/whitmo), [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) ) +OpenStack/HPCloud | Juju | Ubuntu | flannel | [docs](/docs/getting-started-guides/juju) | | [Community](https://github.com/whitmo/bundle-kubernetes) ( [@whit](https://github.com/whitmo), [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) ) +Joyent | Juju | Ubuntu | flannel | [docs](/docs/getting-started-guides/juju) | | [Community](https://github.com/whitmo/bundle-kubernetes) ( [@whit](https://github.com/whitmo), [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) ) +AWS | Saltstack | Ubuntu | OVS | [docs](/docs/getting-started-guides/aws) | | Community ([@justinsb](https://github.com/justinsb)) +Bare-metal | custom | Ubuntu | Calico | [docs](/docs/getting-started-guides/ubuntu-calico) | | Community ([@djosborne](https://github.com/djosborne)) +Bare-metal | custom | Ubuntu | flannel | [docs](/docs/getting-started-guides/ubuntu) | | Community ([@resouer](https://github.com/resouer), [@WIZARD-CXY](https://github.com/WIZARD-CXY)) +Local | | | _none_ | [docs](/docs/getting-started-guides/locally) | | Community ([@preillyme](https://github.com/preillyme)) +libvirt/KVM | CoreOS | CoreOS | libvirt/KVM | [docs](/docs/getting-started-guides/libvirt-coreos) | | Community ([@lhuard1A](https://github.com/lhuard1A)) +oVirt | | | | [docs](/docs/getting-started-guides/ovirt) | | Community ([@simon3z](https://github.com/simon3z)) +Rackspace | CoreOS | CoreOS | flannel | [docs](/docs/getting-started-guides/rackspace) | | Community ([@doublerr](https://github.com/doublerr)) +any | any | any | any | [docs](/docs/getting-started-guides/scratch) | | Community ([@erictune](https://github.com/erictune)) + + +*Note*: The above table is ordered by version test/used in notes followed by support level. + +Definition of columns: + +- **IaaS Provider** is who/what provides the virtual or physical machines (nodes) that Kubernetes runs on. +- **OS** is the base operating system of the nodes. +- **Config. Mgmt** is the configuration management system that helps install and maintain Kubernetes software on the + nodes. +- **Networking** is what implements the [networking model](/docs/admin/networking). Those with networking type + _none_ may not support more than one node, or may support multiple VM nodes only in the same physical node. +- **Conformance** indicates whether a cluster created with this configuration has passed the project's conformance + tests for supporting the API and base features of Kubernetes v1.0.0. +- Support Levels + - **Project**: Kubernetes Committers regularly use this configuration, so it usually works with the latest release + of Kubernetes. + - **Commercial**: A commercial offering with its own support arrangements. + - **Community**: Actively supported by community contributions. May not work with more recent releases of Kubernetes. + - **Inactive**: No active maintainer. Not recommended for first-time Kubernetes users, and may be deleted soon. +- **Notes** is relevant information such as the version of Kubernetes used. + + + + +[1]: https://gist.github.com/erictune/4cabc010906afbcc5061 + +[2]: https://gist.github.com/derekwaynecarr/505e56036cdf010bf6b6 + +[3]: https://gist.github.com/erictune/2f39b22f72565365e59b diff --git a/v1.1/docs/getting-started-guides/juju.md b/docs/getting-started-guides/juju.md similarity index 100% rename from v1.1/docs/getting-started-guides/juju.md rename to docs/getting-started-guides/juju.md diff --git a/v1.1/docs/getting-started-guides/libvirt-coreos.md b/docs/getting-started-guides/libvirt-coreos.md similarity index 100% rename from v1.1/docs/getting-started-guides/libvirt-coreos.md rename to docs/getting-started-guides/libvirt-coreos.md diff --git a/v1.2/docs/getting-started-guides/locally.md b/docs/getting-started-guides/locally.md similarity index 89% rename from v1.2/docs/getting-started-guides/locally.md rename to docs/getting-started-guides/locally.md index 83dcc2981c..4a75240207 100644 --- a/v1.2/docs/getting-started-guides/locally.md +++ b/docs/getting-started-guides/locally.md @@ -8,7 +8,7 @@ #### Linux -Not running Linux? Consider running Linux in a local virtual machine with [Vagrant](/{{page.version}}/docs/getting-started-guides/vagrant), or on a cloud provider like [Google Compute Engine](/{{page.version}}/docs/getting-started-guides/gce) +Not running Linux? Consider running Linux in a local virtual machine with [Vagrant](/docs/getting-started-guides/vagrant), or on a cloud provider like [Google Compute Engine](/docs/getting-started-guides/gce) #### Docker @@ -69,8 +69,8 @@ cluster/kubectl.sh get replicationcontrollers ### Running a user defined pod -Note the difference between a [container](/{{page.version}}/docs/user-guide/containers) -and a [pod](/{{page.version}}/docs/user-guide/pods). Since you only asked for the former, Kubernetes will create a wrapper pod for you. +Note the difference between a [container](/docs/user-guide/containers) +and a [pod](/docs/user-guide/pods). Since you only asked for the former, Kubernetes will create a wrapper pod for you. However you cannot view the nginx start page on localhost. To verify that nginx is running you need to run `curl` within the docker container (try `docker exec`). You can control the specifications of a pod via a user defined manifest, and reach nginx through your browser on the port specified therein: diff --git a/v1.1/docs/getting-started-guides/logging-elasticsearch.md b/docs/getting-started-guides/logging-elasticsearch.md similarity index 99% rename from v1.1/docs/getting-started-guides/logging-elasticsearch.md rename to docs/getting-started-guides/logging-elasticsearch.md index 80af1d2975..9fe352eb47 100644 --- a/v1.1/docs/getting-started-guides/logging-elasticsearch.md +++ b/docs/getting-started-guides/logging-elasticsearch.md @@ -2,7 +2,7 @@ --- On the Google Compute Engine (GCE) platform the default cluster level logging support targets -[Google Cloud Logging](https://cloud.google.com/logging/docs/) as described at the [Logging](/{{page.version}}/docs/getting-started-guides/logging) getting +[Google Cloud Logging](https://cloud.google.com/logging/docs/) as described at the [Logging](/docs/getting-started-guides/logging) getting started page. Here we describe how to set up a cluster to ingest logs into Elasticsearch and view them using Kibana as an alternative to Google Cloud Logging. diff --git a/v1.1/docs/getting-started-guides/logging.md b/docs/getting-started-guides/logging.md similarity index 98% rename from v1.1/docs/getting-started-guides/logging.md rename to docs/getting-started-guides/logging.md index ecebe877ac..b6f20bccef 100644 --- a/v1.1/docs/getting-started-guides/logging.md +++ b/docs/getting-started-guides/logging.md @@ -22,7 +22,7 @@ Here is the same information in a picture which shows how the pods might be plac ![Cluster](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/blog-logging/diagrams/cloud-logging.png) This diagram shows four nodes created on a Google Compute Engine cluster with the name of each VM node on a purple background. The internal and public IPs of each node are shown on gray boxes and the pods running in each node are shown in green boxes. Each pod box shows the name of the pod and the namespace it runs in, the IP address of the pod and the images which are run as part of the pod's execution. Here we see that every node is running a fluentd-cloud-logging pod which is collecting the log output of the containers running on the same node and sending them to Google Cloud Logging. A pod which provides the -[cluster DNS service](/{{page.version}}/docs/admin/dns) runs on one of the nodes and a pod which provides monitoring support runs on another node. +[cluster DNS service](/docs/admin/dns) runs on one of the nodes and a pod which provides monitoring support runs on another node. To help explain how cluster level logging works let's start off with a synthetic log generator pod specification [counter-pod.yaml](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/blog-logging/counter-pod.yaml): diff --git a/v1.1/docs/getting-started-guides/meanstack.md b/docs/getting-started-guides/meanstack.md similarity index 100% rename from v1.1/docs/getting-started-guides/meanstack.md rename to docs/getting-started-guides/meanstack.md diff --git a/v1.2/docs/getting-started-guides/mesos-docker.md b/docs/getting-started-guides/mesos-docker.md similarity index 99% rename from v1.2/docs/getting-started-guides/mesos-docker.md rename to docs/getting-started-guides/mesos-docker.md index 37f2fab172..5578025751 100644 --- a/v1.2/docs/getting-started-guides/mesos-docker.md +++ b/docs/getting-started-guides/mesos-docker.md @@ -182,7 +182,7 @@ host machine (mac). 1. Explore examples To learn more about Pods, Volumes, Labels, Services, and Replication Controllers, start with the - [Kubernetes Walkthrough](/{{page.version}}/docs/user-guide/walkthrough/). + [Kubernetes Walkthrough](/docs/user-guide/walkthrough/). To skip to a more advanced example, see the [Guestbook Example](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/guestbook/) diff --git a/v1.1/docs/getting-started-guides/mesos.md b/docs/getting-started-guides/mesos.md similarity index 100% rename from v1.1/docs/getting-started-guides/mesos.md rename to docs/getting-started-guides/mesos.md diff --git a/v1.1/docs/getting-started-guides/ovirt.md b/docs/getting-started-guides/ovirt.md similarity index 100% rename from v1.1/docs/getting-started-guides/ovirt.md rename to docs/getting-started-guides/ovirt.md diff --git a/v1.1/docs/getting-started-guides/rackspace.md b/docs/getting-started-guides/rackspace.md similarity index 100% rename from v1.1/docs/getting-started-guides/rackspace.md rename to docs/getting-started-guides/rackspace.md diff --git a/v1.2/docs/getting-started-guides/rkt/index.md b/docs/getting-started-guides/rkt/index.md similarity index 95% rename from v1.2/docs/getting-started-guides/rkt/index.md rename to docs/getting-started-guides/rkt/index.md index 909176322c..21cac24c71 100644 --- a/v1.2/docs/getting-started-guides/rkt/index.md +++ b/docs/getting-started-guides/rkt/index.md @@ -92,7 +92,7 @@ scripts. The master node is always Ubuntu. ### Getting started with your cluster -See [a simple nginx example](/{{page.version}}/docs/user-guide/simple-nginx) to try out your new cluster. +See [a simple nginx example](/docs/user-guide/simple-nginx) to try out your new cluster. For more complete applications, please look in the [examples directory](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/). @@ -135,4 +135,4 @@ where `$UUID` is the rkt pod's UUID, which you can find via `rkt list --full`, a ##### Check Kubernetes events, logs. -Besides above tricks, Kubernetes also provides us handy tools for debugging the pods. More information can be found [here](/{{page.version}}/docs/user-guide/application-troubleshooting) \ No newline at end of file +Besides above tricks, Kubernetes also provides us handy tools for debugging the pods. More information can be found [here](/docs/user-guide/application-troubleshooting) \ No newline at end of file diff --git a/v1.2/docs/getting-started-guides/scratch.md b/docs/getting-started-guides/scratch.md similarity index 91% rename from v1.2/docs/getting-started-guides/scratch.md rename to docs/getting-started-guides/scratch.md index d1045187cc..02b3f51c11 100644 --- a/v1.2/docs/getting-started-guides/scratch.md +++ b/docs/getting-started-guides/scratch.md @@ -3,7 +3,7 @@ This guide is for people who want to craft a custom Kubernetes cluster. If you can find an existing Getting Started Guide that meets your needs on [this -list](/{{page.version}}/docs/getting-started-guides/README/), then we recommend using it, as you will be able to benefit +list](/docs/getting-started-guides/README/), then we recommend using it, as you will be able to benefit from the experience of others. However, if you have specific IaaS, networking, configuration management, or operating system requirements not met by any of those guides, then this guide will provide an outline of the steps you need to @@ -22,10 +22,10 @@ steps that existing cluster setup scripts are making. 1. You should be familiar with using Kubernetes already. We suggest you set up a temporary cluster by following one of the other Getting Started Guides. - This will help you become familiar with the CLI ([kubectl](/{{page.version}}/docs/user-guide/kubectl/kubectl)) and concepts ([pods](/{{page.version}}/docs/user-guide/pods), [services](/{{page.version}}/docs/user-guide/services), etc.) first. + This will help you become familiar with the CLI ([kubectl](/docs/user-guide/kubectl/kubectl)) and concepts ([pods](/docs/user-guide/pods), [services](/docs/user-guide/services), etc.) first. 1. You should have `kubectl` installed on your desktop. This will happen as a side effect of completing one of the other Getting Started Guides. If not, follow the instructions - [here](/{{page.version}}/docs/user-guide/prereqs). + [here](/docs/user-guide/prereqs). ### Cloud Provider @@ -52,7 +52,7 @@ on how flags are set on various components. ### Network -Kubernetes has a distinctive [networking model](/{{page.version}}/docs/admin/networking). +Kubernetes has a distinctive [networking model](/docs/admin/networking). Kubernetes allocates an IP address to each pod. When creating a cluster, you need to allocate a block of IPs for Kubernetes to use as Pod IPs. The simplest @@ -63,7 +63,7 @@ accomplished in two ways: - Configure network to route Pod IPs - Harder to setup from scratch. - - Google Compute Engine ([GCE](/{{page.version}}/docs/getting-started-guides/gce)) and [AWS](/{{page.version}}/docs/getting-started-guides/aws) guides use this approach. + - Google Compute Engine ([GCE](/docs/getting-started-guides/gce)) and [AWS](/docs/getting-started-guides/aws) guides use this approach. - Need to make the Pod IPs routable by programming routers, switches, etc. - Can be configured external to Kubernetes, or can implement in the "Routes" interface of a Cloud Provider module. - Generally highest performance. @@ -96,7 +96,7 @@ You need to select an address range for the Pod IPs. using `10.10.0.0/24` through `10.10.255.0/24`, respectively. - Need to make these routable or connect with overlay. -Kubernetes also allocates an IP to each [service](/{{page.version}}/docs/user-guide/services). However, +Kubernetes also allocates an IP to each [service](/docs/user-guide/services). However, service IPs do not necessarily need to be routable. The kube-proxy takes care of translating Service IPs to Pod IPs before traffic leaves the node. You do need to Allocate a block of IPs for services. Call this @@ -140,7 +140,7 @@ You will need binaries for: A Kubernetes binary release includes all the Kubernetes binaries as well as the supported release of etcd. You can use a Kubernetes binary release (recommended) or build your Kubernetes binaries following the instructions in the -[Developer Documentation](/{{page.version}}/docs/devel/). Only using a binary release is covered in this guide. +[Developer Documentation](/docs/devel/). Only using a binary release is covered in this guide. Download the [latest binary release](https://github.com/kubernetes/kubernetes/releases/latest) and unzip it. Then locate `./kubernetes/server/kubernetes-server-linux-amd64.tar.gz` and unzip *that*. @@ -238,10 +238,10 @@ The admin user (and any users) need: Your tokens and passwords need to be stored in a file for the apiserver to read. This guide uses `/var/lib/kube-apiserver/known_tokens.csv`. -The format for this file is described in the [authentication documentation](/{{page.version}}/docs/admin/authentication). +The format for this file is described in the [authentication documentation](/docs/admin/authentication). For distributing credentials to clients, the convention in Kubernetes is to put the credentials -into a [kubeconfig file](/{{page.version}}/docs/user-guide/kubeconfig-file). +into a [kubeconfig file](/docs/user-guide/kubeconfig-file). The kubeconfig file for the administrator can be created as follows: @@ -383,7 +383,7 @@ Arguments to consider: - `--docker-root=` - `--root-dir=` - `--configure-cbr0=` (described above) - - `--register-node` (described in [Node](/{{page.version}}/docs/admin/node) documentation.) + - `--register-node` (described in [Node](/docs/admin/node) documentation.) ### kube-proxy @@ -405,7 +405,7 @@ Each node needs to be allocated its own CIDR range for pod networking. Call this `NODE_X_POD_CIDR`. A bridge called `cbr0` needs to be created on each node. The bridge is explained -further in the [networking documentation](/{{page.version}}/docs/admin/networking). The bridge itself +further in the [networking documentation](/docs/admin/networking). The bridge itself needs an address from `$NODE_X_POD_CIDR` - by convention the first IP. Call this `NODE_X_BRIDGE_ADDR`. For example, if `NODE_X_POD_CIDR` is `10.0.0.0/16`, then `NODE_X_BRIDGE_ADDR` is `10.0.0.1/16`. NOTE: this retains the `/16` suffix @@ -460,7 +460,7 @@ traffic to the internet, but have no problem with them inside your GCE Project. The previous steps all involved "conventional" system administration techniques for setting up machines. You may want to use a Configuration Management system to automate the node configuration -process. There are examples of [Saltstack](/{{page.version}}/docs/admin/salt), Ansible, Juju, and CoreOS Cloud Config in the +process. There are examples of [Saltstack](/docs/admin/salt), Ansible, Juju, and CoreOS Cloud Config in the various Getting Started Guides. ## Bootstrapping the Cluster @@ -483,7 +483,7 @@ You will need to run one or more instances of etcd. - Log can be written to non-durable storage because storage is replicated. - run a single apiserver which connects to one of the etc nodes. -See [cluster-troubleshooting](/{{page.version}}/docs/admin/cluster-troubleshooting) for more discussion on factors affecting cluster +See [cluster-troubleshooting](/docs/admin/cluster-troubleshooting) for more discussion on factors affecting cluster availability. To run an etcd instance: @@ -591,7 +591,7 @@ Here are some apiserver flags you may need to set: - `--tls-cert-file=/srv/kubernetes/server.cert` - `--tls-private-key-file=/srv/kubernetes/server.key` - `--admission-control=$RECOMMENDED_LIST` - - See [admission controllers](/{{page.version}}/docs/admin/admission-controllers) for recommended arguments. + - See [admission controllers](/docs/admin/admission-controllers) for recommended arguments. - `--allow-privileged=true`, only if you trust your cluster user to run pods as root. If you are following the firewall-only security approach, then use these arguments: @@ -752,7 +752,7 @@ Flags to consider using with controller manager: - `--allocate-node-cidrs=` - *TODO*: explain when you want controller to do this and when you want to do it another way. - `--cloud-provider=` and `--cloud-config` as described in apiserver section. - - `--service-account-private-key-file=/srv/kubernetes/server.key`, used by the [service account](/{{page.version}}/docs/user-guide/service-accounts) feature. + - `--service-account-private-key-file=/srv/kubernetes/server.key`, used by the [service account](/docs/user-guide/service-accounts) feature. - `--master=127.0.0.1:8080` #### Starting and Verifying Apiserver, Scheduler, and Controller Manager @@ -806,12 +806,12 @@ Otherwise, you will need to manually create node objects. ### Inspect pods and services -Try to run through the "Inspect your cluster" section in one of the other Getting Started Guides, such as [GCE](/{{page.version}}/docs/getting-started-guides/gce/#inspect-your-cluster). +Try to run through the "Inspect your cluster" section in one of the other Getting Started Guides, such as [GCE](/docs/getting-started-guides/gce/#inspect-your-cluster). You should see some services. You should also see "mirror pods" for the apiserver, scheduler and controller-manager, plus any add-ons you started. ### Try Examples -At this point you should be able to run through one of the basic examples, such as the [nginx example](/{{page.version}}/examples/simple-nginx). +At this point you should be able to run through one of the basic examples, such as the [nginx example](/examples/simple-nginx). ### Running the Conformance Test @@ -824,5 +824,5 @@ pinging or SSH-ing from one node to another. ### Getting Help -If you run into trouble, please see the section on [troubleshooting](/{{page.version}}/docs/getting-started-guides/gce#troubleshooting), post to the -[google-containers group](https://groups.google.com/forum/#!forum/google-containers), or come ask questions on [Slack](/{{page.version}}/docs/troubleshooting#slack). \ No newline at end of file +If you run into trouble, please see the section on [troubleshooting](/docs/getting-started-guides/gce#troubleshooting), post to the +[google-containers group](https://groups.google.com/forum/#!forum/google-containers), or come ask questions on [Slack](/docs/troubleshooting#slack). \ No newline at end of file diff --git a/v1.1/docs/getting-started-guides/ubuntu-calico.md b/docs/getting-started-guides/ubuntu-calico.md similarity index 98% rename from v1.1/docs/getting-started-guides/ubuntu-calico.md rename to docs/getting-started-guides/ubuntu-calico.md index e71c0c8982..ef4b96ba73 100644 --- a/v1.1/docs/getting-started-guides/ubuntu-calico.md +++ b/docs/getting-started-guides/ubuntu-calico.md @@ -250,7 +250,7 @@ With this sample configuration, because the containers have private `192.168.0.0 ### NAT on the nodes -The simplest method for enabling connectivity from containers to the internet is to use an iptables masquerade rule. This is the standard mechanism [recommended](/{{page.version}}/docs/admin/networking/#google-compute-engine-gce) in the Kubernetes GCE environment. +The simplest method for enabling connectivity from containers to the internet is to use an iptables masquerade rule. This is the standard mechanism [recommended](/docs/admin/networking/#google-compute-engine-gce) in the Kubernetes GCE environment. We need to NAT traffic that has a destination outside of the cluster. Internal traffic includes the master/nodes, and the container IP pools. A suitable masquerade chain would follow the pattern below, replacing the following variables: diff --git a/v1.1/docs/getting-started-guides/ubuntu.md b/docs/getting-started-guides/ubuntu.md similarity index 98% rename from v1.1/docs/getting-started-guides/ubuntu.md rename to docs/getting-started-guides/ubuntu.md index a8de4a3a28..bd6a06b903 100644 --- a/v1.1/docs/getting-started-guides/ubuntu.md +++ b/docs/getting-started-guides/ubuntu.md @@ -258,4 +258,4 @@ Some examples are as follows: The script will not delete any resources of your cluster, it just replaces the binaries. You can use `kubectl` command to check if the newly upgraded k8s is working correctly. -For example, use `$ kubectl get nodes` to see if all of your nodes are ready.Or refer to [test-it-out](/{{page.version}}/docs/getting-started-guides/ubuntu/#test-it-out) \ No newline at end of file +For example, use `$ kubectl get nodes` to see if all of your nodes are ready.Or refer to [test-it-out](/docs/getting-started-guides/ubuntu/#test-it-out) \ No newline at end of file diff --git a/v1.1/docs/getting-started-guides/vagrant.md b/docs/getting-started-guides/vagrant.md similarity index 97% rename from v1.1/docs/getting-started-guides/vagrant.md rename to docs/getting-started-guides/vagrant.md index 9bea0df0a1..37c06bcbbc 100644 --- a/v1.1/docs/getting-started-guides/vagrant.md +++ b/docs/getting-started-guides/vagrant.md @@ -293,7 +293,7 @@ If this is your first time creating the cluster, the kubelet on each node schedu #### I want to make changes to Kubernetes code! -To set up a vagrant cluster for hacking, follow the [vagrant developer guide](/{{page.version}}/docs/devel/developer-guides/vagrant). +To set up a vagrant cluster for hacking, follow the [vagrant developer guide](/docs/devel/developer-guides/vagrant). #### I have brought Vagrant up but the nodes cannot validate! diff --git a/v1.1/docs/getting-started-guides/vsphere.md b/docs/getting-started-guides/vsphere.md similarity index 93% rename from v1.1/docs/getting-started-guides/vsphere.md rename to docs/getting-started-guides/vsphere.md index e41175bcac..da3eb4b0b4 100644 --- a/v1.1/docs/getting-started-guides/vsphere.md +++ b/docs/getting-started-guides/vsphere.md @@ -27,7 +27,7 @@ export GOPATH=$HOME/src/go go get github.com/vmware/govmomi/govc ``` -5. Get or build a [binary release](/{{page.version}}/docs/getting-started-guides/binary_release) +5. Get or build a [binary release](/docs/getting-started-guides/binary_release) ### Setup diff --git a/v1.1/index.md b/docs/index.md similarity index 100% rename from v1.1/index.md rename to docs/index.md diff --git a/v1.2/pagelist.md b/docs/pagelist.md similarity index 73% rename from v1.2/pagelist.md rename to docs/pagelist.md index 431f35c628..dcfebf90fb 100644 --- a/v1.2/pagelist.md +++ b/docs/pagelist.md @@ -17,6 +17,6 @@ The following is a list of all pages for {{ page.version }}. We also have a [`si {% endif %} {% endif %} {% endfor %} -* {% if pageTOC %}**[{{ pageTOC | capitalize }}](/{{page.version}}/{%if pageTOC != "guides"%}{{pageTOC}}/{%endif%})**: {% endif %}[{% if page.title %}{{page.title}}{% else %}{{ page.url }}{% endif %}]({{ page.url }}) +* {% if pageTOC %}**[{{ pageTOC | capitalize }}](/{%if pageTOC != "guides"%}{{pageTOC}}/{%endif%})**: {% endif %}[{% if page.title %}{{page.title}}{% else %}{{ page.url }}{% endif %}]({{ page.url }}) {% endif %} {% endfor %} \ No newline at end of file diff --git a/v1.1/reference.md b/docs/reference.md similarity index 100% rename from v1.1/reference.md rename to docs/reference.md diff --git a/v1.1/docs/reporting-security-issues.md b/docs/reporting-security-issues.md similarity index 100% rename from v1.1/docs/reporting-security-issues.md rename to docs/reporting-security-issues.md diff --git a/v1.1/docs/roadmap.md b/docs/roadmap.md similarity index 100% rename from v1.1/docs/roadmap.md rename to docs/roadmap.md diff --git a/v1.1/samples.md b/docs/samples.md similarity index 100% rename from v1.1/samples.md rename to docs/samples.md diff --git a/search.md b/docs/search.md similarity index 100% rename from search.md rename to docs/search.md diff --git a/v1.1/docs/troubleshooting.md b/docs/troubleshooting.md similarity index 81% rename from v1.1/docs/troubleshooting.md rename to docs/troubleshooting.md index fd79413735..bf0c90e007 100644 --- a/v1.1/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -5,10 +5,10 @@ Sometimes things go wrong. This guide is aimed at making them right. It has two sections: - * [Troubleshooting your application](/{{page.version}}/docs/user-guide/application-troubleshooting) - Useful for users who are deploying code into Kubernetes and wondering why it is not working. - * [Troubleshooting your cluster](/{{page.version}}/docs/admin/cluster-troubleshooting) - Useful for cluster administrators and people whose Kubernetes cluster is unhappy. + * [Troubleshooting your application](/docs/user-guide/application-troubleshooting) - Useful for users who are deploying code into Kubernetes and wondering why it is not working. + * [Troubleshooting your cluster](/docs/admin/cluster-troubleshooting) - Useful for cluster administrators and people whose Kubernetes cluster is unhappy. -You should also check the [known issues](/{{page.version}}/docs/user-guide/known-issues) for the release you're using. +You should also check the [known issues](/docs/user-guide/known-issues) for the release you're using. # Getting help @@ -16,7 +16,7 @@ If your problem isn't answered by any of the guides above, there are variety of ## Questions -If you aren't familiar with it, many of your questions may be answered by the [user guide](/{{page.version}}/docs/user-guide/). +If you aren't familiar with it, many of your questions may be answered by the [user guide](/docs/user-guide/). We also have a number of FAQ pages: diff --git a/v1.2/docs/user-guide/accessing-the-cluster.md b/docs/user-guide/accessing-the-cluster.md similarity index 89% rename from v1.2/docs/user-guide/accessing-the-cluster.md rename to docs/user-guide/accessing-the-cluster.md index eecfaeae6c..190ada577d 100644 --- a/v1.2/docs/user-guide/accessing-the-cluster.md +++ b/docs/user-guide/accessing-the-cluster.md @@ -13,7 +13,7 @@ Kubernetes CLI, `kubectl`. To access a cluster, you need to know the location of the cluster and have credentials to access it. Typically, this is automatically set-up when you work through -though a [Getting started guide](/{{page.version}}/docs/getting-started-guides/), +though a [Getting started guide](/docs/getting-started-guides/), or someone else setup the cluster and provided you with credentials and a location. Check the location and credentials that kubectl knows about with this command: @@ -23,7 +23,7 @@ $ kubectl config view ``` Many of the [examples](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/) provide an introduction to using -kubectl and complete documentation is found in the [kubectl manual](/{{page.version}}/docs/user-guide/kubectl/kubectl). +kubectl and complete documentation is found in the [kubectl manual](/docs/user-guide/kubectl/kubectl). ### Directly accessing the REST API @@ -52,7 +52,7 @@ Run it like this: $ kubectl proxy --port=8080 & ``` -See [kubectl proxy](/{{page.version}}/docs/user-guide/kubectl/kubectl_proxy) for more details. +See [kubectl proxy](/docs/user-guide/kubectl/kubectl_proxy) for more details. Then you can explore the API with curl, wget, or a browser, like so: @@ -90,16 +90,16 @@ certificate. On some clusters, the apiserver does not require authentication; it may serve on localhost, or be protected by a firewall. There is not a standard -for this. [Configuring Access to the API](/{{page.version}}/docs/admin/accessing-the-api) +for this. [Configuring Access to the API](/docs/admin/accessing-the-api) describes how a cluster admin can configure this. Such approaches may conflict with future high-availability support. ### Programmatic access to the API -There are [client libraries](/{{page.version}}/docs/devel/client-libraries) for accessing the API +There are [client libraries](/docs/devel/client-libraries) for accessing the API from several languages. The Kubernetes project-supported [Go](http://releases.k8s.io/{{page.githubbranch}}/pkg/client/) -client library can use the same [kubeconfig file](/{{page.version}}/docs/user-guide/kubeconfig-file) +client library can use the same [kubeconfig file](/docs/user-guide/kubeconfig-file) as the kubectl CLI does to locate and authenticate to the apiserver. See documentation for other libraries for how they authenticate. @@ -114,7 +114,7 @@ the `kubernetes` DNS name, which resolves to a Service IP which in turn will be routed to an apiserver. The recommended way to authenticate to the apiserver is with a -[service account](/{{page.version}}/docs/user-guide/service-accounts) credential. By kube-system, a pod +[service account](/docs/user-guide/service-accounts) credential. By kube-system, a pod is associated with a service account, and a credential (token) for that service account is placed into the filesystem tree of each container in that pod, at `/var/run/secrets/kubernetes.io/serviceaccount/token`. @@ -136,7 +136,7 @@ In each case, the credentials of the pod are used to communicate securely with t The previous section was about connecting the Kubernetes API server. This section is about connecting to other services running on Kubernetes cluster. In Kubernetes, the -[nodes](/{{page.version}}/docs/admin/node), [pods](/{{page.version}}/docs/user-guide/pods) and [services](/{{page.version}}/docs/user-guide/services) all have +[nodes](/docs/admin/node), [pods](/docs/user-guide/pods) and [services](/docs/user-guide/services) all have their own IPs. In many cases, the node IPs, pod IPs, and some service IPs on a cluster will not be routable, so they will not be reachable from a machine outside the cluster, such as your desktop machine. @@ -147,8 +147,8 @@ You have several options for connecting to nodes, pods and services from outside - Access services through public IPs. - Use a service with type `NodePort` or `LoadBalancer` to make the service reachable outside - the cluster. See the [services](/{{page.version}}/docs/user-guide/services) and - [kubectl expose](/{{page.version}}/docs/user-guide/kubectl/kubectl_expose) documentation. + the cluster. See the [services](/docs/user-guide/services) and + [kubectl expose](/docs/user-guide/kubectl/kubectl_expose) documentation. - Depending on your cluster environment, this may just expose the service to your corporate network, or it may expose it to the internet. Think about whether the service being exposed is secure. Does it do its own authentication? @@ -164,7 +164,7 @@ You have several options for connecting to nodes, pods and services from outside - Only works for HTTP/HTTPS. - Described [here](#discovering-builtin-services). - Access from a node or pod in the cluster. - - Run a pod, and then connect to a shell in it using [kubectl exec](/{{page.version}}/docs/user-guide/kubectl/kubectl_exec). + - Run a pod, and then connect to a shell in it using [kubectl exec](/docs/user-guide/kubectl/kubectl_exec). Connect to other nodes, pods, and services from that shell. - Some clusters may allow you to ssh to a node in the cluster. From there you may be able to access cluster services. This is a non-standard method, and will work on some clusters but @@ -251,7 +251,7 @@ There are several different proxies you may encounter when using Kubernetes: - proxy to target may use HTTP or HTTPS as chosen by proxy using available information - can be used to reach a Node, Pod, or Service - does load balancing when used to reach a Service - 1. The [kube proxy](/{{page.version}}/docs/user-guide/services/#ips-and-vips): + 1. The [kube proxy](/docs/user-guide/services/#ips-and-vips): - runs on each node - proxies UDP and TCP - does not understand HTTP diff --git a/v1.2/docs/user-guide/annotations.md b/docs/user-guide/annotations.md similarity index 94% rename from v1.2/docs/user-guide/annotations.md rename to docs/user-guide/annotations.md index ff2965cbe5..9a28452929 100644 --- a/v1.2/docs/user-guide/annotations.md +++ b/docs/user-guide/annotations.md @@ -1,7 +1,7 @@ --- --- -We have [labels](/{{page.version}}/docs/user-guide/labels) for identifying metadata. +We have [labels](/docs/user-guide/labels) for identifying metadata. It is also useful to be able to attach arbitrary non-identifying metadata, for retrieval by API clients such as tools, libraries, etc. This information may be large, may be structured or unstructured, may include characters not permitted by labels, etc. Such information would not be used for object selection and therefore doesn't belong in labels. diff --git a/v1.1/docs/user-guide/application-troubleshooting.md b/docs/user-guide/application-troubleshooting.md similarity index 92% rename from v1.1/docs/user-guide/application-troubleshooting.md rename to docs/user-guide/application-troubleshooting.md index 9f3ea06aaf..a82cf67b60 100644 --- a/v1.1/docs/user-guide/application-troubleshooting.md +++ b/docs/user-guide/application-troubleshooting.md @@ -3,7 +3,7 @@ This guide is to help users debug applications that are deployed into Kubernetes and not behaving correctly. This is *not* a guide for people who want to debug their cluster. For that you should check out -[this guide](/{{page.version}}/docs/admin/cluster-troubleshooting) +[this guide](/docs/admin/cluster-troubleshooting) * TOC {:toc} @@ -41,7 +41,7 @@ there are insufficient resources of one type or another that prevent scheduling. your pod. Reasons include: * **You don't have enough resources**: You may have exhausted the supply of CPU or Memory in your cluster, in this case -you need to delete Pods, adjust resource requests, or add new nodes to your cluster. See [Compute Resources document](/{{page.version}}/docs/user-guide/compute-resources/#my-pods-are-pending-with-event-message-failedscheduling) for more information. +you need to delete Pods, adjust resource requests, or add new nodes to your cluster. See [Compute Resources document](/docs/user-guide/compute-resources/#my-pods-are-pending-with-event-message-failedscheduling) for more information. * **You are using `hostPort`**: When you bind a Pod to a `hostPort` there are a limited number of places that pod can be scheduled. In most cases, `hostPort` is unnecessary, try using a Service object to expose your Pod. If you do require @@ -186,6 +186,6 @@ check: #### More information -If none of the above solves your problem, follow the instructions in [Debugging Service document](/{{page.version}}/docs/user-guide/debugging-services) to make sure that your `Service` is running, has `Endpoints`, and your `Pods` are actually serving; you have DNS working, iptables rules installed, and kube-proxy does not seem to be misbehaving. +If none of the above solves your problem, follow the instructions in [Debugging Service document](/docs/user-guide/debugging-services) to make sure that your `Service` is running, has `Endpoints`, and your `Pods` are actually serving; you have DNS working, iptables rules installed, and kube-proxy does not seem to be misbehaving. -You may also visit [troubleshooting document](/{{page.version}}/docs/troubleshooting/) for more information. \ No newline at end of file +You may also visit [troubleshooting document](/docs/troubleshooting/) for more information. \ No newline at end of file diff --git a/v1.1/docs/user-guide/compute-resources.md b/docs/user-guide/compute-resources.md similarity index 95% rename from v1.1/docs/user-guide/compute-resources.md rename to docs/user-guide/compute-resources.md index 533edd866f..f962a35ac8 100644 --- a/v1.1/docs/user-guide/compute-resources.md +++ b/docs/user-guide/compute-resources.md @@ -4,7 +4,7 @@ * TOC {:toc} -When specifying a [pod](/{{page.version}}/docs/user-guide/pods), you can optionally specify how much CPU and memory (RAM) each +When specifying a [pod](/docs/user-guide/pods), you can optionally specify how much CPU and memory (RAM) each container needs. When containers have their resource requests specified, the scheduler is able to make better decisions about which nodes to place pods on; and when containers have their limits specified, contention for resources on a node can be handled in a specified manner. For @@ -16,8 +16,8 @@ in units of cores. Memory is specified in units of bytes. CPU and RAM are collectively referred to as *compute resources*, or just *resources*. Compute resources are measureable quantities which can be requested, allocated, and consumed. They are -distinct from [API resources](/{{page.version}}/docs/user-guide/working-with-resources). API resources, such as pods and -[services](/{{page.version}}/docs/user-guide/services) are objects that can be written to and retrieved from the Kubernetes API +distinct from [API resources](/docs/user-guide/working-with-resources). API resources, such as pods and +[services](/docs/user-guide/services) are objects that can be written to and retrieved from the Kubernetes API server. ## Resource Requests and Limits of Pod and Container @@ -171,7 +171,7 @@ Here you can see from the `Allocated resources` section that that a pod which as Looking at the `Pods` section, you can see which pods are taking up space on the node. -The [resource quota](/{{page.version}}/docs/admin/resource-quota) feature can be configured +The [resource quota](/docs/admin/resource-quota) feature can be configured to limit the total amount of resources that can be consumed. If used in conjunction with namespaces, it can prevent one team from hogging all the resources. @@ -234,7 +234,7 @@ We can see that this container was terminated because `reason:OOM Killed`, where The current system only allows resource quantities to be specified on a container. It is planned to improve accounting for resources which are shared by all containers in a pod, -such as [EmptyDir volumes](/{{page.version}}/docs/user-guide/volumes/#emptydir). +such as [EmptyDir volumes](/docs/user-guide/volumes/#emptydir). The current system only supports container requests and limits for CPU and Memory. It is planned to add new resource types, including a node disk space diff --git a/v1.2/docs/user-guide/config-best-practices.md b/docs/user-guide/config-best-practices.md similarity index 77% rename from v1.2/docs/user-guide/config-best-practices.md rename to docs/user-guide/config-best-practices.md index 2f2ebcdc6a..b3f36056a0 100644 --- a/v1.2/docs/user-guide/config-best-practices.md +++ b/docs/user-guide/config-best-practices.md @@ -9,16 +9,16 @@ This document is meant to highlight and consolidate in one place configuration b 1. Group related objects together in a single file. This is often better than separate files. 1. Use `kubectl create -f ` where possible. This looks for config objects in all `.yaml`, `.yml`, and `.json` files in `` and passes them to create. 1. Create a service before corresponding replication controllers so that the scheduler can spread the pods comprising the service. You can also create the replication controller without specifying replicas, create the service, then scale up the replication controller, which may work better in an example using progressive disclosure and may have benefits in real scenarios also, such as ensuring one replica works before creating lots of them) -1. Don't use `hostPort` unless absolutely necessary (e.g., for a node daemon) as it will prevent certain scheduling configurations due to port conflicts. Use the apiserver proxying or port forwarding for debug/admin access, or a service for external service access. If you need to expose a pod's port on the host machine, consider using a [NodePort](/{{page.version}}/docs/user-guide/services/#type--loadbalancer) service before resorting to `hostPort`. If you only need access to the port for debugging purposes, you can also use the [kubectl proxy and apiserver proxy](/{{page.version}}/docs/user-guide/connecting-to-applications-proxy) or [kubectl port-forward](/{{page.version}}/docs/user-guide/connecting-to-applications-port-forward). +1. Don't use `hostPort` unless absolutely necessary (e.g., for a node daemon) as it will prevent certain scheduling configurations due to port conflicts. Use the apiserver proxying or port forwarding for debug/admin access, or a service for external service access. If you need to expose a pod's port on the host machine, consider using a [NodePort](/docs/user-guide/services/#type--loadbalancer) service before resorting to `hostPort`. If you only need access to the port for debugging purposes, you can also use the [kubectl proxy and apiserver proxy](/docs/user-guide/connecting-to-applications-proxy) or [kubectl port-forward](/docs/user-guide/connecting-to-applications-port-forward). 1. Don't use `hostNetwork` for the same reasons as `hostPort`. 1. Don't specify default values unnecessarily, to simplify and minimize configs. For example, omit the selector and labels in ReplicationController if you want them to be the same as the labels in its podTemplate, since those fields are populated from the podTemplate labels by default. 1. Instead of attaching one label to a set of pods to represent a service (e.g., `service: myservice`) and another to represent the replication controller managing the pods (e.g., `controller: mycontroller`), attach labels that identify semantic attributes of your application or deployment and select the appropriate subsets in your service and replication controller, such as `{ app: myapp, tier: frontend, deployment: v3 }`. A service can be made to span multiple deployments, such as across rolling updates, by simply omitting release-specific labels from its selector, rather than updating a service's selector to match the replication controller's selector fully. -1. Use kubectl bulk operations (via files and/or labels) for get and delete. See [label selectors](/{{page.version}}/docs/user-guide/labels/#label-selectors) and [using labels effectively](/{{page.version}}/docs/user-guide/managing-deployments/#using-labels-effectively). -1. Use kubectl run and expose to quickly create and expose single container replication controllers. See the [quick start guide](/{{page.version}}/docs/user-guide/quick-start) for an example. -1. Use headless services for easy service discovery when you don't need kube-proxy load balancing. See [headless services](/{{page.version}}/docs/user-guide/services/#headless-services). +1. Use kubectl bulk operations (via files and/or labels) for get and delete. See [label selectors](/docs/user-guide/labels/#label-selectors) and [using labels effectively](/docs/user-guide/managing-deployments/#using-labels-effectively). +1. Use kubectl run and expose to quickly create and expose single container replication controllers. See the [quick start guide](/docs/user-guide/quick-start) for an example. +1. Use headless services for easy service discovery when you don't need kube-proxy load balancing. See [headless services](/docs/user-guide/services/#headless-services). 1. Use kubectl delete rather than stop. Delete has a superset of the functionality of stop and stop is deprecated. 1. If there is a viable alternative to naked pods (i.e. pods not bound to a controller), go with the alternative. Controllers are almost always preferable to creating pods (except for some `restartPolicy: Never` scenarios). A minimal Job is coming. See [#1624](http://issue.k8s.io/1624). Naked pods will not be rescheduled in the event of node failure. -1. Put a version number or hash as a suffix to the name and in a label on a replication controller to facilitate rolling update, as we do for [--image](/{{page.version}}/docs/user-guide/kubectl/kubectl_rolling-update). This is necessary because rolling-update actually creates a new controller as opposed to modifying the existing controller. This does not play well with version agnostic controller names. +1. Put a version number or hash as a suffix to the name and in a label on a replication controller to facilitate rolling update, as we do for [--image](/docs/user-guide/kubectl/kubectl_rolling-update). This is necessary because rolling-update actually creates a new controller as opposed to modifying the existing controller. This does not play well with version agnostic controller names. 1. Put an object description in an annotation to allow better introspection. diff --git a/v1.2/docs/user-guide/configuring-containers.md b/docs/user-guide/configuring-containers.md similarity index 85% rename from v1.2/docs/user-guide/configuring-containers.md rename to docs/user-guide/configuring-containers.md index 5704cb0e17..14314ec0ec 100644 --- a/v1.2/docs/user-guide/configuring-containers.md +++ b/docs/user-guide/configuring-containers.md @@ -6,13 +6,13 @@ ## Configuration in Kubernetes -In addition to the imperative-style commands, such as `kubectl run` and `kubectl expose`, described [elsewhere](/{{page.version}}/docs/user-guide/quick-start), Kubernetes supports declarative configuration. Often times, configuration files are preferable to imperative commands, since they can be checked into version control and changes to the files can be code reviewed, which is especially important for more complex configurations, producing a more robust, reliable and archival system. +In addition to the imperative-style commands, such as `kubectl run` and `kubectl expose`, described [elsewhere](/docs/user-guide/quick-start), Kubernetes supports declarative configuration. Often times, configuration files are preferable to imperative commands, since they can be checked into version control and changes to the files can be code reviewed, which is especially important for more complex configurations, producing a more robust, reliable and archival system. In the declarative style, all configuration is stored in YAML or JSON configuration files using Kubernetes's API resource schemas as the configuration schemas. `kubectl` can create, update, delete, and get API resources. The `apiVersion` (currently 'v1'?), resource `kind`, and resource `name` are used by `kubectl` to construct the appropriate API path to invoke for the specified operation. ## Launching a container using a configuration file -Kubernetes executes containers in [*Pods*](/{{page.version}}/docs/user-guide/pods). A pod containing a simple Hello World container can be specified in YAML as follows: +Kubernetes executes containers in [*Pods*](/docs/user-guide/pods). A pod containing a simple Hello World container can be specified in YAML as follows: ```yaml apiVersion: v1 @@ -31,7 +31,7 @@ The value of `metadata.name`, `hello-world`, will be the name of the pod resourc `restartPolicy: Never` indicates that we just want to run the container once and then terminate the pod. -The [`command`](/{{page.version}}/docs/user-guide/containers/#containers-and-commands) overrides the Docker container's `Entrypoint`. Command arguments (corresponding to Docker's `Cmd`) may be specified using `args`, as follows: +The [`command`](/docs/user-guide/containers/#containers-and-commands) overrides the Docker container's `Entrypoint`. Command arguments (corresponding to Docker's `Cmd`) may be specified using `args`, as follows: ```yaml command: ["/bin/echo"] @@ -160,4 +160,4 @@ On the other hand, containers and their logs are eventually deleted automaticall ## What's next? -[Learn about deploying continuously running applications.](/{{page.version}}/docs/user-guide/deploying-applications) +[Learn about deploying continuously running applications.](/docs/user-guide/deploying-applications) diff --git a/v1.1/docs/user-guide/connecting-applications.md b/docs/user-guide/connecting-applications.md similarity index 97% rename from v1.1/docs/user-guide/connecting-applications.md rename to docs/user-guide/connecting-applications.md index 0788094ec3..9d00a4b32d 100644 --- a/v1.1/docs/user-guide/connecting-applications.md +++ b/docs/user-guide/connecting-applications.md @@ -57,7 +57,7 @@ $ kubectl get pods -l app=nginx -o json | grep podIP You should be able to ssh into any node in your cluster and curl both IPs. Note that the containers are *not* using port 80 on the node, nor are there any special NAT rules to route traffic to the pod. This means you can run multiple nginx pods on the same node all using the same containerPort and access them from any other pod or node in your cluster using IP. Like Docker, ports can still be published to the host node's interface(s), but the need for this is radically diminished because of the networking model. -You can read more about [how we achieve this](/{{page.version}}/docs/admin/networking/#how-to-achieve-this) if you're curious. +You can read more about [how we achieve this](/docs/admin/networking/#how-to-achieve-this) if you're curious. ## Creating a Service @@ -113,7 +113,7 @@ NAME ENDPOINTS nginxsvc 10.245.0.14:80,10.245.0.15:80 ``` -You should now be able to curl the nginx Service on `10.0.116.146:80` from any node in your cluster. Note that the Service IP is completely virtual, it never hits the wire, if you're curious about how this works you can read more about the [service proxy](/{{page.version}}/docs/user-guide/services/#virtual-ips-and-service-proxies). +You should now be able to curl the nginx Service on `10.0.116.146:80` from any node in your cluster. Note that the Service IP is completely virtual, it never hits the wire, if you're curious about how this works you can read more about the [service proxy](/docs/user-guide/services/#virtual-ips-and-service-proxies). ## Accessing the Service @@ -196,7 +196,7 @@ Till now we have only accessed the nginx server from within the cluster. Before * Self signed certificates for https (unless you already have an identity certificate) * An nginx server configured to use the certificates -* A [secret](/{{page.version}}/docs/user-guide/secrets) that makes the certificates accessible to pods +* A [secret](/docs/user-guide/secrets) that makes the certificates accessible to pods You can acquire all these from the [nginx https example](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/https-nginx/), in short: @@ -383,4 +383,4 @@ cluster/private cloud network. ## What's next? -[Learn about more Kubernetes features that will help you run containers reliably in production.](/{{page.version}}/docs/user-guide/production-pods) +[Learn about more Kubernetes features that will help you run containers reliably in production.](/docs/user-guide/production-pods) diff --git a/v1.1/docs/user-guide/connecting-to-applications-port-forward.md b/docs/user-guide/connecting-to-applications-port-forward.md similarity index 69% rename from v1.1/docs/user-guide/connecting-to-applications-port-forward.md rename to docs/user-guide/connecting-to-applications-port-forward.md index c74dfaa0c5..0cf9add25a 100644 --- a/v1.1/docs/user-guide/connecting-to-applications-port-forward.md +++ b/docs/user-guide/connecting-to-applications-port-forward.md @@ -1,7 +1,7 @@ --- --- -kubectl port-forward forwards connections to a local port to a port on a pod. Its man page is available [here](/{{page.version}}/docs/user-guide/kubectl/kubectl_port-forward). Compared to [kubectl proxy](/{{page.version}}/docs/user-guide/accessing-the-cluster/#using-kubectl-proxy), `kubectl port-forward` is more generic as it can forward TCP traffic while `kubectl proxy` can only forward HTTP traffic. This guide demonstrates how to use `kubectl port-forward` to connect to a Redis database, which may be useful for database debugging. +kubectl port-forward forwards connections to a local port to a port on a pod. Its man page is available [here](/docs/user-guide/kubectl/kubectl_port-forward). Compared to [kubectl proxy](/docs/user-guide/accessing-the-cluster/#using-kubectl-proxy), `kubectl port-forward` is more generic as it can forward TCP traffic while `kubectl proxy` can only forward HTTP traffic. This guide demonstrates how to use `kubectl port-forward` to connect to a Redis database, which may be useful for database debugging. ## Creating a Redis master diff --git a/v1.2/docs/user-guide/connecting-to-applications-proxy.md b/docs/user-guide/connecting-to-applications-proxy.md similarity index 66% rename from v1.2/docs/user-guide/connecting-to-applications-proxy.md rename to docs/user-guide/connecting-to-applications-proxy.md index 26ab41e361..76ccf1a569 100644 --- a/v1.2/docs/user-guide/connecting-to-applications-proxy.md +++ b/docs/user-guide/connecting-to-applications-proxy.md @@ -1,7 +1,7 @@ --- --- -You have seen the [basics](/{{page.version}}/docs/user-guide/accessing-the-cluster) about `kubectl proxy` and `apiserver proxy`. This guide shows how to use them together to access a service([kube-ui](/{{page.version}}/docs/user-guide/ui)) running on the Kubernetes cluster from your workstation. +You have seen the [basics](/docs/user-guide/accessing-the-cluster) about `kubectl proxy` and `apiserver proxy`. This guide shows how to use them together to access a service([kube-ui](/docs/user-guide/ui)) running on the Kubernetes cluster from your workstation. ## Getting the apiserver proxy URL of kube-ui @@ -13,7 +13,7 @@ $ kubectl cluster-info | grep "KubeUI" KubeUI is running at https://173.255.119.104/api/v1/proxy/namespaces/kube-system/services/kube-ui ``` -if this command does not find the URL, try the steps [here](/{{page.version}}/docs/user-guide/ui/#accessing-the-ui). +if this command does not find the URL, try the steps [here](/docs/user-guide/ui/#accessing-the-ui). ## Connecting to the kube-ui service from your local workstation diff --git a/v1.2/docs/user-guide/container-environment.md b/docs/user-guide/container-environment.md similarity index 91% rename from v1.2/docs/user-guide/container-environment.md rename to docs/user-guide/container-environment.md index b816cd3442..35fcac136f 100644 --- a/v1.2/docs/user-guide/container-environment.md +++ b/docs/user-guide/container-environment.md @@ -6,7 +6,7 @@ This document describes the environment for Kubelet managed containers on a Kube This cluster information makes it possible to build applications that are *cluster aware*. Additionally, the Kubernetes container environment defines a series of hooks that are surfaced to optional hook handlers defined as part of individual containers.  Container hooks are somewhat analogous to operating system signals in a traditional process model.   However these hooks are designed to make it easier to build reliable, scalable cloud applications in the Kubernetes cluster.  Containers that participate in this cluster lifecycle become *cluster native*. -Another important part of the container environment is the file system that is available to the container. In Kubernetes, the filesystem is a combination of an [image](/{{page.version}}/docs/user-guide/images) and one or more [volumes](/{{page.version}}/docs/user-guide/volumes). +Another important part of the container environment is the file system that is available to the container. In Kubernetes, the filesystem is a combination of an [image](/docs/user-guide/images) and one or more [volumes](/docs/user-guide/volumes). The following sections describe both the cluster information provided to containers, as well as the hooks and life-cycle that allows containers to interact with the management system. @@ -21,7 +21,7 @@ There are two types of information that are available within the container envir Currently, the Pod name for the pod in which the container is running is set as the hostname of the container, and is accessible through all calls to access the hostname within the container (e.g. the hostname command, or the [gethostname][1] function call in libc), but this is planned to change in the future and should not be used. -The Pod name and namespace are also available as environment variables via the [downward API](/{{page.version}}/docs/user-guide/downward-api). Additionally, user-defined environment variables from the pod definition, are also available to the container, as are any environment variables specified statically in the Docker image. +The Pod name and namespace are also available as environment variables via the [downward API](/docs/user-guide/downward-api). Additionally, user-defined environment variables from the pod definition, are also available to the container, as are any environment variables specified statically in the Docker image. In the future, we anticipate expanding this information with richer information about the container.  Examples include available memory, number of restarts, and in general any state that you could get from the call to GET /pods on the API server. @@ -52,7 +52,7 @@ This hook is sent immediately after a container is created.  It notifies the co *PreStop* -This hook is called immediately before a container is terminated. No parameters are passed to the handler. This event handler is blocking, and must complete before the call to delete the container is sent to the Docker daemon. The SIGTERM notification sent by Docker is also still sent. A more complete description of termination behavior can be found in [Termination of Pods](/{{page.version}}/docs/user-guide/pods/#termination-of-pods). +This hook is called immediately before a container is terminated. No parameters are passed to the handler. This event handler is blocking, and must complete before the call to delete the container is sent to the Docker daemon. The SIGTERM notification sent by Docker is also still sent. A more complete description of termination behavior can be found in [Termination of Pods](/docs/user-guide/pods/#termination-of-pods). ### Hook Handler Execution diff --git a/v1.1/docs/user-guide/containers.md b/docs/user-guide/containers.md similarity index 100% rename from v1.1/docs/user-guide/containers.md rename to docs/user-guide/containers.md diff --git a/v1.1/docs/user-guide/debugging-services.md b/docs/user-guide/debugging-services.md similarity index 99% rename from v1.1/docs/user-guide/debugging-services.md rename to docs/user-guide/debugging-services.md index b0aea4739b..d9cea7e5b9 100644 --- a/v1.1/docs/user-guide/debugging-services.md +++ b/docs/user-guide/debugging-services.md @@ -494,10 +494,10 @@ misbehaving. And yet your `Service` is not working. You should probably let us know, so we can help investigate! Contact us on -[Slack](/{{page.version}}/docs/troubleshooting/#slack) or +[Slack](/docs/troubleshooting/#slack) or [email](https://groups.google.com/forum/#!forum/google-containers) or [GitHub](https://github.com/kubernetes/kubernetes). ## More information -Visit [troubleshooting document](/{{page.version}}/docs/troubleshooting/) for more information. \ No newline at end of file +Visit [troubleshooting document](/docs/troubleshooting/) for more information. \ No newline at end of file diff --git a/v1.1/docs/user-guide/deploying-applications.md b/docs/user-guide/deploying-applications.md similarity index 77% rename from v1.1/docs/user-guide/deploying-applications.md rename to docs/user-guide/deploying-applications.md index 6bd8c1cb93..d573c7d3a5 100644 --- a/v1.1/docs/user-guide/deploying-applications.md +++ b/docs/user-guide/deploying-applications.md @@ -1,18 +1,18 @@ --- --- -You previously read about how to quickly deploy a simple replicated application using [`kubectl run`](/{{page.version}}/docs/user-guide/quick-start) and how to configure and launch single-run containers using pods ([Configuring containers](/{{page.version}}/docs/user-guide/configuring-containers)). Here you'll use the configuration-based approach to deploy a continuously running, replicated application. +You previously read about how to quickly deploy a simple replicated application using [`kubectl run`](/docs/user-guide/quick-start) and how to configure and launch single-run containers using pods ([Configuring containers](/docs/user-guide/configuring-containers)). Here you'll use the configuration-based approach to deploy a continuously running, replicated application. * TOC {:toc} ## Launching a set of replicas using a configuration file -Kubernetes creates and manages sets of replicated containers (actually, replicated [Pods](/{{page.version}}/docs/user-guide/pods)) using [*Replication Controllers*](/{{page.version}}/docs/user-guide/replication-controller). +Kubernetes creates and manages sets of replicated containers (actually, replicated [Pods](/docs/user-guide/pods)) using [*Replication Controllers*](/docs/user-guide/replication-controller). A replication controller simply ensures that a specified number of pod "replicas" are running at any one time. If there are too many, it will kill some. If there are too few, it will start more. It's analogous to Google Compute Engine's [Instance Group Manager](https://cloud.google.com/compute/docs/instance-groups/manager/) or AWS's [Auto-scaling Group](http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingGroup) (with no scaling policies). -The replication controller created to run nginx by `kubectl run` in the [Quick start](/{{page.version}}/docs/user-guide/quick-start) could be specified using YAML as follows: +The replication controller created to run nginx by `kubectl run` in the [Quick start](/docs/user-guide/quick-start) could be specified using YAML as follows: ```yaml apiVersion: v1 @@ -70,7 +70,7 @@ my-nginx-buaiq 1/1 Running 0 51s ## Deleting replication controllers -When you want to kill your application, delete your replication controller, as in the [Quick start](/{{page.version}}/docs/user-guide/quick-start): +When you want to kill your application, delete your replication controller, as in the [Quick start](/docs/user-guide/quick-start): ```shell $ kubectl delete rc my-nginx @@ -83,7 +83,7 @@ If you try to delete the pods before deleting the replication controller, it wil ## Labels -Kubernetes uses user-defined key-value attributes called [*labels*](/{{page.version}}/docs/user-guide/labels) to categorize and identify sets of resources, such as pods and replication controllers. The example above specified a single label in the pod template, with key `app` and value `nginx`. All pods created carry that label, which can be viewed using `-L`: +Kubernetes uses user-defined key-value attributes called [*labels*](/docs/user-guide/labels) to categorize and identify sets of resources, such as pods and replication controllers. The example above specified a single label in the pod template, with key `app` and value `nginx`. All pods created carry that label, which can be viewed using `-L`: ```shell $ kubectl get pods -L app @@ -100,7 +100,7 @@ CONTROLLER CONTAINER(S) IMAGE(S) SELECTOR REPLICAS APP my-nginx nginx nginx app=nginx 2 nginx ``` -More importantly, the pod template's labels are used to create a [`selector`](/{{page.version}}/docs/user-guide/labels/#label-selectors) that will match pods carrying those labels. You can see this field by requesting it using the [Go template output format of `kubectl get`](/{{page.version}}/docs/user-guide/kubectl/kubectl_get): +More importantly, the pod template's labels are used to create a [`selector`](/docs/user-guide/labels/#label-selectors) that will match pods carrying those labels. You can see this field by requesting it using the [Go template output format of `kubectl get`](/docs/user-guide/kubectl/kubectl_get): ```shell $ kubectl get rc my-nginx -o template --template="{{.spec.selector}}" @@ -111,4 +111,4 @@ You could also specify the `selector` explicitly, such as if you wanted to speci ## What's next? -[Learn about exposing applications to users and clients, and connecting tiers of your application together.](/{{page.version}}/docs/user-guide/connecting-applications) \ No newline at end of file +[Learn about exposing applications to users and clients, and connecting tiers of your application together.](/docs/user-guide/connecting-applications) \ No newline at end of file diff --git a/v1.2/docs/user-guide/deployments.md b/docs/user-guide/deployments.md similarity index 92% rename from v1.2/docs/user-guide/deployments.md rename to docs/user-guide/deployments.md index 014ff690a4..9d24c5c31c 100644 --- a/v1.2/docs/user-guide/deployments.md +++ b/docs/user-guide/deployments.md @@ -19,14 +19,14 @@ A typical use case is: ## Enabling Deployments on kubernetes cluster -Deployments is part of the [`extensions` API Group](/{{page.version}}/docs/api/#api-groups) and is not enabled by default. +Deployments is part of the [`extensions` API Group](/docs/api/#api-groups) and is not enabled by default. Set `--runtime-config=extensions/v1beta1/deployments=true` on API server to enable it. This can be achieved by exporting `ENABLE_DEPLOYMENTS=true` before running `kube-up.sh` script on GCE. Note that Deployment objects effectively have [API version -`v1alpha1`](/{{page.version}}/docs/api/)#api-versioning). +`v1alpha1`](/docs/api/)#api-versioning). Alpha objects may change or even be discontinued in future software releases. However, due to to a known issue, they will appear as API version `v1beta1` if enabled. @@ -57,7 +57,7 @@ spec: - containerPort: 80 ``` -[Download example](/{{page.version}}/docs/user-guide/nginx-deployment.yaml) +[Download example](/docs/user-guide/nginx-deployment.yaml) Run the example by downloading the example file and then running this command: @@ -135,7 +135,7 @@ spec: - containerPort: 80 ``` -[Download example](/{{page.version}}/docs/user-guide/new-nginx-deployment.yaml) +[Download example](/docs/user-guide/new-nginx-deployment.yaml) @@ -250,16 +250,16 @@ before changing course. As with all other Kubernetes configs, a Deployment needs `apiVersion`, `kind`, and `metadata` fields. For general information about working with config files, -see [here](/{{page.version}}/docs/user-guide/deploying-applications), [here](/{{page.version}}/docs/user-guide/configuring-containers), and [here](/{{page.version}}/docs/user-guide/working-with-resources). +see [here](/docs/user-guide/deploying-applications), [here](/docs/user-guide/configuring-containers), and [here](/docs/user-guide/working-with-resources). -A Deployment also needs a [`.spec` section](/{{page.version}}/docs/devel/api-conventions/#spec-and-status). +A Deployment also needs a [`.spec` section](/docs/devel/api-conventions/#spec-and-status). ### Pod Template The `.spec.template` is the only required field of the `.spec`. -The `.spec.template` is a [pod template](/{{page.version}}/docs/user-guide/replication-controller/#pod-template). It has exactly -the same schema as a [pod](/{{page.version}}/docs/user-guide/pods), except it is nested and does not have an +The `.spec.template` is a [pod template](/docs/user-guide/replication-controller/#pod-template). It has exactly +the same schema as a [pod](/docs/user-guide/pods), except it is nested and does not have an `apiVersion` or `kind`. ### Replicas @@ -347,5 +347,5 @@ Note: This is not implemented yet. ### kubectl rolling update -[Kubectl rolling update](/{{page.version}}/docs/user-guide/kubectl/kubectl_rolling-update) also updates pods and replication controllers in a similar fashion. +[Kubectl rolling update](/docs/user-guide/kubectl/kubectl_rolling-update) also updates pods and replication controllers in a similar fashion. But deployments is declarative and is server side. \ No newline at end of file diff --git a/v1.1/docs/user-guide/docker-cli-to-kubectl.md b/docs/user-guide/docker-cli-to-kubectl.md similarity index 86% rename from v1.1/docs/user-guide/docker-cli-to-kubectl.md rename to docs/user-guide/docker-cli-to-kubectl.md index 71e31f6087..10bc548a4d 100644 --- a/v1.1/docs/user-guide/docker-cli-to-kubectl.md +++ b/docs/user-guide/docker-cli-to-kubectl.md @@ -8,7 +8,7 @@ In this doc, we introduce the Kubernetes command line for interacting with the a #### docker run -How do I run an nginx container and expose it to the world? Checkout [kubectl run](/{{page.version}}/docs/user-guide/kubectl/kubectl_run). +How do I run an nginx container and expose it to the world? Checkout [kubectl run](/docs/user-guide/kubectl/kubectl_run). With docker: @@ -30,7 +30,7 @@ replicationcontroller "nginx-app" created $ kubectl expose rc nginx-app --port=80 --name=nginx-http ``` -With kubectl, we create a [replication controller](/{{page.version}}/docs/user-guide/replication-controller) which will make sure that N pods are running nginx (where N is the number of replicas stated in the spec, which defaults to 1). We also create a [service](/{{page.version}}/docs/user-guide/services) with a selector that matches the replication controller's selector. See the [Quick start](/{{page.version}}/docs/user-guide/quick-start) for more information. +With kubectl, we create a [replication controller](/docs/user-guide/replication-controller) which will make sure that N pods are running nginx (where N is the number of replicas stated in the spec, which defaults to 1). We also create a [service](/docs/user-guide/services) with a selector that matches the replication controller's selector. See the [Quick start](/docs/user-guide/quick-start) for more information. By default images are run in the background, similar to `docker run -d ...`, if you want to run things in the foreground, use: @@ -45,7 +45,7 @@ To destroy the replication controller (and it's pods) you need to run `kubectl #### docker ps -How do I list what is currently running? Checkout [kubectl get](/{{page.version}}/docs/user-guide/kubectl/kubectl_get). +How do I list what is currently running? Checkout [kubectl get](/docs/user-guide/kubectl/kubectl_get). With docker: @@ -65,7 +65,7 @@ nginx-app-5jyvm 1/1 Running 0 1h #### docker attach -How do I attach to a process that is already running in a container? Checkout [kubectl attach](/{{page.version}}/docs/user-guide/kubectl/kubectl_attach) +How do I attach to a process that is already running in a container? Checkout [kubectl attach](/docs/user-guide/kubectl/kubectl_attach) With docker: @@ -89,7 +89,7 @@ $ kubectl attach -it nginx-app-5jyvm #### docker exec -How do I execute a command in a container? Checkout [kubectl exec](/{{page.version}}/docs/user-guide/kubectl/kubectl_exec). +How do I execute a command in a container? Checkout [kubectl exec](/docs/user-guide/kubectl/kubectl_exec). With docker: @@ -128,11 +128,11 @@ $ kubectl exec -ti nginx-app-5jyvm -- /bin/sh # exit ``` -For more information see [Getting into containers](/{{page.version}}/docs/user-guide/getting-into-containers). +For more information see [Getting into containers](/docs/user-guide/getting-into-containers). #### docker logs -How do I follow stdout/stderr of a running process? Checkout [kubectl logs](/{{page.version}}/docs/user-guide/kubectl/kubectl_logs). +How do I follow stdout/stderr of a running process? Checkout [kubectl logs](/docs/user-guide/kubectl/kubectl_logs). With docker: @@ -159,11 +159,11 @@ $ kubectl logs --previous nginx-app-zibvs 10.240.63.110 - - [14/Jul/2015:01:09:02 +0000] "GET / HTTP/1.1" 200 612 "-" "curl/7.26.0" "-" ``` -See [Logging](/{{page.version}}/docs/user-guide/logging) for more information. +See [Logging](/docs/user-guide/logging) for more information. #### docker stop and docker rm -How do I stop and delete a running process? Checkout [kubectl delete](/{{page.version}}/docs/user-guide/kubectl/kubectl_delete). +How do I stop and delete a running process? Checkout [kubectl delete](/docs/user-guide/kubectl/kubectl_delete). With docker @@ -197,11 +197,11 @@ Notice that we don't delete the pod directly. With kubectl we want to delete the #### docker login -There is no direct analog of `docker login` in kubectl. If you are interested in using Kubernetes with a private registry, see [Using a Private Registry](/{{page.version}}/docs/user-guide/images/#using-a-private-registry). +There is no direct analog of `docker login` in kubectl. If you are interested in using Kubernetes with a private registry, see [Using a Private Registry](/docs/user-guide/images/#using-a-private-registry). #### docker version -How do I get the version of my client and server? Checkout [kubectl version](/{{page.version}}/docs/user-guide/kubectl/kubectl_version). +How do I get the version of my client and server? Checkout [kubectl version](/docs/user-guide/kubectl/kubectl_version). With docker: @@ -229,7 +229,7 @@ Server Version: version.Info{Major:"0", Minor:"21+", GitVersion:"v0.21.1-411-g32 #### docker info -How do I get miscellaneous info about my environment and configuration? Checkout [kubectl cluster-info](/{{page.version}}/docs/user-guide/kubectl/kubectl_cluster-info). +How do I get miscellaneous info about my environment and configuration? Checkout [kubectl cluster-info](/docs/user-guide/kubectl/kubectl_cluster-info). With docker: diff --git a/v1.1/docs/user-guide/downward-api.md b/docs/user-guide/downward-api.md similarity index 90% rename from v1.1/docs/user-guide/downward-api.md rename to docs/user-guide/downward-api.md index e9e4a320eb..24d34a01e6 100644 --- a/v1.1/docs/user-guide/downward-api.md +++ b/docs/user-guide/downward-api.md @@ -76,7 +76,7 @@ spec: restartPolicy: Never ``` -[Download example](/{{page.version}}/docs/user-guide/downward-api/dapi-pod.yaml) +[Download example](/docs/user-guide/downward-api/dapi-pod.yaml) @@ -86,7 +86,7 @@ Using a similar syntax it's possible to expose pod information to containers usi Downward API are dumped to a mounted volume. This is achieved using a `downwardAPI` volume type and the different items represent the files to be created. `fieldPath` references the field to be exposed. -Downward API volume permits to store more complex data like [`metadata.labels`](/{{page.version}}/docs/user-guide/labels) and [`metadata.annotations`](/{{page.version}}/docs/user-guide/annotations). Currently key/value pair set fields are saved using `key="value"` format: +Downward API volume permits to store more complex data like [`metadata.labels`](/docs/user-guide/labels) and [`metadata.annotations`](/docs/user-guide/annotations). Currently key/value pair set fields are saved using `key="value"` format: ```conf key1="value1" @@ -145,10 +145,10 @@ spec: fieldPath: metadata.annotations ``` -[Download example](/{{page.version}}/docs/user-guide/downward-api/volume/dapi-volume.yaml) +[Download example](/docs/user-guide/downward-api/volume/dapi-volume.yaml) Some more thorough examples: - * [environment variables](/{{page.version}}/docs/user-guide/environment-guide/) - * [downward API](/{{page.version}}/docs/user-guide/downward-api/) \ No newline at end of file + * [environment variables](/docs/user-guide/environment-guide/) + * [downward API](/docs/user-guide/downward-api/) \ No newline at end of file diff --git a/v1.1/docs/user-guide/downward-api/dapi-pod.yaml b/docs/user-guide/downward-api/dapi-pod.yaml similarity index 100% rename from v1.1/docs/user-guide/downward-api/dapi-pod.yaml rename to docs/user-guide/downward-api/dapi-pod.yaml diff --git a/v1.2/docs/user-guide/downward-api/index.md b/docs/user-guide/downward-api/index.md similarity index 75% rename from v1.2/docs/user-guide/downward-api/index.md rename to docs/user-guide/downward-api/index.md index 222bf0acaf..2bb36e7743 100644 --- a/v1.2/docs/user-guide/downward-api/index.md +++ b/docs/user-guide/downward-api/index.md @@ -2,20 +2,20 @@ --- Following this example, you will create a pod with a container that consumes the pod's name and -namespace using the [downward API](/{{page.version}}/docs/user-guide/downward-api/). +namespace using the [downward API](/docs/user-guide/downward-api/). ## Step Zero: Prerequisites This example assumes you have a Kubernetes cluster installed and running, and that you have installed the `kubectl` command line tool somewhere in your path. Please see the [getting -started](/{{page.version}}/docs/getting-started-guides/) for installation instructions for your platform. +started](/docs/getting-started-guides/) for installation instructions for your platform. ## Step One: Create the pod Containers consume the downward API using environment variables. The downward API allows containers to be injected with the name and namespace of the pod the container is in. -Use the [`dapi-pod.yaml`](/{{page.version}}/docs/user-guide/downward-api/dapi-pod.yaml) file to create a Pod with a container that consumes the +Use the [`dapi-pod.yaml`](/docs/user-guide/downward-api/dapi-pod.yaml) file to create a Pod with a container that consumes the downward API. ```shell diff --git a/v1.1/docs/user-guide/downward-api/volume/dapi-volume.yaml b/docs/user-guide/downward-api/volume/dapi-volume.yaml similarity index 100% rename from v1.1/docs/user-guide/downward-api/volume/dapi-volume.yaml rename to docs/user-guide/downward-api/volume/dapi-volume.yaml diff --git a/v1.1/docs/user-guide/downward-api/volume/index.md b/docs/user-guide/downward-api/volume/index.md similarity index 93% rename from v1.1/docs/user-guide/downward-api/volume/index.md rename to docs/user-guide/downward-api/volume/index.md index 1894903d94..bef993725b 100644 --- a/v1.1/docs/user-guide/downward-api/volume/index.md +++ b/docs/user-guide/downward-api/volume/index.md @@ -2,7 +2,7 @@ --- Following this example, you will create a pod with a downward API volume. -A downward API volume is a k8s volume plugin with the ability to save some pod information in a plain text file. The pod information can be for example some [metadata](/{{page.version}}/docs/devel/api-conventions/#metadata). +A downward API volume is a k8s volume plugin with the ability to save some pod information in a plain text file. The pod information can be for example some [metadata](/docs/devel/api-conventions/#metadata). Supported metadata fields: @@ -14,7 +14,7 @@ Supported metadata fields: ### Step Zero: Prerequisites This example assumes you have a Kubernetes cluster installed and running, and the `kubectl` -command line tool somewhere in your path. Please see the [gettingstarted](/{{page.version}}/docs/getting-started-guides/) for installation instructions for your platform. +command line tool somewhere in your path. Please see the [gettingstarted](/docs/getting-started-guides/) for installation instructions for your platform. ### Step One: Create the pod diff --git a/v1.1/docs/user-guide/environment-guide/backend-rc.yaml b/docs/user-guide/environment-guide/backend-rc.yaml similarity index 100% rename from v1.1/docs/user-guide/environment-guide/backend-rc.yaml rename to docs/user-guide/environment-guide/backend-rc.yaml diff --git a/v1.1/docs/user-guide/environment-guide/backend-srv.yaml b/docs/user-guide/environment-guide/backend-srv.yaml similarity index 100% rename from v1.1/docs/user-guide/environment-guide/backend-srv.yaml rename to docs/user-guide/environment-guide/backend-srv.yaml diff --git a/v1.1/docs/user-guide/environment-guide/containers/backend/Dockerfile b/docs/user-guide/environment-guide/containers/backend/Dockerfile similarity index 100% rename from v1.1/docs/user-guide/environment-guide/containers/backend/Dockerfile rename to docs/user-guide/environment-guide/containers/backend/Dockerfile diff --git a/v1.1/docs/user-guide/environment-guide/containers/backend/backend.go b/docs/user-guide/environment-guide/containers/backend/backend.go similarity index 100% rename from v1.1/docs/user-guide/environment-guide/containers/backend/backend.go rename to docs/user-guide/environment-guide/containers/backend/backend.go diff --git a/v1.1/docs/user-guide/environment-guide/containers/index.md b/docs/user-guide/environment-guide/containers/index.md similarity index 100% rename from v1.1/docs/user-guide/environment-guide/containers/index.md rename to docs/user-guide/environment-guide/containers/index.md diff --git a/v1.1/docs/user-guide/environment-guide/containers/show/Dockerfile b/docs/user-guide/environment-guide/containers/show/Dockerfile similarity index 100% rename from v1.1/docs/user-guide/environment-guide/containers/show/Dockerfile rename to docs/user-guide/environment-guide/containers/show/Dockerfile diff --git a/v1.1/docs/user-guide/environment-guide/containers/show/show.go b/docs/user-guide/environment-guide/containers/show/show.go similarity index 100% rename from v1.1/docs/user-guide/environment-guide/containers/show/show.go rename to docs/user-guide/environment-guide/containers/show/show.go diff --git a/v1.2/docs/user-guide/environment-guide/index.md b/docs/user-guide/environment-guide/index.md similarity index 84% rename from v1.2/docs/user-guide/environment-guide/index.md rename to docs/user-guide/environment-guide/index.md index 43d1b38acd..ee96df9e04 100644 --- a/v1.2/docs/user-guide/environment-guide/index.md +++ b/docs/user-guide/environment-guide/index.md @@ -8,7 +8,7 @@ environment information about itself, and a backend pod that it has accessed through the service. The goal is to illuminate the environment metadata available to running containers inside the Kubernetes cluster. The documentation for the Kubernetes environment -is [here](/{{page.version}}/docs/user-guide/container-environment). +is [here](/docs/user-guide/container-environment). ![Diagram](/images/docs/diagram.png) @@ -17,13 +17,13 @@ is [here](/{{page.version}}/docs/user-guide/container-environment). This example assumes that you have a Kubernetes cluster installed and running, and that you have installed the `kubectl` command line tool somewhere in your path. Please see the [getting -started](/{{page.version}}/docs/getting-started-guides/) for installation instructions +started](/docs/getting-started-guides/) for installation instructions for your platform. ## Optional: Build your own containers The code for the containers is under -[containers/](/{{page.version}}/docs/user-guide/environment-guide/containers/) +[containers/](/docs/user-guide/environment-guide/containers/) ## Get everything running @@ -70,9 +70,9 @@ Backend Namespace: default First the frontend pod's information is printed. The pod name and [namespace](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/namespaces.md) are retrieved from the -[Downward API](/{{page.version}}/docs/user-guide/downward-api). Next, `USER_VAR` is the name of +[Downward API](/docs/user-guide/downward-api). Next, `USER_VAR` is the name of an environment variable set in the [pod -definition](/{{page.version}}/docs/user-guide/environment-guide/show-rc.yaml). Then, the dynamic Kubernetes environment +definition](/docs/user-guide/environment-guide/show-rc.yaml). Then, the dynamic Kubernetes environment variables are scanned and printed. These are used to find the backend service, named `backend-srv`. Finally, the frontend pod queries the backend service and prints the information returned. Again the backend diff --git a/v1.1/docs/user-guide/environment-guide/show-rc.yaml b/docs/user-guide/environment-guide/show-rc.yaml similarity index 100% rename from v1.1/docs/user-guide/environment-guide/show-rc.yaml rename to docs/user-guide/environment-guide/show-rc.yaml diff --git a/v1.1/docs/user-guide/environment-guide/show-srv.yaml b/docs/user-guide/environment-guide/show-srv.yaml similarity index 100% rename from v1.1/docs/user-guide/environment-guide/show-srv.yaml rename to docs/user-guide/environment-guide/show-srv.yaml diff --git a/v1.1/docs/user-guide/getting-into-containers.md b/docs/user-guide/getting-into-containers.md similarity index 87% rename from v1.1/docs/user-guide/getting-into-containers.md rename to docs/user-guide/getting-into-containers.md index 03b0109a2c..94e25f580c 100644 --- a/v1.1/docs/user-guide/getting-into-containers.md +++ b/docs/user-guide/getting-into-containers.md @@ -5,7 +5,7 @@ Developers can use `kubectl exec` to run commands in a container. This guide dem ## Using kubectl exec to check the environment variables of a container -Kubernetes exposes [services](/{{page.version}}/docs/user-guide/services/#environment-variables) through environment variables. It is convenient to check these environment variables using `kubectl exec`. +Kubernetes exposes [services](/docs/user-guide/services/#environment-variables) through environment variables. It is convenient to check these environment variables using `kubectl exec`. We first create a pod and a service, diff --git a/v1.1/docs/user-guide/horizontal-pod-autoscaler.md b/docs/user-guide/horizontal-pod-autoscaler.md similarity index 90% rename from v1.1/docs/user-guide/horizontal-pod-autoscaler.md rename to docs/user-guide/horizontal-pod-autoscaler.md index 1ad4cc651a..0a1fbca549 100644 --- a/v1.1/docs/user-guide/horizontal-pod-autoscaler.md +++ b/docs/user-guide/horizontal-pod-autoscaler.md @@ -7,7 +7,7 @@ This document describes the current state of Horizontal Pod Autoscaler in Kubern Horizontal pod autoscaling allows the number of pods in a replication controller or deployment to scale automatically based on observed CPU utilization. -It is a [beta](/{{page.version}}/docs/api/)#api-versioning) feature in Kubernetes 1.1. +It is a [beta](/docs/api/)#api-versioning) feature in Kubernetes 1.1. The autoscaler is implemented as a Kubernetes API resource and a controller. The resource describes behavior of the controller. @@ -40,7 +40,7 @@ More details on scale sub-resource can be found [here](https://github.com/kubern ## API Object -Horizontal pod autoscaler is a top-level resource in the Kubernetes REST API (currently in [beta](/{{page.version}}/docs/api/)#api-versioning)). +Horizontal pod autoscaler is a top-level resource in the Kubernetes REST API (currently in [beta](/docs/api/)#api-versioning)). More details about the API object can be found at [HorizontalPodAutoscaler Object](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/horizontal-pod-autoscaler.md#horizontalpodautoscaler-object). @@ -55,7 +55,7 @@ In addition, there is a special `kubectl autoscale` command that allows for easy For instance, executing `kubectl autoscale rc foo --min=2 --max=5 --cpu-percent=80` will create an autoscaler for replication controller *foo*, with target CPU utilization set to `80%` and the number of replicas between 2 and 5. -The detailed documentation of `kubectl autoscale` can be found [here](/{{page.version}}/docs/user-guide/kubectl/kubectl_autoscale). +The detailed documentation of `kubectl autoscale` can be found [here](/docs/user-guide/kubectl/kubectl_autoscale). ## Autoscaling during rolling update @@ -74,5 +74,5 @@ the horizontal pod autoscaler will not be bound to the new replication controlle ## Further reading * Design documentation: [Horizontal Pod Autoscaling](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/horizontal-pod-autoscaler.md). -* Manual of autoscale command in kubectl: [kubectl autoscale](/{{page.version}}/docs/user-guide/kubectl/kubectl_autoscale). -* Usage example of [Horizontal Pod Autoscaler](/{{page.version}}/docs/user-guide/horizontal-pod-autoscaling/). \ No newline at end of file +* Manual of autoscale command in kubectl: [kubectl autoscale](/docs/user-guide/kubectl/kubectl_autoscale). +* Usage example of [Horizontal Pod Autoscaler](/docs/user-guide/horizontal-pod-autoscaling/). \ No newline at end of file diff --git a/v1.1/docs/user-guide/horizontal-pod-autoscaling/hpa-php-apache.yaml b/docs/user-guide/horizontal-pod-autoscaling/hpa-php-apache.yaml similarity index 100% rename from v1.1/docs/user-guide/horizontal-pod-autoscaling/hpa-php-apache.yaml rename to docs/user-guide/horizontal-pod-autoscaling/hpa-php-apache.yaml diff --git a/v1.1/docs/user-guide/horizontal-pod-autoscaling/image/Dockerfile b/docs/user-guide/horizontal-pod-autoscaling/image/Dockerfile similarity index 100% rename from v1.1/docs/user-guide/horizontal-pod-autoscaling/image/Dockerfile rename to docs/user-guide/horizontal-pod-autoscaling/image/Dockerfile diff --git a/v1.1/docs/user-guide/horizontal-pod-autoscaling/image/index.php b/docs/user-guide/horizontal-pod-autoscaling/image/index.php similarity index 100% rename from v1.1/docs/user-guide/horizontal-pod-autoscaling/image/index.php rename to docs/user-guide/horizontal-pod-autoscaling/image/index.php diff --git a/v1.2/docs/user-guide/horizontal-pod-autoscaling/index.md b/docs/user-guide/horizontal-pod-autoscaling/index.md similarity index 91% rename from v1.2/docs/user-guide/horizontal-pod-autoscaling/index.md rename to docs/user-guide/horizontal-pod-autoscaling/index.md index 25747788de..074304194b 100644 --- a/v1.2/docs/user-guide/horizontal-pod-autoscaling/index.md +++ b/docs/user-guide/horizontal-pod-autoscaling/index.md @@ -1,7 +1,7 @@ --- --- -Horizontal pod autoscaling is a [beta](/{{page.version}}/docs/api/#api-versioning) feature in Kubernetes 1.1. +Horizontal pod autoscaling is a [beta](/docs/api/#api-versioning) feature in Kubernetes 1.1. It allows the number of pods in a replication controller or deployment to scale automatically based on observed CPU usage. In the future also other metrics will be supported. @@ -12,7 +12,7 @@ In this document we explain how this feature works by walking you through an exa This example requires a running Kubernetes cluster and kubectl in the version at least 1.1. [Heapster](https://github.com/kubernetes/heapster) monitoring needs to be deployed in the cluster as horizontal pod autoscaler uses it to collect metrics -(if you followed [getting started on GCE guide](/{{page.version}}/docs/getting-started-guides/gce), +(if you followed [getting started on GCE guide](/docs/getting-started-guides/gce), heapster monitoring will be turned-on by default). @@ -20,7 +20,7 @@ heapster monitoring will be turned-on by default). To demonstrate horizontal pod autoscaler we will use a custom docker image based on php-apache server. The image can be found [here](https://releases.k8s.io/{{page.githubbranch}}/docs/user-guide/horizontal-pod-autoscaling/image). -It defines [index.php](/{{page.version}}/docs/user-guide/horizontal-pod-autoscaling/image/index.php) page which performs some CPU intensive computations. +It defines [index.php](/docs/user-guide/horizontal-pod-autoscaling/image/index.php) page which performs some CPU intensive computations. First, we will start a replication controller running the image and expose it as an external service: @@ -69,7 +69,7 @@ OK! ## Step Two: Create horizontal pod autoscaler Now that the server is running, we will create a horizontal pod autoscaler for it. -To create it, we will use the [hpa-php-apache.yaml](/{{page.version}}/docs/user-guide/horizontal-pod-autoscaling/hpa-php-apache.yaml) file, which looks like this: +To create it, we will use the [hpa-php-apache.yaml](/docs/user-guide/horizontal-pod-autoscaling/hpa-php-apache.yaml) file, which looks like this: ```yaml apiVersion: extensions/v1beta1 @@ -103,7 +103,7 @@ horizontalpodautoscaler "php-apache" created ``` Alternatively, we can create the autoscaler using [kubectl autoscale](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/user-guide/kubectl/kubectl_autoscale.md). -The following command will create the equivalent autoscaler as defined in the [hpa-php-apache.yaml](/{{page.version}}/docs/user-guide/horizontal-pod-autoscaling/hpa-php-apache.yaml) file: +The following command will create the equivalent autoscaler as defined in the [hpa-php-apache.yaml](/docs/user-guide/horizontal-pod-autoscaling/hpa-php-apache.yaml) file: ```shell $ kubectl autoscale rc php-apache --cpu-percent=50 --min=1 --max=10 diff --git a/v1.1/docs/user-guide/identifiers.md b/docs/user-guide/identifiers.md similarity index 90% rename from v1.1/docs/user-guide/identifiers.md rename to docs/user-guide/identifiers.md index 44d820c6ab..b5fd025e29 100644 --- a/v1.1/docs/user-guide/identifiers.md +++ b/docs/user-guide/identifiers.md @@ -3,7 +3,7 @@ All objects in the Kubernetes REST API are unambiguously identified by a Name and a UID. -For non-unique user-provided attributes, Kubernetes provides [labels](/{{page.version}}/docs/user-guide/labels) and [annotations](/{{page.version}}/docs/user-guide/annotations). +For non-unique user-provided attributes, Kubernetes provides [labels](/docs/user-guide/labels) and [annotations](/docs/user-guide/annotations). ## Names diff --git a/v1.1/docs/user-guide/images.md b/docs/user-guide/images.md similarity index 98% rename from v1.1/docs/user-guide/images.md rename to docs/user-guide/images.md index 05020328f1..48832d4f84 100644 --- a/v1.1/docs/user-guide/images.md +++ b/docs/user-guide/images.md @@ -146,7 +146,7 @@ where node creation is automated. Kubernetes supports specifying registry keys on a pod. First, create a `.dockercfg`, such as running `docker login `. -Then put the resulting `.dockercfg` file into a [secret resource](/{{page.version}}/docs/user-guide/secrets). For example: +Then put the resulting `.dockercfg` file into a [secret resource](/docs/user-guide/secrets). For example: ```shell $ docker login @@ -201,7 +201,7 @@ spec: This needs to be done for each pod that is using a private registry. However, setting of this field can be automated by setting the imagePullSecrets -in a [serviceAccount](/{{page.version}}/docs/user-guide/service-accounts) resource. +in a [serviceAccount](/docs/user-guide/service-accounts) resource. Currently, all pods will potentially have read access to any images which were pulled using imagePullSecrets. That is, imagePullSecrets does *NOT* protect your diff --git a/docs/user-guide/index.md b/docs/user-guide/index.md new file mode 100644 index 0000000000..9dbabb5667 --- /dev/null +++ b/docs/user-guide/index.md @@ -0,0 +1,90 @@ +--- +--- + +* TOC +{:toc} + +The user guide is intended for anyone who wants to run programs and services on an existing Kubernetes cluster. Setup and administration of a Kubernetes cluster is described in the [Cluster Admin Guide](/docs/admin/). The [Developer Guide](/docs/devel/) is for anyone wanting to either write code which directly accesses the Kubernetes API, or to contribute directly to the Kubernetes project. + +Please ensure you have completed the [prerequisites for running examples from the user guide](/docs/user-guide/prereqs). + +## Quick walkthrough + +1. [Kubernetes 101](/docs/user-guide/walkthrough/) +1. [Kubernetes 201](/docs/user-guide/walkthrough/k8s201) + +## Thorough walkthrough + +If you don't have much familiarity with Kubernetes, we recommend you read the following sections in order: + +1. [Quick start: launch and expose an application](/docs/user-guide/quick-start) +1. [Configuring and launching containers: configuring common container parameters](/docs/user-guide/configuring-containers) +1. [Deploying continuously running applications](/docs/user-guide/deploying-applications) +1. [Connecting applications: exposing applications to clients and users](/docs/user-guide/connecting-applications) +1. [Working with containers in production](/docs/user-guide/production-pods) +1. [Managing deployments](/docs/user-guide/managing-deployments) +1. [Application introspection and debugging](/docs/user-guide/introspection-and-debugging) + 1. [Using the Kubernetes web user interface](/docs/user-guide/ui) + 1. [Logging](/docs/user-guide/logging) + 1. [Monitoring](/docs/user-guide/monitoring) + 1. [Getting into containers via `exec`](/docs/user-guide/getting-into-containers) + 1. [Connecting to containers via proxies](/docs/user-guide/connecting-to-applications-proxy) + 1. [Connecting to containers via port forwarding](/docs/user-guide/connecting-to-applications-port-forward) + +## Concept guide + +[**Overview**](/docs/user-guide/overview) +: A brief overview of Kubernetes concepts. + +[**Cluster**](/docs/admin/) +: A cluster is a set of physical or virtual machines and other infrastructure resources used by Kubernetes to run your applications. + +[**Node**](/docs/admin/node) +: A node is a physical or virtual machine running Kubernetes, onto which pods can be scheduled. + +[**Pod**](/docs/user-guide/pods) +: A pod is a co-located group of containers and volumes. + +[**Label**](/docs/user-guide/labels) +: A label is a key/value pair that is attached to a resource, such as a pod, to convey a user-defined identifying attribute. Labels can be used to organize and to select subsets of resources. + +[**Selector**](/docs/user-guide/labels/#label-selectors) +: A selector is an expression that matches labels in order to identify related resources, such as which pods are targeted by a load-balanced service. + +[**Replication Controller**](/docs/user-guide/replication-controller) +: A replication controller ensures that a specified number of pod replicas are running at any one time. It both allows for easy scaling of replicated systems and handles re-creation of a pod when the machine it is on reboots or otherwise fails. + +[**Service**](/docs/user-guide/services) +: A service defines a set of pods and a means by which to access them, such as single stable IP address and corresponding DNS name. + +[**Volume**](/docs/user-guide/volumes) +: A volume is a directory, possibly with some data in it, which is accessible to a Container as part of its filesystem. Kubernetes volumes build upon [Docker Volumes](https://docs.docker.com/userguide/dockervolumes/), adding provisioning of the volume directory and/or device. + +[**Secret**](/docs/user-guide/secrets) +: A secret stores sensitive data, such as authentication tokens, which can be made available to containers upon request. + +[**Name**](/docs/user-guide/identifiers) +: A user- or client-provided name for a resource. + +[**Namespace**](/docs/user-guide/namespaces) +: A namespace is like a prefix to the name of a resource. Namespaces help different projects, teams, or customers to share a cluster, such as by preventing name collisions between unrelated teams. + +[**Annotation**](/docs/user-guide/annotations) +: A key/value pair that can hold larger (compared to a label), and possibly not human-readable, data, intended to store non-identifying auxiliary data, especially data manipulated by tools and system extensions. Efficient filtering by annotation values is not supported. + +## Further reading + +* API resources + * [Working with resources](/docs/user-guide/working-with-resources) + +* Pods and containers + * [Pod lifecycle and restart policies](/docs/user-guide/pod-states) + * [Lifecycle hooks](/docs/user-guide/container-environment) + * [Compute resources, such as cpu and memory](/docs/user-guide/compute-resources) + * [Specifying commands and requesting capabilities](/docs/user-guide/containers) + * [Downward API: accessing system configuration from a pod](/docs/user-guide/downward-api) + * [Images and registries](/docs/user-guide/images) + * [Migrating from docker-cli to kubectl](/docs/user-guide/docker-cli-to-kubectl) + * [Tips and tricks when working with config](/docs/user-guide/config-best-practices) + * [Assign pods to selected nodes](/docs/user-guide/node-selection/) + * [Perform a rolling update on a running group of pods](/docs/user-guide/update-demo/) \ No newline at end of file diff --git a/v1.1/docs/user-guide/ingress.md b/docs/user-guide/ingress.md similarity index 93% rename from v1.1/docs/user-guide/ingress.md rename to docs/user-guide/ingress.md index b84db5c494..cc47e0c6fb 100644 --- a/v1.1/docs/user-guide/ingress.md +++ b/docs/user-guide/ingress.md @@ -67,13 +67,13 @@ rules: *POSTing this to the API server will have no effect if you have not configured an [Ingress controller](#ingress-controllers).* -__Lines 1-4__: As with all other Kubernetes config, an Ingress needs `apiVersion`, `kind`, and `metadata` fields. For general information about working with config files, see [here](/{{page.version}}/docs/user-guide/simple-yaml), [here](/{{page.version}}/docs/user-guide/configuring-containers), and [here](/{{page.version}}/docs/user-guide/working-with-resources). +__Lines 1-4__: As with all other Kubernetes config, an Ingress needs `apiVersion`, `kind`, and `metadata` fields. For general information about working with config files, see [here](/docs/user-guide/simple-yaml), [here](/docs/user-guide/configuring-containers), and [here](/docs/user-guide/working-with-resources). -__Lines 5-7__: Ingress [spec](/{{page.version}}/docs/devel/api-conventions/#spec-and-status) has all the information needed to configure a loadbalancer or proxy server. Most importantly, it contains a list of rules matched against all incoming requests. Currently the Ingress resource only supports http rules. +__Lines 5-7__: Ingress [spec](/docs/devel/api-conventions/#spec-and-status) has all the information needed to configure a loadbalancer or proxy server. Most importantly, it contains a list of rules matched against all incoming requests. Currently the Ingress resource only supports http rules. __Lines 8-9__: Each http rule contains the following information: A host (eg: foo.bar.com, defaults to * in this example), a list of paths (eg: /testpath) each of which has an associated backend (test:80). Both the host and path must match the content of an incoming request before the loadbalancer directs traffic to the backend. -__Lines 10-12__: A backend is a service:port combination as described in the [services doc](/{{page.version}}/docs/user-guide/services). Ingress traffic is typically sent directly to the endpoints matching a backend. +__Lines 10-12__: A backend is a service:port combination as described in the [services doc](/docs/user-guide/services). Ingress traffic is typically sent directly to the endpoints matching a backend. __Global Parameters__: For the sake of simplicity the example Ingress has no global parameters, see the [api-reference](https://releases.k8s.io/{{page.githubbranch}}/pkg/apis/extensions/v1beta1/types.go) for a full definition of the resource. One can specify a global default backend in the absence of which requests that don't match a path in the spec are sent to the default backend of the Ingress controller. Though the Ingress resource doesn't support HTTPS yet, security configs would also be global. @@ -100,7 +100,7 @@ spec: servicePort: 80 ``` -[Download example](/{{page.version}}/docs/user-guide/ingress.yaml) +[Download example](/docs/user-guide/ingress.yaml) If you create it using `kubectl -f` you should see: diff --git a/v1.1/docs/user-guide/ingress.yaml b/docs/user-guide/ingress.yaml similarity index 100% rename from v1.1/docs/user-guide/ingress.yaml rename to docs/user-guide/ingress.yaml diff --git a/v1.1/docs/user-guide/introspection-and-debugging.md b/docs/user-guide/introspection-and-debugging.md similarity index 96% rename from v1.1/docs/user-guide/introspection-and-debugging.md rename to docs/user-guide/introspection-and-debugging.md index 3933342eaf..2bcbb00b51 100644 --- a/v1.1/docs/user-guide/introspection-and-debugging.md +++ b/docs/user-guide/introspection-and-debugging.md @@ -308,9 +308,9 @@ status: Learn about additional debugging tools, including: -* [Logging](/{{page.version}}/docs/user-guide/logging) -* [Monitoring](/{{page.version}}/docs/user-guide/monitoring) -* [Getting into containers via `exec`](/{{page.version}}/docs/user-guide/getting-into-containers) -* [Connecting to containers via proxies](/{{page.version}}/docs/user-guide/connecting-to-applications-proxy) -* [Connecting to containers via port forwarding](/{{page.version}}/docs/user-guide/connecting-to-applications-port-forward) +* [Logging](/docs/user-guide/logging) +* [Monitoring](/docs/user-guide/monitoring) +* [Getting into containers via `exec`](/docs/user-guide/getting-into-containers) +* [Connecting to containers via proxies](/docs/user-guide/connecting-to-applications-proxy) +* [Connecting to containers via port forwarding](/docs/user-guide/connecting-to-applications-port-forward) diff --git a/v1.1/docs/user-guide/job.yaml b/docs/user-guide/job.yaml similarity index 100% rename from v1.1/docs/user-guide/job.yaml rename to docs/user-guide/job.yaml diff --git a/v1.1/docs/user-guide/jobs.md b/docs/user-guide/jobs.md similarity index 87% rename from v1.1/docs/user-guide/jobs.md rename to docs/user-guide/jobs.md index 5363e492d4..bad1e8dd3c 100644 --- a/v1.1/docs/user-guide/jobs.md +++ b/docs/user-guide/jobs.md @@ -42,7 +42,7 @@ spec: restartPolicy: Never ``` -[Download example](/{{page.version}}/docs/user-guide/job.yaml) +[Download example](/docs/user-guide/job.yaml) Run the example job by downloading the example file and then running this command: @@ -93,23 +93,23 @@ $ kubectl logs pi-aiw0a ## Writing a Job Spec As with all other Kubernetes config, a Job needs `apiVersion`, `kind`, and `metadata` fields. For -general information about working with config files, see [here](/{{page.version}}/docs/user-guide/simple-yaml), -[here](/{{page.version}}/docs/user-guide/configuring-containers), and [here](working-with-resources). +general information about working with config files, see [here](/docs/user-guide/simple-yaml), +[here](/docs/user-guide/configuring-containers), and [here](working-with-resources). -A Job also needs a [`.spec` section](/{{page.version}}/docs/devel/api-conventions/#spec-and-status). +A Job also needs a [`.spec` section](/docs/devel/api-conventions/#spec-and-status). ### Pod Template The `.spec.template` is the only required field of the `.spec`. -The `.spec.template` is a [pod template](/{{page.version}}/docs/user-guide/replication-controller/#pod-template). It has exactly -the same schema as a [pod](/{{page.version}}/docs/user-guide/pods), except it is nested and does not have an `apiVersion` or +The `.spec.template` is a [pod template](/docs/user-guide/replication-controller/#pod-template). It has exactly +the same schema as a [pod](/docs/user-guide/pods), except it is nested and does not have an `apiVersion` or `kind`. In addition to required fields for a Pod, a pod template in a job must specify appropriate lables (see [pod selector](#pod-selector) and an appropriate restart policy. -Only a [`RestartPolicy`](/{{page.version}}/docs/user-guide/pod-states) equal to `Never` or `OnFailure` are allowed. +Only a [`RestartPolicy`](/docs/user-guide/pod-states) equal to `Never` or `OnFailure` are allowed. ### Pod Selector @@ -117,7 +117,7 @@ The `.spec.selector` field is a label query over a set of pods. The `spec.selector` is an object consisting of two fields: -* `matchLabels` - works the same as the `.spec.selector` of a [ReplicationController](/{{page.version}}/docs/user-guide/replication-controller) +* `matchLabels` - works the same as the `.spec.selector` of a [ReplicationController](/docs/user-guide/replication-controller) * `matchExpressions` - allows to build more sophisticated selectors by specyfing key, list of values and an operator that relates the key and values. @@ -135,7 +135,7 @@ think that those pods were created by it. Kubernetes will not stop you from doi By default, a Job is complete when one Pod runs to successful completion. You can also specify that this needs to happen multiple times by specifying `.spec.completions` with a value greater than 1. When multiple completions are requested, each Pod created by the Job controller has an identical -[`spec`](/{{page.version}}/docs/devel/api-conventions/#spec-and-status). In particular, all pods will have +[`spec`](/docs/devel/api-conventions/#spec-and-status). In particular, all pods will have the same command line and the same image, the same volumes, and mostly the same environment variables. It is up to the user to arrange for the pods to do work on different things. For example, the pods might all access a shared work queue service to acquire work units. @@ -161,7 +161,7 @@ a non-zero exit code, or the Container was killed for exceeding a memory limit, happens, and the `.spec.template.containers[].restartPolicy = "OnFailure"`, then the Pod stays on the node, but the Container is re-run. Therefore, your program needs to handle the the case when it is restarted locally, or else specify `.spec.template.containers[].restartPolicy = "Never"`. -See [pods-states](/{{page.version}}/docs/user-guide/pod-states) for more information on `restartPolicy`. +See [pods-states](/docs/user-guide/pod-states) for more information on `restartPolicy`. An entire Pod can also fail, for a number of reasons, such as when the pod is kicked off the node (node is upgraded, rebooted, delelted, etc.), or if a container of the Pod fails and the @@ -188,19 +188,19 @@ requires only a single pod. ### Replication Controller -Jobs are complementary to [Replication Controllers](/{{page.version}}/docs/user-guide/replication-controller). +Jobs are complementary to [Replication Controllers](/docs/user-guide/replication-controller). A Replication Controller manages pods which are not expected to terminate (e.g. web servers), and a Job manages pods that are expected to terminate (e.g. batch jobs). -As discussed in [life of a pod](/{{page.version}}/docs/user-guide/pod-states), `Job` is *only* appropriate for pods with +As discussed in [life of a pod](/docs/user-guide/pod-states), `Job` is *only* appropriate for pods with `RestartPolicy` equal to `OnFailure` or `Never`. (Note: If `RestartPolicy` is not set, the default value is `Always`.) ## Caveats -Job objects are in the [`extensions` API Group](/{{page.version}}/docs/api/#api-groups). +Job objects are in the [`extensions` API Group](/docs/api/#api-groups). -Job objects have [API version `v1beta1`](/{{page.version}}/docs/api/)#api-versioning). Beta objects may +Job objects have [API version `v1beta1`](/docs/api/)#api-versioning). Beta objects may undergo changes to their schema and/or semantics in future software releases, but similar functionality will be supported. diff --git a/v1.1/docs/user-guide/jsonpath.md b/docs/user-guide/jsonpath.md similarity index 100% rename from v1.1/docs/user-guide/jsonpath.md rename to docs/user-guide/jsonpath.md diff --git a/v1.1/docs/user-guide/known-issues.md b/docs/user-guide/known-issues.md similarity index 100% rename from v1.1/docs/user-guide/known-issues.md rename to docs/user-guide/known-issues.md diff --git a/v1.2/docs/user-guide/kubeconfig-file.md b/docs/user-guide/kubeconfig-file.md similarity index 97% rename from v1.2/docs/user-guide/kubeconfig-file.md rename to docs/user-guide/kubeconfig-file.md index 18441725f0..9e2df71e67 100644 --- a/v1.2/docs/user-guide/kubeconfig-file.md +++ b/docs/user-guide/kubeconfig-file.md @@ -122,7 +122,7 @@ The rules for loading and merging the kubeconfig files are straightforward, but ## Manipulation of kubeconfig via `kubectl config ` In order to more easily manipulate kubeconfig files, there are a series of subcommands to `kubectl config` to help. -See [kubectl/kubectl_config.md](/{{page.version}}/docs/user-guide/kubectl/kubectl_config) for help. +See [kubectl/kubectl_config.md](/docs/user-guide/kubectl/kubectl_config) for help. ### Example diff --git a/v1.2/docs/user-guide/kubectl-overview.md b/docs/user-guide/kubectl-overview.md similarity index 93% rename from v1.2/docs/user-guide/kubectl-overview.md rename to docs/user-guide/kubectl-overview.md index 9e0d94562a..9435504461 100644 --- a/v1.2/docs/user-guide/kubectl-overview.md +++ b/docs/user-guide/kubectl-overview.md @@ -1,7 +1,7 @@ --- --- -Use this overview of the `kubectl` command line interface to help you start running commands against Kubernetes clusters. This overview quickly covers `kubectl` syntax, describes the command operations, and provides common examples. For details about each command, including all the supported flags and subcommands, see the [kubectl](/{{page.version}}/docs/user-guide/kubectl/kubectl) reference documentation. +Use this overview of the `kubectl` command line interface to help you start running commands against Kubernetes clusters. This overview quickly covers `kubectl` syntax, describes the command operations, and provides common examples. For details about each command, including all the supported flags and subcommands, see the [kubectl](/docs/user-guide/kubectl/kubectl) reference documentation. TODO: Auto-generate this file to ensure it's always in sync with any `kubectl` changes, see [#14177](http://pr.k8s.io/14177). @@ -34,7 +34,7 @@ When performing an operation on multiple resources, you can specify each resourc * To specify multiple resource types individually: `TYPE1/name1 TYPE1/name2 TYPE2/name3 TYPE<#>/name<#>`
Example: `$ kubectl get pod/example-pod1 replicationcontroller/example-rc1` * To specify resources with one or more files: `-f file1 -f file2 -f file<#>` - [Use YAML rather than JSON](/{{page.version}}/docs/user-guide/config-best-practices) since YAML tends to be more user-friendly, especially for configuration files.
+ [Use YAML rather than JSON](/docs/user-guide/config-best-practices) since YAML tends to be more user-friendly, especially for configuration files.
Example: `$ kubectl get pod -f ./pod.yaml` * `flags`: Specifies optional flags. For example, you can use the `-s` or `--server` flags to specify the address and port of the Kubernetes API server. @@ -74,7 +74,7 @@ Operation | Syntax | Description `stop` | `kubectl stop` | Deprecated: Instead, see `kubectl delete`. `version` | `kubectl version [--client] [flags]` | Display the Kubernetes version running on the client and server. -Remember: For more about command operations, see the [kubectl](/{{page.version}}/docs/user-guide/kubectl/kubectl) reference documentation. +Remember: For more about command operations, see the [kubectl](/docs/user-guide/kubectl/kubectl) reference documentation. ## Resource types @@ -101,7 +101,7 @@ Resource type | Abbreviated alias ## Output options -Use the following sections for information about how you can format or sort the output of certain commands. For details about which commands support the various output options, see the [kubectl](/{{page.version}}/docs/user-guide/kubectl/kubectl) reference documentation. +Use the following sections for information about how you can format or sort the output of certain commands. For details about which commands support the various output options, see the [kubectl](/docs/user-guide/kubectl/kubectl) reference documentation. ### Formatting output @@ -120,8 +120,8 @@ Output format | Description `-o=custom-columns=` | Print a table using a comma separated list of [custom columns](#custom-columns). `-o=custom-columns-file=` | Print a table using the [custom columns](#custom-columns) template in the `` file. `-o=json` | Output a JSON formatted API object. -`-o=jsonpath=