Skip to content

Commit 1bd0036

Browse files
steveperry-53steveperry-53
committed
Merge branch 'master' into release-1.8
2 parents 147f04c + 2d3e488 commit 1bd0036

File tree

126 files changed

+3516
-774
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+3516
-774
lines changed

‎_redirects

-138
Original file line numberDiff line numberDiff line change
@@ -316,141 +316,3 @@
316316

317317
/v1.1/docs/admin/networking.html /docs/concepts/cluster-administration/networking 301
318318
/v1.1/docs/getting-started-guides /docs/tutorials/kubernetes-basics/ 301
319-
320-
321-
############################
322-
# pattern matching redirects
323-
#
324-
/docs/user-guide/kubectl/kubectl_* /docs/user-guide/kubectl/v1.7/#:splat 200
325-
326-
/v1.1/docs/* /docs/ 301
327-
328-
/docs/user-guide/kubectl/1_5/* https://v1-5.docs.kubernetes.io/docs/user-guide/kubectl/v1.5 301
329-
/docs/user-guide/kubectl/v1.5/node_modules/* https://v1-5.docs.kubernetes.io/docs/user-guide/kubectl/v1.5 301
330-
/docs/resources-reference/1_5/* https://v1-5.docs.kubernetes.io/docs/resources-reference/v1.5 301
331-
/docs/resources-reference/v1.5/node_modules/* https://v1-5.docs.kubernetes.io/docs/resources-reference/v1.5 301
332-
/docs/api-reference/1_5/* https://v1-5.docs.kubernetes.io/docs/api-reference/v1.5 301
333-
/docs/api-reference/v1.5/node_modules/* https://v1-5.docs.kubernetes.io/docs/api-reference/v1.5 301
334-
335-
/docs/user-guide/kubectl/v1.6/node_modules/* https://v1-6.docs.kubernetes.io/docs/user-guide/kubectl/v1.6 301
336-
/docs/api-reference/v1.6/node_modules/* https://v1-6.docs.kubernetes.io/docs/api-reference/v1.6 301
337-
338-
/docs/api-reference/v1.7/node_modules/* /docs/api-reference/v1.7 301
339-
340-
/docs/getting-started-guides/docker-multinode/* /docs/setup/independent/create-cluster-kubeadm 301
341-
342-
/docs/admin/resourcequota/* /docs/concepts/policy/resource-quotas 301
343-
344-
345-
#################################
346-
# redirects from /js/redirects.js
347-
#
348-
/resource-quota /docs/concepts/policy/resource-quotas 301
349-
/horizontal-pod-autoscaler /docs/tasks/run-application/horizontal-pod-autoscale 301
350-
/docs/roadmap https://github.com/kubernetes/kubernetes/milestones/ 301
351-
/api-ref https://github.com/kubernetes/kubernetes/milestones/ 301
352-
/kubernetes/third_party/swagger-ui /docs/reference 301
353-
/docs/user-guide/overview /docs/concepts/overview/what-is-kubernetes 301
354-
/docs/troubleshooting /docs/tasks/debug-application-cluster/troubleshooting 301
355-
/docs/concepts/services-networking/networkpolicies /docs/concepts/services-networking/network-policies 301
356-
/docs/getting-started-guides/meanstack https://medium.com/google-cloud/running-a-mean-stack-on-google-cloud-platform-with-kubernetes-149ca81c2b5d 301
357-
/docs/samples /docs/tutorials 301
358-
/v1.1 / 301
359-
/v1.0 / 301
360-
361-
362-
########################################################
363-
# Redirect users with chinese language preference to /cn
364-
#
365-
#/ /cn 302 Language=zh
366-
367-
368-
###########################
369-
# Fixed 404s from analytics
370-
371-
/concepts/containers/container-lifecycle-hooks /docs/concepts/containers/container-lifecycle-hooks 301
372-
/docs/abstractions/controllers/petset /docs/concepts/workloads/controllers/petset 301
373-
374-
/docs/admin/add-ons /docs/concepts/cluster-administration/addons 301
375-
/docs/admin/limitrange/Limits /docs/tasks/administer-cluster/limit-storage-consumption/#limitrange-to-limit-requests-for-storage 301
376-
377-
/docs/api-reference/1_5/* /docs/api-reference/v1.5 301
378-
379-
/docs/concepts/cluster-administration/device-plugins /docs/concepts/cluster-administration/network-plugins 301
380-
/docs/concepts/configuration/container-command-args /docs/tasks/inject-data-application/define-command-argument-container 301
381-
/docs/concepts/ecosystem/thirdpartyresource /docs/tasks/access-kubernetes-api/extend-api-third-party-resource 301
382-
/docs/concepts/overview /docs/concepts/overview/what-is-kubernetes 301
383-
/docs/concepts/policy/container-capabilities /docs/tasks/configure-pod-container/security-context/#set-capabilities-for-a-container 301
384-
/docs/concepts/policy/security-context /docs/tasks/configure-pod-container/security-context 301
385-
/docs/concepts/storage/volumes/emptyDirapiVersion /docs/concepts/storage/volumes/#emptydir 301
386-
/docs/concepts/tools/kubectl/object-management-using-commands /docs/tutorials/object-management-kubectl/imperative-object-management-command 301
387-
/docs/concepts/workload/pods/pod-overview /docs/concepts/workloads/pods/pod-overview 301
388-
/docs/concepts/workloads/controllers/cron-jobs/deployment /docs/concepts/workloads/controllers/cron-jobs 301
389-
/docs/concepts/workloads/controllers/statefulsets /docs/concepts/workloads/controllers/statefulset 301
390-
/docs/concepts/workloads/pods/init-containers/Kubernetes /docs/concepts/workloads/pods/init-containers 301
391-
392-
/docs/consumer-guideline/pod-security-coverage /docs/concepts/policy/pod-security-policy 301
393-
394-
/docs/contribute/create-pull-request /docs/home/contribute/create-pull-request 301
395-
/docs/contribute/page-templates /docs/home/contribute/page-templates 301
396-
/docs/contribute/review-issues /docs/home/contribute/review-issues 301
397-
/docs/contribute/stage-documentation-changes /docs/home/contribute/stage-documentation-changes 301
398-
/docs/contribute/style-guide /docs/home/contribute/style-guide 301
399-
400-
/docs/deprecated /docs/reference/deprecation-policy 301
401-
/docs/deprecation-policy /docs/reference/deprecation-policy 301
402-
403-
404-
/docs/federation/api-reference /docs/reference/federation/v1/operations 301
405-
/docs/federation/api-reference/extensions/v1beta1/operations /docs/reference/federation/extensions/v1beta1/operations 301
406-
/docs/federation/api-reference/federation/v1beta1/operations /docs/reference/federation/extensions/v1beta1/operations 301
407-
/docs/federation/api-reference/v1/operations /docs/reference/federation/v1/operations 301
408-
409-
/docs/getting-started-guide/* /docs/setup 301
410-
411-
/docs/home/deprecation-policy /docs/reference/deprecation-policy 301
412-
413-
/docs/resources-reference/1_5/* /docs/resources-reference/v1.5 301
414-
/docs/resources-reference/1_6/* /docs/resources-reference/v1.6 301
415-
/docs/resources-reference/1_7/* /docs/resources-reference/v1.7 301
416-
417-
/docs/stable/user-guide/labels /docs/concepts/overview/working-with-objects/labels 301
418-
419-
420-
/docs/tasks/administer-cluster/apply-resource-quota-limit /docs/tasks/administer-cluster/quota-api-object 301
421-
/docs/tasks/administer-cluster/configure-namespace-isolation /docs/concepts/services-networking/network-policies 301
422-
/docs/tasks/administer-cluster/configure-pod-disruption-budget /docs/tasks/run-application/configure-pdb 301
423-
424-
/docs/tasks/administer-cluster/cpu-management-policies /docs/concepts/configuration/manage-compute-resources-container 301
425-
/docs/tasks/administer-cluster/default-cpu-request-limit /docs/tasks/configure-pod-container/assign-cpu-resource/#specify-a-cpu-request-and-a-cpu-limit 301
426-
/docs/tasks/administer-cluster/default-memory-request-limit /docs/tasks/configure-pod-container/assign-memory-resource/#specify-a-memory-request-and-a-memory-limit 301
427-
428-
/docs/tasks/configure-pod-container/cilium-network-policy /docs/tasks/administer-cluster/cilium-network-policy 301
429-
/docs/tasks/configure-pod-container/define-command-argument-container /docs/tasks/inject-data-application/define-command-argument-container 301
430-
/docs/tasks/configure-pod-container/projected-volume /docs/tasks/configure-pod-container/configure-projected-volume-storage 301
431-
432-
/docs/tasks/stateful-sets/deleting-pods /docs/tasks/run-application/force-delete-stateful-set-pod 301
433-
434-
/docs/templatedemos/* /docs/home/contribute/page-templates 301
435-
436-
/docs/tutorials/getting-started/* /docs/tutorials/kubernetes-basics 301
437-
438-
/docs/user-guide/federation/* /docs/concepts/cluster-administration/federation 301
439-
/docs/user-guide/garbage-collector /docs/concepts/workloads/controllers/garbage-collection 301
440-
/docs/user-guide/horizontal-pod-autoscaler/* /docs/tasks/run-application/horizontal-pod-autoscale 301
441-
442-
443-
/docs/user-guide/liveness /docs/tasks/configure-pod-container/configure-liveness-readiness-probes 301
444-
/docs/user-guide/logging /docs/concepts/cluster-administration/logging 301
445-
/docs/user-guide/replication-controller/operations /docs/concepts/workloads/controllers/replicationcontroller 301
446-
/docs/user-guide/service-accounts/working-with-resources /docs/tutorials/object-management-kubectl/object-management 301
447-
/docs/user-guide/StatefulSet /docs/concepts/workloads/controllers/statefulset 301
448-
/docs/user-guide/ui-access /docs/tasks/access-application-cluster/web-ui-dashboard 301
449-
450-
/kubernetes-bootcamp/* /docs/tutorials/kubernetes-basics 301
451-
452-
/latest/docs /docs/home 301
453-
454-
/kubernetes/swagger-spec https://github.com/kubernetes/kubernetes/tree/master/api/swagger-spec 301
455-
/swagger-spec/* https://github.com/kubernetes/kubernetes/tree/master/api/swagger-spec 301
456-
/third_party/swagger-ui/* /docs/reference 301

0 commit comments

Comments
 (0)