Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure all docs and examples in user guide are reachable #11352

Merged
merged 1 commit into from
Jul 17, 2015

Conversation

janetkuo
Copy link
Member

Also cross-link concept/feature docs, feature-oriented examples, and tutorials.

Fixes #11311
cc @bgrant0607 @krousey

@k8s-bot
Copy link

k8s-bot commented Jul 16, 2015

GCE e2e build/test passed for commit d0c37c2c8a734e29071a64128e2e5958798bf592.

@@ -64,6 +64,9 @@ If you don't have much familiarity with Kubernetes, we recommend you read the fo
[**Overview**](overview.md)
: A brief overview of Kubernetes concepts.

**Cluster**
: A cluster is the compute resources on top of which your containers are built.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I intentionally omitted Cluster and Node here, on the theory that those concepts should be defined in the admin guide instead.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. I add this because I saw that Cluster was mentioned several times in some of the documents (such as Kubernetes 101) without explaining it. I think that is likely to confuse first-time users.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough.

I'd use a definition similar to that used by GKE: https://cloud.google.com/container-engine/docs/clusters/

A cluster is a set of physical or virtual machines and other infrastructure resources used by Kubernetes to run your applications.

I'd change the definition in the top-level README.md, also. We don't "build" containers, so that doesn't even make sense.

We should define node, as well, then.

A node is a physical or virtual machine running Kubernetes, onto which pods can be scheduled.

Both terms should link to docs. Node can link to ../admin/node.md. Cluster doesn't have a great doc, but maybe ../admin/README.md.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll modify the definition of Cluster and add Node definition in kubernetes/README.md too.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add other concepts (volume, namespace, etc) in /README.md too.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't want to clutter /README.md much, so I wouldn't add more to it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, adding Node is fine.

@bgrant0607
Copy link
Member

I expected more cross-linking. Did you ensure that every example in user-guide links to a corresponding doc and vice versa?

@bgrant0607 bgrant0607 self-assigned this Jul 16, 2015
@bgrant0607 bgrant0607 added this to the v1.0 milestone Jul 16, 2015
@bgrant0607
Copy link
Member

I don't think docs/user-guide/logging-demo links to docs/user-guide/logging.md, for instance.

@@ -107,6 +110,8 @@ If you don't have much familiarity with Kubernetes, we recommend you read the fo
* [Downward API: accessing system configuration from a pod](downward-api.md)
* [Images and registries](images.md)
* [Migrating from docker-cli to kubectl](docker-cli-to-kubectl.md)
* [Assign a pod to a specific node](node-selection/)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assign a pod to selected nodes

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assign pods to selected nodes

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@bgrant0607
Copy link
Member

Please also link the update-demo back to docs/user-guide/managing-deployments.md#updating-your-application-without-a-service-outage

@bgrant0607
Copy link
Member

Somehow the link to secrets.md in docs/user-guide/secrets/README.md is broken. Please fix it.

@janetkuo
Copy link
Member Author

I checked to ensure that all examples here are reference except for /logging-demo. I didn't include docs/user-guide/logging-demo because it only contains yaml files (pod specs) without further tutorial, and logging.md already contains a pod spec example and tutorial.

In this case, I'd add a link to /logging-demo in docs/user-guide/logging.md with explanation like "Try this link for more pod spec examples."

@janetkuo
Copy link
Member Author

I tried the link to secrets.md in docs/user-guide/secrets/README.md and didn't see it broken. Could you try it again?

@janetkuo
Copy link
Member Author

I'm checking the examples again to make sure every example in user-guide links to a corresponding doc and vice versa.

@bgrant0607
Copy link
Member

This line in secrets/README.md is the culprit:

You can learn more about secrets [Here](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/secrets.md).

@janetkuo
Copy link
Member Author

That link is removed in this code change.

@bgrant0607
Copy link
Member

Maybe fix those in a separate PR:

