merge update

2018-02-06 16:51:29 +08:00 · 2018-02-06 16:51:29 +08:00 · 9b6712ba2c
parent 7ea57c4f50
commit 9b6712ba2c
182 changed files with 20239 additions and 18015 deletions
--- a/appendix/debug-kubernetes-services.html
+++ b/appendix/debug-kubernetes-services.html
--- a/appendix/docker-best-practice.html
+++ b/appendix/docker-best-practice.html
--- a/appendix/index.html
+++ b/appendix/index.html
--- a/appendix/issues.html
+++ b/appendix/issues.html
--- a/appendix/kubernetes-1.7-changelog.html
+++ b/appendix/kubernetes-1.7-changelog.html
--- a/appendix/kubernetes-1.8-changelog.html
+++ b/appendix/kubernetes-1.8-changelog.html
--- a/appendix/kubernetes-1.9-changelog.html
+++ b/appendix/kubernetes-1.9-changelog.html
--- a/appendix/kubernetes-and-cloud-native-summary-in-2017-and-outlook-for-2018.html
+++ b/appendix/kubernetes-and-cloud-native-summary-in-2017-and-outlook-for-2018.html
--- a/appendix/kubernetes-changelog.html
+++ b/appendix/kubernetes-changelog.html
--- a/appendix/material-share.html
+++ b/appendix/material-share.html
--- a/appendix/summary-and-outlook.html
+++ b/appendix/summary-and-outlook.html
--- a/appendix/tricks.html
+++ b/appendix/tricks.html
--- a/cloud-native/from-kubernetes-to-cloud-native.html
+++ b/cloud-native/from-kubernetes-to-cloud-native.html
--- a/cloud-native/kubernetes-and-cloud-native-app-overview.html
+++ b/cloud-native/kubernetes-and-cloud-native-app-overview.html
--- a/cloud-native/play-with-kubernetes.html
+++ b/cloud-native/play-with-kubernetes.html
--- a/concepts/aggregated-api-server.html
+++ b/concepts/aggregated-api-server.html
--- a/concepts/annotation.html
+++ b/concepts/annotation.html
--- a/concepts/apiservice.html
+++ b/concepts/apiservice.html
--- a/concepts/authentication-and-permission.html
+++ b/concepts/authentication-and-permission.html
--- a/concepts/cluster.html
+++ b/concepts/cluster.html
--- a/concepts/cni.html
+++ b/concepts/cni.html
--- a/concepts/concepts.html
+++ b/concepts/concepts.html
--- a/concepts/configmap-hot-update.html
+++ b/concepts/configmap-hot-update.html
--- a/concepts/configmap.html
+++ b/concepts/configmap.html
--- a/concepts/controllers.html
+++ b/concepts/controllers.html
--- a/concepts/cri.html
+++ b/concepts/cri.html
--- a/concepts/cronjob.html
+++ b/concepts/cronjob.html
--- a/concepts/csi.html
+++ b/concepts/csi.html
--- a/concepts/custom-metrics-hpa.html
+++ b/concepts/custom-metrics-hpa.html
--- a/concepts/custom-resource.html
+++ b/concepts/custom-resource.html
--- a/concepts/daemonset.html
+++ b/concepts/daemonset.html
--- a/concepts/deployment.html
+++ b/concepts/deployment.html
--- a/concepts/etcd.html
+++ b/concepts/etcd.html
--- a/concepts/extension.html
+++ b/concepts/extension.html
--- a/concepts/garbage-collection.html
+++ b/concepts/garbage-collection.html
--- a/concepts/horizontal-pod-autoscaling.html
+++ b/concepts/horizontal-pod-autoscaling.html
--- a/concepts/index.html
+++ b/concepts/index.html
--- a/concepts/ingress.html
+++ b/concepts/ingress.html
--- a/concepts/init-containers.html
+++ b/concepts/init-containers.html
--- a/concepts/job.html
+++ b/concepts/job.html
--- a/concepts/label.html
+++ b/concepts/label.html
--- a/concepts/namespace.html
+++ b/concepts/namespace.html
--- a/concepts/network-policy.html
+++ b/concepts/network-policy.html
--- a/concepts/networking.html
+++ b/concepts/networking.html
--- a/concepts/node.html
+++ b/concepts/node.html
--- a/concepts/objects.html
+++ b/concepts/objects.html
--- a/concepts/open-interfaces.html
+++ b/concepts/open-interfaces.html
--- a/concepts/persistent-volume.html
+++ b/concepts/persistent-volume.html
--- a/concepts/pod-disruption-budget.html
+++ b/concepts/pod-disruption-budget.html
--- a/concepts/pod-hook.html
+++ b/concepts/pod-hook.html
--- a/concepts/pod-lifecycle.html
+++ b/concepts/pod-lifecycle.html
--- a/concepts/pod-overview.html
+++ b/concepts/pod-overview.html
--- a/concepts/pod-preset.html
+++ b/concepts/pod-preset.html
--- a/concepts/pod-security-policy.html
+++ b/concepts/pod-security-policy.html
--- a/concepts/pod-state-and-lifecycle.html
+++ b/concepts/pod-state-and-lifecycle.html
--- a/concepts/pod.html
+++ b/concepts/pod.html
--- a/concepts/rbac.html
+++ b/concepts/rbac.html
--- a/concepts/replicaset.html
+++ b/concepts/replicaset.html
--- a/concepts/secret.html
+++ b/concepts/secret.html
--- a/concepts/service-discovery.html
+++ b/concepts/service-discovery.html
--- a/concepts/service.html
+++ b/concepts/service.html
--- a/concepts/serviceaccount.html
+++ b/concepts/serviceaccount.html
--- a/concepts/statefulset.html
+++ b/concepts/statefulset.html
--- a/concepts/storage.html
+++ b/concepts/storage.html
--- a/concepts/storageclass.html
+++ b/concepts/storageclass.html
--- a/concepts/taint-and-toleration.html
+++ b/concepts/taint-and-toleration.html
--- a/concepts/traefik-ingress-controller.html
+++ b/concepts/traefik-ingress-controller.html
--- a/concepts/volume.html
+++ b/concepts/volume.html
--- a/develop/client-go-sample.html
+++ b/develop/client-go-sample.html
--- a/develop/contribute.html
+++ b/develop/contribute.html
--- a/develop/developing-environment.html
+++ b/develop/developing-environment.html
--- a/develop/index.html
+++ b/develop/index.html
--- a/develop/minikube.html
+++ b/develop/minikube.html
--- a/develop/operator.html
+++ b/develop/operator.html
--- a/develop/sigs-and-working-group.html
+++ b/develop/sigs-and-working-group.html
--- a/develop/testing.html
+++ b/develop/testing.html
--- a/develop/using-vagrant-and-virtualbox-for-development.html
+++ b/develop/using-vagrant-and-virtualbox-for-development.html
--- a/guide/access-cluster.html
+++ b/guide/access-cluster.html
--- a/guide/access-kubernetes-cluster.html
+++ b/guide/access-kubernetes-cluster.html
--- a/guide/accessing-kubernetes-pods-from-outside-of-the-cluster.html
+++ b/guide/accessing-kubernetes-pods-from-outside-of-the-cluster.html
--- a/guide/application-development-deployment-flow.html
+++ b/guide/application-development-deployment-flow.html
--- a/guide/auth-with-kubeconfig-or-token.html
+++ b/guide/auth-with-kubeconfig-or-token.html
--- a/guide/authenticate-across-clusters-kubeconfig.html
+++ b/guide/authenticate-across-clusters-kubeconfig.html
--- a/guide/authentication.html
+++ b/guide/authentication.html
--- a/guide/cabin-mobile-dashboard-for-kubernetes.html
+++ b/guide/cabin-mobile-dashboard-for-kubernetes.html
--- a/guide/cluster-security-management.html
+++ b/guide/cluster-security-management.html
--- a/guide/command-usage.html
+++ b/guide/command-usage.html
--- a/guide/configure-liveness-readiness-probes.html
+++ b/guide/configure-liveness-readiness-probes.html
--- a/guide/configure-pod-service-account.html
+++ b/guide/configure-pod-service-account.html
--- a/guide/connecting-to-applications-port-forward.html
+++ b/guide/connecting-to-applications-port-forward.html
--- a/guide/deploy-applications-in-kubernetes.html
+++ b/guide/deploy-applications-in-kubernetes.html
--- a/guide/docker-cli-to-kubectl.html
+++ b/guide/docker-cli-to-kubectl.html
--- a/guide/index.html
+++ b/guide/index.html
--- a/guide/ip-masq-agent.html
+++ b/guide/ip-masq-agent.html
--- a/guide/kubectl-cheatsheet.html
+++ b/guide/kubectl-cheatsheet.html
--- a/guide/kubectl-user-authentication-authorization.html
+++ b/guide/kubectl-user-authentication-authorization.html
--- a/guide/kubelet-authentication-authorization.html
+++ b/guide/kubelet-authentication-authorization.html
--- a/guide/kubernator-kubernetes-ui.html
+++ b/guide/kubernator-kubernetes-ui.html
--- a/guide/kubernetes-desktop-client.html
+++ b/guide/kubernetes-desktop-client.html
--- a/guide/managing-tls-in-a-cluster.html
+++ b/guide/managing-tls-in-a-cluster.html
--- a/Show More
+++ b/Show More