From 4ef058c970cdc3b6d317d5931db03d257999028c Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Tue, 17 Jan 2017 16:13:42 -0800 Subject: [PATCH 1/2] Use {{page.version}} instead of hard-coded release number --- docs/admin/node-conformance.md | 2 +- docs/reference.md | 2 +- docs/user-guide/ingress.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/admin/node-conformance.md b/docs/admin/node-conformance.md index f53ba858b1..25114a8966 100644 --- a/docs/admin/node-conformance.md +++ b/docs/admin/node-conformance.md @@ -84,7 +84,7 @@ sudo docker run -it --rm --privileged --net=host \ gcr.io/google_containers/node-test:0.2 ``` -Node conformance test is a containerized version of [node e2e test](https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/devel/e2e-node-tests.md). +Node conformance test is a containerized version of [node e2e test](https://github.com/kubernetes/kubernetes/blob/{{page.version}}/docs/devel/e2e-node-tests.md). By default, it runs all conformance tests. Theoretically, you can run any node e2e test if you configure the container and diff --git a/docs/reference.md b/docs/reference.md index d4d7cdd183..f9f109e7a3 100644 --- a/docs/reference.md +++ b/docs/reference.md @@ -28,4 +28,4 @@ Explore the glossary of essential Kubernetes concepts. Some good starting points ## Design Docs -An archive of the design docs for Kubernetes functionality. Good starting points are [Kubernetes Architecture](https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/architecture.md) and [Kubernetes Design Overview](https://github.com/kubernetes/kubernetes/tree/release-1.1/docs/design). +An archive of the design docs for Kubernetes functionality. Good starting points are [Kubernetes Architecture](https://github.com/kubernetes/kubernetes/blob/{{page.version}}/docs/design/architecture.md) and [Kubernetes Design Overview](https://github.com/kubernetes/kubernetes/tree/{{page.version}}/docs/design). diff --git a/docs/user-guide/ingress.md b/docs/user-guide/ingress.md index cc0bff8391..9a908637bb 100644 --- a/docs/user-guide/ingress.md +++ b/docs/user-guide/ingress.md @@ -220,7 +220,7 @@ Note that there is a gap between TLS features supported by various Ingress contr An Ingress controller is bootstrapped with some loadbalancing policy settings that it applies to all Ingress, such as the loadbalancing algorithm, backend weight scheme etc. More advanced loadbalancing concepts (e.g.: persistent sessions, dynamic weights) are not yet exposed through the Ingress. You can still get these features through the [service loadbalancer](https://github.com/kubernetes/contrib/tree/master/service-loadbalancer). With time, we plan to distill loadbalancing patterns that are applicable cross platform into the Ingress resource. -It's also worth noting that even though health checks are not exposed directly through the Ingress, there exist parallel concepts in Kubernetes such as [readiness probes](https://github.com/kubernetes/kubernetes/blob/release-1.0/docs/user-guide/production-pods.md#liveness-and-readiness-probes-aka-health-checks) which allow you to achieve the same end result. Please review the controller specific docs to see how they handle health checks ([nginx](https://github.com/kubernetes/contrib/blob/master/ingress/controllers/nginx/README.md), [GCE](https://github.com/kubernetes/contrib/blob/master/ingress/controllers/gce/README.md#health-checks)). +It's also worth noting that even though health checks are not exposed directly through the Ingress, there exist parallel concepts in Kubernetes such as [readiness probes](/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/) which allow you to achieve the same end result. Please review the controller specific docs to see how they handle health checks ([nginx](https://github.com/kubernetes/contrib/blob/master/ingress/controllers/nginx/README.md), [GCE](https://github.com/kubernetes/contrib/blob/master/ingress/controllers/gce/README.md#health-checks)). ## Updating an Ingress From 7dd6fe48c4147d54cec58674f87173f7a0ed1486 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Tue, 17 Jan 2017 16:29:24 -0800 Subject: [PATCH 2/2] Bump links in navigation from 1.3 to 1.5 --- _data/guides.yml | 4 ++-- _data/reference.yml | 10 ++++----- _data/samples.yml | 52 ++++++++++++++++++++++----------------------- 3 files changed, 32 insertions(+), 34 deletions(-) diff --git a/_data/guides.yml b/_data/guides.yml index c1bdd99a4e..4cac45883c 100644 --- a/_data/guides.yml +++ b/_data/guides.yml @@ -95,7 +95,7 @@ toc: - docs/user-guide/connecting-to-applications-proxy.md - docs/user-guide/connecting-to-applications-port-forward.md - title: Using Explorer to Examine the Runtime Environment - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/explorer + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/explorer - title: Creating a Cluster section: @@ -202,7 +202,7 @@ toc: - docs/admin/networking.md - docs/admin/dns.md - title: Setting Up and Configuring DNS - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/cluster-dns + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/cluster-dns - docs/admin/master-node-communication.md - docs/admin/network-plugins.md - docs/admin/static-pods.md diff --git a/_data/reference.yml b/_data/reference.yml index de1dec2c14..0d7dc82db6 100644 --- a/_data/reference.yml +++ b/_data/reference.yml @@ -188,13 +188,13 @@ toc: - title: Kubernetes Design Docs section: - title: Kubernetes Architecture - path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/architecture.md + path: https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/design/architecture.md - title: Kubernetes Design Overview - path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/ + path: https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/design/ - title: Kubernetes Identity and Access Management - path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/access.md + path: https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/design/access.md - docs/admin/ovs-networking.md - title: Security Contexts - path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security_context.md + path: https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/design/security_context.md - title: Security in Kubernetes - path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security.md + path: https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/design/security.md diff --git a/_data/samples.yml b/_data/samples.yml index e94f2b3223..012b00e2c7 100644 --- a/_data/samples.yml +++ b/_data/samples.yml @@ -6,72 +6,70 @@ toc: - title: Storage / Database / KV section: - title: Apache Cassandra Database - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/cassandra + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/storage/cassandra - title: Ceph - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/rbd/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/volumes/rbd/ - title: CephFS - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/cephfs/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/volumes/cephfs/ - title: CockroachDB path: https://github.com/kubernetes/kubernetes/tree/release-1.4/examples/cockroachdb/ - title: GlusterFS - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/glusterfs/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/volumes/glusterfs/ - title: Hazelcast - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/hazelcast + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/storage/hazelcast - title: iSCSI - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/iscsi/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/volumes/iscsi/ - title: MySQL Galera - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/mysql-galera + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/storage/mysql-galera - title: NFS - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/nfs/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/volumes/nfs/ - title: Redis - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/redis/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/storage/redis/ - title: RethinkDB - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/rethinkdb/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/storage/rethinkdb/ - title: Vitess - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/vitess/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/storage/vitess/ - title: Big Data section: - title: Apache Spark - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/spark + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/spark - title: Apache Storm - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/storm + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/storm - title: Messaging / Queueing section: - - title: Celery + RabbitMQ - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/celery-rabbitmq - title: Hazelcast - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/hazelcast + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/storage/hazelcast - title: Miscellaneous section: - title: Meteor Applications - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/meteor/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/meteor/ - title: OpenShift Origin - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/openshift-origin/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/openshift-origin/ - title: Selenium - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/selenium/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/selenium/ - title: Monitoring and Logging section: - title: Elasticsearch - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/elasticsearch/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/elasticsearch/ - title: NewRelic - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/newrelic + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/newrelic - title: Multi-tier Applications section: - title: Guestbook - Go Server - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/guestbook-go/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/guestbook-go/ - title: GuestBook - PHP Server - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/guestbook/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/guestbook/ - docs/getting-started-guides/meanstack.md - title: MySQL + Wordpress - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/mysql-wordpress-pd/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/mysql-wordpress-pd/ - title: MySQL + Phabricator Server - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/phabricator/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/phabricator/ - title: Nodejs + Mongo - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/nodesjs-mongodb + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/nodesjs-mongodb - title: Petstore - path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/k8petstore/ + path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/k8petstore/