grep -r "GoogleCloudPlatform/kubernetes/blob/master/docs" docs examples
docs/user-guide/limitrange/README.md:For a detailed description of the Kubernetes resource model, see [Resources](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/resources.md)
docs/user-guide/logging-demo/Makefile:# Google Cloud Logging: https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/getting-started-guides/logging.md
docs/user-guide/logging-demo/Makefile:# With Elasticsearch and Kibana logging: https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/getting-started-guides/logging-elasticsearch.md
docs/user-guide/update-demo/README.md:[here](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/kubectl_proxy.md).
docs/user-guide/downward-api/README.md:namespace using the [downward API](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/downward_api.md).
docs/user-guide/secrets/README.md:You can learn more about secrets [Here](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/secrets.md).
docs/getting-started-guides/aws.md:An up-to-date documentation page for this tool is available here: [kubectl manual](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/kubectl.md)
docs/getting-started-guides/aws.md:For more information, please read [kubeconfig files](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/kubeconfig-file.md)
docs/admin/cluster-large.md:At v1.0, Kubernetes supports clusters up to 100 nodes with 30-50 pods per node and 1-2 container per pod (as defined in the [1.0 roadmap](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/roadmap.md#reliability-and-performance)).
docs/admin/high-availability.md:the simple [Docker based single node cluster instructions](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/getting-started-guides/docker.md),
examples/cassandra/README.md:You may also note that we are setting some Cassandra parameters (```MAX_HEAP_SIZE``` and ```HEAP_NEWSIZE```) and adding information about the [namespace](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/namespaces.md).  We also tell Kubernetes that the container exposes both the ```CQL``` and ```Thrift``` API ports.  Finally, we tell the cluster manager that we need 0.5 cpu (0.5 core).
examples/guestbook/README.md:The services in a Kubernetes cluster are discoverable inside other containers [via environment variables](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/services.md#environment-variables).
examples/guestbook/README.md:An alternative is to use the [cluster's DNS service](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/services.md#dns), if it has been enabled for the cluster.  This lets all pods do name resolution of services automatically, based on the service name.
examples/guestbook/README.md:More generally, Kubernetes supports two ways of exposing a service onto an external IP address: `NodePort`s and `LoadBalancer`s , as described [here](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/services.md#external-services).
examples/k8petstore/README.md:In the mean time, because the public IP will be deprecated in Kubernetes v1, we provide other 2 scripts k8petstore-loadbalancer.sh and k8petstore-nodeport.sh. As the names suggest, they rely on LoadBalancer and NodePort respectively. More details can be found [here](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/services.md#external-services). 
examples/k8petstore/k8petstore-loadbalancer.sh:#This script assumes the cloud provider is able to create a load balancer. If this not the case, you may want to check out other ways to make the frontend service accessible from outside (https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/services.md#external-services)

@@ -22,8 +22,7 @@ certainly want the docs that go with that version.</h1>
<!-- END MUNGE: UNVERSIONED_WARNING -->
# Secrets example

Following this example, you will create a secret and a pod that consumes that secret in a volume.
You can learn more about secrets [Here](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/secrets.md).
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

link removed

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. Thanks.

@janetkuo
Copy link
Member Author

Links will be changed to be relative links in #11385

@bgrant0607
Copy link
Member

Thanks

@janetkuo
Copy link
Member Author

PTAL

**Replication controllers** manage the lifecycle of pods. They ensure that a specified number of pods are running
at any given time, by creating or killing pods as required. [More about replication controllers](docs/replication-controller.md).
[**Pod**](docs/user-guide/pods.md)
: Pods are a colocated group of Docker containers with shared volumes. They're the smallest deployable units that can be created, scheduled, and managed with Kubernetes. Pods can be created individually, but it's recommended that you use a replication controller even if creating a single pod.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/Docker/application/

We also support Rocket.

@bgrant0607
Copy link
Member

Great! Thanks. Just a couple nits.

@janetkuo
Copy link
Member Author

PTAL

@bgrant0607
Copy link
Member

LGTM!

@bgrant0607 bgrant0607 added lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-merge labels Jul 16, 2015
@bgrant0607 bgrant0607 added the kind/documentation Categorizes issue or PR as related to documentation. label Jul 16, 2015
@k8s-bot
Copy link

k8s-bot commented Jul 16, 2015

GCE e2e build/test passed for commit f9ac0c8fa59d7048bebdba16acc6ae70f02a5bad.

@k8s-bot
Copy link

k8s-bot commented Jul 17, 2015

GCE e2e build/test passed for commit b2467bef99f3ebe7c8638f56a48094d2a6abac1c.

@bgrant0607 bgrant0607 closed this Jul 17, 2015
@bgrant0607 bgrant0607 reopened this Jul 17, 2015
@bgrant0607
Copy link
Member

Please rebase and re-run the doc mungers.

@k8s-bot
Copy link

k8s-bot commented Jul 17, 2015

GCE e2e build/test passed for commit b2467bef99f3ebe7c8638f56a48094d2a6abac1c.

@k8s-bot
Copy link

k8s-bot commented Jul 17, 2015

GCE e2e build/test passed for commit d3107c06fd81b1d95eee4c6a5ec9c67585041c7b.

@k8s-bot
Copy link

k8s-bot commented Jul 17, 2015

GCE e2e build/test passed for commit b0c68c4.

@bgrant0607
Copy link
Member

Thanks

bgrant0607 added a commit that referenced this pull request Jul 17, 2015
Ensure all docs and examples in user guide are reachable
@bgrant0607 bgrant0607 merged commit 5f34630 into kubernetes:master Jul 17, 2015
xingzhou pushed a commit to xingzhou/kubernetes that referenced this pull request Dec 15, 2016
Ensure all docs and examples in user guide are reachable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/documentation Categorizes issue or PR as related to documentation. lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants