Modify apparmor.md based on PR - Fix site build (#16531) (#16650)

Modify apparmor.md and delete .profile to enable the site to
build with Hugo 0.57.2. Could not cherry pick PR 16531 because
the Korean translation was added in 1.14.
See also PRs #16104 and #16151.

zh/docs/reference/setup-tools/kubeadm/generated/README.md updated to fix
'invalid YAML delimiter' compile error caused by HTML comment.

Signed-off-by: Aimee Ukasick <aimeeu.opensource@gmail.com>

OWNERS_ALIASES

@@ -166,19 +166,25 @@ aliases:
     - lichuqiang
     - lucperkins
     - markthink
+    - SataQiu
     - tengqm
     - xiangpengzhao
+    - xichengliudui
     - zacharysarah
     - zhangxiaoyu-zidif
     - bradamant3    # Temporary for 1.13 release
     - jimangel      # Temporary for 1.13 release
     - tfogo         # Temporary for 1.13 release
   sig-docs-zh-reviews: #Team Chinese docs reviews; GH: sig-docs-zh-reviews
+    - AdamDang
     - chenrui333
     - idealhack
     - markthink
+    - Mr-Linus
+    - SataQiu
     - tengqm
     - xiangpengzhao
+    - xichengliudui
     - zhangxiaoyu-zidif
     - pigletfly
   sig-federation: #Team: Federation; e.g. Federated Clusters

config.toml

@@ -63,23 +63,23 @@ time_format_blog = "Monday, January 02, 2006"
 description = "Production-Grade Container Orchestration"
 showedit = true
 
-latest = "v1.12"
+latest = "v1.16"
 
-fullversion = "v1.12.0"
+fullversion = "v1.12.10"
 version = "v1.12"
-githubbranch = "master"
-docsbranch = "master"
-deprecated = false
+githubbranch = "v1.12.10"
+docsbranch = "release-1.12"
+deprecated = true
 currentUrl = "https://kubernetes.io/docs/home/"
 nextUrl = "https://kubernetes-io-vnext-staging.netlify.com/"
 githubWebsiteRepo = "github.com/kubernetes/website"
 githubWebsiteRaw = "raw.githubusercontent.com/kubernetes/website"
 
 [[params.versions]]
-fullversion = "v1.12.0"
-version = "v1.12"
-githubbranch = "v1.12.0"
-docsbranch = "release-1.12"
+fullversion = "v1.16.0"
+version = "v1.16"
+githubbranch = "v1.16.0"
+docsbranch = "release-1.16"
 url = "https://kubernetes.io"
 
 [params.pushAssets]
@@ -94,33 +94,32 @@ js = [
 ]
 
 [[params.versions]]
-fullversion = "v1.11.3"
-version = "v1.11"
-githubbranch = "v1.11.3"
-docsbranch = "release-1.11"
-url = "https://v1-11.docs.kubernetes.io"
+fullversion = "v1.15.3"
+version = "v1.15"
+githubbranch = "v1.15.3"
+docsbranch = "release-1.15"
+url = "https://v1-15.docs.kubernetes.io"
 
 [[params.versions]]
-fullversion = "v1.10.3"
-version = "v1.10"
-githubbranch = "v1.10.3"
-docsbranch = "release-1.10"
-url = "https://v1-10.docs.kubernetes.io"
+fullversion = "v1.14.6"
+version = "v1.14"
+githubbranch = "v1.14.6"
+docsbranch = "release-1.14"
+url = "https://v1-14.docs.kubernetes.io"
 
 [[params.versions]]
-fullversion = "v1.9.7"
-version = "v1.9"
-githubbranch = "v1.9.7"
-docsbranch = "release-1.9"
-url = "https://v1-9.docs.kubernetes.io"
+fullversion = "v1.13.10"
+version = "v1.13"
+githubbranch = "v1.13.10"
+docsbranch = "release-1.13"
+url = "https://v1-13.docs.kubernetes.io"
 
 [[params.versions]]
-fullversion = "v1.8.4"
-version = "v1.8"
-githubbranch = "v1.8.4"
-docsbranch = "release-1.8"
-url = "https://v1-8.docs.kubernetes.io"
-
+fullversion = "v1.12.10"
+version = "v1.12"
+githubbranch = "v1.12.10"
+docsbranch = "release-1.12"
+url = "https://v1-12.docs.kubernetes.io"
 
 # Language definitions.
 

content/en/blog/_posts/2017-10-00-Five-Days-Of-Kubernetes-18.md

@@ -12,9 +12,9 @@ With the help of our growing community of 1,400 plus contributors, we issued mor
 
 While many improvements have been contributed, we highlight key features in this series of in-depth posts listed below. [Follow along](https://twitter.com/kubernetesio) and see what’s new and improved with storage, security and more.  
 
-**Day 1:** [5 Days of Kubernetes 1.8](https://kubernetes.io/blog/2017/10/five-days-of-kubernetes-18)  
+**Day 1:** [5 Days of Kubernetes v1.8](https://kubernetes.io/blog/2017/10/five-days-of-kubernetes-18)  
 **Day 2:** [kubeadm v1.8 Introduces Easy Upgrades for Kubernetes Clusters](https://kubernetes.io/blog/2017/10/kubeadm-v18-released)  
-**Day 3:** [Kubernetes v.1.8 Retrospective: It Takes a Village to Raise a Kubernetes](https://kubernetes.io/blog/2017/10/it-takes-village-to-raise-kubernetes)
+**Day 3:** [Kubernetes v1.8 Retrospective: It Takes a Village to Raise a Kubernetes](https://kubernetes.io/blog/2017/10/it-takes-village-to-raise-kubernetes)
 **Day 4:** [Using RBAC, Generally Available in Kubernetes v1.8](https://kubernetes.io/blog/2017/10/using-rbac-generally-available-18)  
 **Day 5:** [Enforcing Network Policies in Kubernetes](https://kubernetes.io/blog/2017/10/enforcing-network-policies-in-kubernetes)  
 

content/en/docs/concepts/architecture/cloud-controller.md

@@ -252,9 +252,9 @@ The following cloud providers have implemented CCMs:
 
 * [Digital Ocean](https://github.com/digitalocean/digitalocean-cloud-controller-manager)
 * [Oracle](https://github.com/oracle/oci-cloud-controller-manager)
-* [Azure](https://github.com/kubernetes/kubernetes/tree/master/pkg/cloudprovider/providers/azure)
-* [GCE](https://github.com/kubernetes/kubernetes/tree/master/pkg/cloudprovider/providers/gce)
-* [AWS](https://github.com/kubernetes/kubernetes/tree/master/pkg/cloudprovider/providers/aws)
+* [Azure](https://github.com/kubernetes/cloud-provider-azure)
+* [GCP](https://github.com/kubernetes/cloud-provider-gcp)
+* [AWS](https://github.com/kubernetes/cloud-provider-aws)
 
 ## Cluster Administration
 

content/en/docs/concepts/configuration/secret.md

@@ -443,7 +443,7 @@ Kubelet is checking whether the mounted secret is fresh on every periodic sync.
 However, it is using its local cache for getting the current value of the Secret.
 The type of the cache is configurable using the  (`ConfigMapAndSecretChangeDetectionStrategy` field in
 [KubeletConfiguration struct](https://github.com/kubernetes/kubernetes/blob/{{< param "docsbranch" >}}/staging/src/k8s.io/kubelet/config/v1beta1/types.go)).
-It can be either propagated via watch (default), ttl-based, or simply redirecting
+It can be either propagated via watch, ttl-based (default), watch, or simply redirecting
 all requests to directly kube-apiserver.
 As a result, the total delay from the moment when the Secret is updated to the moment
 when new keys are projected to the Pod can be as long as kubelet sync period + cache

content/en/docs/concepts/containers/runtime-class.md

@@ -2,7 +2,7 @@
 reviewers:
 - tallclair
 - dchen1107
-title: Runtime Class
+title: RuntimeClass
 content_template: templates/concept
 weight: 20
 ---
@@ -15,10 +15,11 @@ This page describes the RuntimeClass resource and runtime selection mechanism.
 
 {{% /capture %}}
 
+{{< toc >}}
 
 {{% capture body %}}
 
-## Runtime Class
+## RuntimeClass
 
 RuntimeClass is an alpha feature for selecting the container runtime configuration to use to run a
 pod's containers.
@@ -36,19 +37,18 @@ the RuntimeClass feature:
 #### 1. Enable the RuntimeClass feature gate
 
 See [Feature Gates](/docs/reference/command-line-tools-reference/feature-gates/) for an explanation
-of enabling feature gates. The `RuntimeClass` feature gate must be enabled on apiservers _and_
-kubelets.
+of enabling feature gates. The RuntimeClass feature gate must be enabled on apiservers _and_ kubelets.
 
 #### 2. Install the RuntimeClass CRD
 
-The RuntimeClass [CustomResourceDefinition][] (CRD) can be found in the addons directory of the
-Kubernetes git repo: [kubernetes/cluster/addons/runtimeclass/runtimeclass_crd.yaml][runtimeclass_crd]
+The RuntimeClass [CustomResourceDefinition][/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/] (CRD) can be found in the addons directory of the
+Kubernetes git repo:
+
+https://github.com/kubernetes/kubernetes/tree/release-1.12/cluster/addons/runtimeclass/runtimeclass_crd.yaml
 
 Install the CRD with `kubectl apply -f runtimeclass_crd.yaml`.
 
-[CustomResourceDefinition]: /docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/
-[runtimeclass_crd]: https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/runtimeclass/runtimeclass_crd.yaml
-
+[CustomResourceDefinition][/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/]
 
 #### 3. Configure the CRI implementation on nodes
 
@@ -59,12 +59,12 @@ feature, not all CRIs support multiple RuntimeClasses yet.
 {{< note >}}
 RuntimeClass currently assumes a homogeneous node configuration across the cluster
 (which means that all nodes are configured the same way with respect to container runtimes). Any heterogeneity (varying configurations) must be
-managed independently of RuntimeClass through scheduling features (see [Assigning Pods to
-Nodes](/docs/concepts/configuration/assign-pod-node/)).
+managed independently of RuntimeClass through scheduling features
+(see [Assigning Pods to Nodes](/docs/concepts/configuration/assign-pod-node/)).
 {{< /note >}}
 
 The configurations have a corresponding `RuntimeHandler` name, referenced by the RuntimeClass. The
-RuntimeHandler must be a valid DNS 1123 subdomain (alpha-numeric + `-` and `.` characters).
+RuntimeHandler must be a valid DNS-1123 subdomain (alpha-numeric characters, `-`, or `.`).
 
 #### 4. Create the corresponding RuntimeClass resources
 
@@ -82,7 +82,7 @@ metadata:
   name: myclass  # The name the RuntimeClass will be referenced by
   # RuntimeClass is a non-namespaced resource
 spec:
-  runtimeHandler: myconfiguration  # The name of the corresponding CRI configuration
+  runtimeHandler: myconfiguration  # The name of the correpsonding CRI configuration
 ```
 
 

content/en/docs/concepts/policy/pod-security-policy.md

@@ -612,4 +612,4 @@ default cannot be changed.
 Controlled via annotations on the PodSecurityPolicy. Refer to the [Sysctl documentation](
 /docs/concepts/cluster-administration/sysctl-cluster/#podsecuritypolicy-annotations).
 
-{{% /capture %}}
+{{% /capture %}}

content/en/docs/concepts/policy/resource-quotas.md

@@ -579,4 +579,4 @@ See a [detailed example for how to use resource quota](/docs/tasks/administer-cl
 
 See [ResourceQuota design doc](https://git.k8s.io/community/contributors/design-proposals/resource-management/admission_control_resource_quota.md) for more information.
 
-{{% /capture %}}
+{{% /capture %}}

content/en/docs/concepts/workloads/controllers/jobs-run-to-completion.md

@@ -133,8 +133,8 @@ There are three main types of jobs:
   - the job is complete when there is one successful pod for each value in the range 1 to `.spec.completions`.
   - **not implemented yet:** Each pod passed a different index in the range 1 to `.spec.completions`.
 1. Parallel Jobs with a *work queue*:
-  - do not specify `.spec.completions`, default to `.spec.parallelism`.
-  - the pods must coordinate with themselves or an external service to determine what each should work on.
+  - do not specify `.spec.completions`, default to `.spec.parallelism`.
+  - the pods must coordinate with themselves or an external service to determine what each should work on.
   - each pod is independently capable of determining whether or not all its peers are done, thus the entire Job is done.
   - when _any_ pod terminates with success, no new pods are created.
   - once at least one pod has terminated with success and all pods are terminated, then the job is completed with success.
@@ -453,4 +453,4 @@ object, but complete control over what pods are created and how work is assigned
 
 Support for creating Jobs at specified times/dates (i.e. cron) is available in Kubernetes [1.4](https://github.com/kubernetes/kubernetes/pull/11980). More information is available in the [cron job documents](/docs/concepts/workloads/controllers/cron-jobs/)
 
-{{% /capture %}}
+{{% /capture %}}

content/en/docs/reference/command-line-tools-reference/federation-apiserver.md

@@ -150,4 +150,4 @@ VolumeScheduling=true|false (ALPHA - default=false)
       --watch-cache-sizes strings                               List of watch cache sizes for every resource (pods, nodes, etc.), comma separated. The individual override format: resource[.group]#size, where resource is lowercase plural (no version), group is optional, and size is a number. It takes effect when watch-cache is enabled. Some resources (replicationcontrollers, endpoints, nodes, pods, services, apiservices.apiregistration.k8s.io) have system defaults set by heuristics, others default to default-watch-cache-size
 ```
 
-###### Auto generated by spf13/cobra on 24-Sep-2018
+###### Auto generated by spf13/cobra on 24-Sep-2018

content/en/docs/reference/command-line-tools-reference/federation-controller-manager.md

@@ -56,4 +56,4 @@ federation-controller-manager [flags]
       --zone-name string                       Zone name, like example.com.
 ```
 
-###### Auto generated by spf13/cobra on 24-Sep-2018
+###### Auto generated by spf13/cobra on 24-Sep-2018

content/en/docs/reference/federation/_index.html

@@ -1,4 +1,4 @@
 ---
 title: "Federation API"
 weight: 40
----
+---

content/en/docs/reference/glossary/quantity.md

@@ -29,3 +29,4 @@ intentionally lowercase), `M` (mega), `G` (giga), `T` (terra), `P` (peta),
 
 The accepted binary (power-of-2) units are `Ki` (kibi), `Mi` (mebi), `Gi` (gibi),
 `Ti` (tebi), `Pi` (pebi), `Ei` (exbi).
+

content/en/docs/reference/kubectl/kubectl.md

@@ -290,4 +290,3 @@ kubectl [flags]
 * [kubectl uncordon](/docs/reference/generated/kubectl/kubectl-commands#uncordon)	 - Mark node as schedulable
 * [kubectl version](/docs/reference/generated/kubectl/kubectl-commands#version)	 - Print the client and server version information
 * [kubectl wait](/docs/reference/generated/kubectl/kubectl-commands#wait)	 - Experimental: Wait for a specific condition on one or many resources.
-

content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md

@@ -406,4 +406,4 @@ provisioned). For details, see the [kubeadm join](/docs/reference/setup-tools/ku
 * [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join/) to bootstrap a Kubernetes worker node and join it to the cluster
 * [kubeadm upgrade](/docs/reference/setup-tools/kubeadm/kubeadm-upgrade/) to upgrade a Kubernetes cluster to a newer version
 * [kubeadm reset](/docs/reference/setup-tools/kubeadm/kubeadm-reset/) to revert any changes made to this host by `kubeadm init` or `kubeadm join`
-{{% /capture %}}
+{{% /capture %}}

content/en/docs/reference/setup-tools/kubeadm/kubeadm-upgrade.md

@@ -46,4 +46,4 @@ applied to static pod manifests.
 
 {{% capture whatsnext %}}
 * [kubeadm config](/docs/reference/setup-tools/kubeadm/kubeadm-config/) if you initialized your cluster using kubeadm v1.7.x or lower, to configure your cluster for `kubeadm upgrade`
-{{% /capture %}}
+{{% /capture %}}

content/en/docs/reference/setup-tools/kubefed/kubefed-init.md

@@ -1,105 +0,0 @@
----
-title: kubefed init
-notitle: true
-weight: 30
----
-## kubefed init
-
-Initialize a federation control plane
-
-### Synopsis
-
-
-Init initializes a federation control plane.
-
-    Federation control plane is hosted inside a Kubernetes
-    cluster. The host cluster must be specified using the
-    --host-cluster-context flag.
-
-```
-kubefed init FEDERATION_NAME --host-cluster-context=HOST_CONTEXT [flags]
-```
-
-### Examples
-
-```
-  # Initialize federation control plane for a federation
-  # named foo in the host cluster whose local kubeconfig
-  # context is bar.
-  kubefed init foo --host-cluster-context=bar
-```
-
-### Options
-
-```
-      --api-server-advertise-address string      Preferred address to advertise api server nodeport service. Valid only if 'api-server-service-type=NodePort'.
-      --api-server-port int32                    Preferred port to use for api server nodeport service (0 for random port assignment). Valid only if 'api-server-service-type=NodePort'.
-      --api-server-service-type string           The type of service to create for federation API server. Options: 'LoadBalancer' (default), 'NodePort'. (default "LoadBalancer")
-      --apiserver-arg-overrides string           comma separated list of federation-apiserver arguments to override: Example "--arg1=value1,--arg2=value2..."
-      --apiserver-enable-basic-auth              Enables HTTP Basic authentication for the federation-apiserver. Defaults to false.
-      --apiserver-enable-token-auth              Enables token authentication for the federation-apiserver. Defaults to false.
-      --controllermanager-arg-overrides string   comma separated list of federation-controller-manager arguments to override: Example "--arg1=value1,--arg2=value2..."
-      --dns-provider string                      Dns provider to be used for this deployment.
-      --dns-provider-config string               Config file path on local file system for configuring DNS provider.
-      --dns-zone-name string                     DNS suffix for this federation. Federated Service DNS names are published with this suffix.
-      --dry-run                                  dry run without sending commands to server.
-      --etcd-image string                        Image to use for etcd server. (default "gcr.io/google_containers/etcd:3.1.10")
-      --etcd-persistent-storage                  Use persistent volume for etcd. Defaults to 'true'. (default true)
-      --etcd-pv-capacity string                  Size of persistent volume claim to be used for etcd. (default "10Gi")
-      --etcd-pv-storage-class string             The storage class of the persistent volume claim used for etcd.   Must be provided if a default storage class is not enabled for the host cluster.
-      --etcd-servers string                      External pre-deployed etcd server to be used to store federation state.
-      --federation-system-namespace string       Namespace in the host cluster where the federation system components are installed (default "federation-system")
-  -h, --help                                     help for init
-      --host-cluster-context string              Host cluster context
-      --image string                             Image to use for federation API server and controller manager binaries. (default "gcr.io/k8s-jkns-e2e-gce-federation/fcp-amd64:v0.0.0-master_$Format:%h$")
-      --image-pull-policy string                 PullPolicy describes a policy for if/when to pull a container image. The default pull policy is IfNotPresent which will not pull an image if it already exists. (default "IfNotPresent")
-      --image-pull-secrets string                Provide secrets that can access the private registry.
-      --node-selector string                     comma separated list of nodeSelector arguments: Example "arg1=value1,arg2=value2..."
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                              log to standard error as well as files
-      --as string                                    Username to impersonate for the operation
-      --as-group stringArray                         Group to impersonate for the operation, this flag can be repeated to specify multiple groups.
-      --cache-dir string                             Default HTTP cache directory (default "/Users/jrondeau/.kube/http-cache")
-      --certificate-authority string                 Path to a cert file for the certificate authority
-      --client-certificate string                    Path to a client certificate file for TLS
-      --client-key string                            Path to a client key file for TLS
-      --cloud-provider-gce-lb-src-cidrs cidrs        CIDRs opened in GCE firewall for LB traffic proxy & health checks (default 130.211.0.0/22,209.85.152.0/22,209.85.204.0/22,35.191.0.0/16)
-      --cluster string                               The name of the kubeconfig cluster to use
-      --context string                               The name of the kubeconfig context to use
-      --default-not-ready-toleration-seconds int     Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is added by default to every pod that does not already have such a toleration. (default 300)
-      --default-unreachable-toleration-seconds int   Indicates the tolerationSeconds of the toleration for unreachable:NoExecute that is added by default to every pod that does not already have such a toleration. (default 300)
-      --insecure-skip-tls-verify                     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure
-      --ir-data-source string                        Data source used by InitialResources. Supported options: influxdb, gcm. (default "influxdb")
-      --ir-dbname string                             InfluxDB database name which contains metrics required by InitialResources (default "k8s")
-      --ir-hawkular string                           Hawkular configuration URL
-      --ir-influxdb-host string                      Address of InfluxDB which contains metrics required by InitialResources (default "localhost:8080/api/v1/namespaces/kube-system/services/monitoring-influxdb:api/proxy")
-      --ir-namespace-only                            Whether the estimation should be made only based on data from the same namespace.
-      --ir-password string                           Password used for connecting to InfluxDB (default "root")
-      --ir-percentile int                            Which percentile of samples should InitialResources use when estimating resources. For experiment purposes. (default 90)
-      --ir-user string                               User used for connecting to InfluxDB (default "root")
-      --kubeconfig string                            Path to the kubeconfig file to use for CLI requests.
-      --log-backtrace-at traceLocation               when logging hits line file:N, emit a stack trace (default :0)
-      --log-dir string                               If non-empty, write log files in this directory
-      --log-flush-frequency duration                 Maximum number of seconds between log flushes (default 5s)
-      --logtostderr                                  log to standard error instead of files (default true)
-      --match-server-version                         Require server version to match client version
-  -n, --namespace string                             If present, the namespace scope for this CLI request
-      --password string                              Password for basic authentication to the API server
-      --request-timeout string                       The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default "0")
-  -s, --server string                                The address and port of the Kubernetes API server
-      --stderrthreshold severity                     logs at or above this threshold go to stderr (default 2)
-      --token string                                 Bearer token for authentication to the API server
-      --user string                                  The name of the kubeconfig user to use
-      --username string                              Username for basic authentication to the API server
-  -v, --v Level                                      log level for V logs
-      --vmodule moduleSpec                           comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [kubefed](/docs/reference/setup-tools/kubefed/kubefed/)	 - kubefed controls a Kubernetes Cluster Federation
-
-###### Auto generated by spf13/cobra on 25-Mar-2018

content/en/docs/reference/setup-tools/kubefed/kubefed-join.md

@@ -1,99 +0,0 @@
----
-title: kubefed join
-notitle: true
-weight: 40
----
-## kubefed join
-
-Join a cluster to a federation
-
-### Synopsis
-
-
-Join adds a cluster to a federation.
-
-    Current context is assumed to be a federation API
-    server. Please use the --context flag otherwise.
-
-```
-kubefed join CLUSTER_NAME --host-cluster-context=HOST_CONTEXT [flags]
-```
-
-### Examples
-
-```
-  # Join a cluster to a federation by specifying the
-  # cluster name and the context name of the federation
-  # control plane's host cluster. Cluster name must be
-  # a valid RFC 1123 subdomain name. Cluster context
-  # must be specified if the cluster name is different
-  # than the cluster's context in the local kubeconfig.
-  kubefed join foo --host-cluster-context=bar
-```
-
-### Options
-
-```
-      --allow-missing-template-keys          If true, ignore any errors in templates when a field or map key is missing in the template. Only applies to golang and jsonpath output formats. (default true)
-      --cluster-context string               Name of the cluster's context in the local kubeconfig. Defaults to cluster name if unspecified.
-      --dry-run                              If true, only print the object that would be sent, without sending it.
-      --federation-system-namespace string   Namespace in the host cluster where the federation system components are installed (default "federation-system")
-      --generator string                     The name of the API generator to use. (default "cluster/v1beta1")
-  -h, --help                                 help for join
-      --host-cluster-context string          Host cluster context
-      --no-headers                           When using the default or custom-column output format, don't print headers (default print headers).
-  -o, --output string                        Output format. One of: json|yaml|wide|name|custom-columns=...|custom-columns-file=...|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See custom columns [http://kubernetes.io/docs/user-guide/kubectl-overview/#custom-columns], golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://kubernetes.io/docs/user-guide/jsonpath].
-      --save-config                          If true, the configuration of current object will be saved in its annotation. Otherwise, the annotation will be unchanged. This flag is useful when you want to perform kubectl apply on this object in the future.
-  -a, --show-all                             When printing, show all resources (default hide terminated pods.)
-      --show-labels                          When printing, show all labels as the last column (default hide labels column)
-      --sort-by string                       If non-empty, sort list types using this field specification.  The field specification is expressed as a JSONPath expression (e.g. '{.metadata.name}'). The field in the API resource specified by this JSONPath expression must be an integer or a string.
-      --template string                      Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview].
-      --validate                             If true, use a schema to validate the input before sending it (default true)
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                              log to standard error as well as files
-      --as string                                    Username to impersonate for the operation
-      --as-group stringArray                         Group to impersonate for the operation, this flag can be repeated to specify multiple groups.
-      --cache-dir string                             Default HTTP cache directory (default "/Users/jrondeau/.kube/http-cache")
-      --certificate-authority string                 Path to a cert file for the certificate authority
-      --client-certificate string                    Path to a client certificate file for TLS
-      --client-key string                            Path to a client key file for TLS
-      --cloud-provider-gce-lb-src-cidrs cidrs        CIDRs opened in GCE firewall for LB traffic proxy & health checks (default 130.211.0.0/22,209.85.152.0/22,209.85.204.0/22,35.191.0.0/16)
-      --cluster string                               The name of the kubeconfig cluster to use
-      --context string                               The name of the kubeconfig context to use
-      --default-not-ready-toleration-seconds int     Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is added by default to every pod that does not already have such a toleration. (default 300)
-      --default-unreachable-toleration-seconds int   Indicates the tolerationSeconds of the toleration for unreachable:NoExecute that is added by default to every pod that does not already have such a toleration. (default 300)
-      --insecure-skip-tls-verify                     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure
-      --ir-data-source string                        Data source used by InitialResources. Supported options: influxdb, gcm. (default "influxdb")
-      --ir-dbname string                             InfluxDB database name which contains metrics required by InitialResources (default "k8s")
-      --ir-hawkular string                           Hawkular configuration URL
-      --ir-influxdb-host string                      Address of InfluxDB which contains metrics required by InitialResources (default "localhost:8080/api/v1/namespaces/kube-system/services/monitoring-influxdb:api/proxy")
-      --ir-namespace-only                            Whether the estimation should be made only based on data from the same namespace.
-      --ir-password string                           Password used for connecting to InfluxDB (default "root")
-      --ir-percentile int                            Which percentile of samples should InitialResources use when estimating resources. For experiment purposes. (default 90)
-      --ir-user string                               User used for connecting to InfluxDB (default "root")
-      --kubeconfig string                            Path to the kubeconfig file to use for CLI requests.
-      --log-backtrace-at traceLocation               when logging hits line file:N, emit a stack trace (default :0)
-      --log-dir string                               If non-empty, write log files in this directory
-      --log-flush-frequency duration                 Maximum number of seconds between log flushes (default 5s)
-      --logtostderr                                  log to standard error instead of files (default true)
-      --match-server-version                         Require server version to match client version
-  -n, --namespace string                             If present, the namespace scope for this CLI request
-      --password string                              Password for basic authentication to the API server
-      --request-timeout string                       The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default "0")
-  -s, --server string                                The address and port of the Kubernetes API server
-      --stderrthreshold severity                     logs at or above this threshold go to stderr (default 2)
-      --token string                                 Bearer token for authentication to the API server
-      --user string                                  The name of the kubeconfig user to use
-      --username string                              Username for basic authentication to the API server
-  -v, --v Level                                      log level for V logs
-      --vmodule moduleSpec                           comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [kubefed](/docs/reference/setup-tools/kubefed/kubefed/)	 - kubefed controls a Kubernetes Cluster Federation
-
-###### Auto generated by spf13/cobra on 25-Mar-2018

content/en/docs/reference/setup-tools/kubefed/kubefed-options.md

@@ -1,77 +0,0 @@
----
-title: kubefed options
-notitle: true
-weight: 20
----
-## kubefed options
-
-Print the list of flags inherited by all commands
-
-### Synopsis
-
-
-Print the list of flags inherited by all commands
-
-```
-kubefed options [flags]
-```
-
-### Examples
-
-```
-  # Print flags inherited by all commands
-  kubefed options
-```
-
-### Options
-
-```
-  -h, --help   help for options
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                              log to standard error as well as files
-      --as string                                    Username to impersonate for the operation
-      --as-group stringArray                         Group to impersonate for the operation, this flag can be repeated to specify multiple groups.
-      --cache-dir string                             Default HTTP cache directory (default "/Users/jrondeau/.kube/http-cache")
-      --certificate-authority string                 Path to a cert file for the certificate authority
-      --client-certificate string                    Path to a client certificate file for TLS
-      --client-key string                            Path to a client key file for TLS
-      --cloud-provider-gce-lb-src-cidrs cidrs        CIDRs opened in GCE firewall for LB traffic proxy & health checks (default 130.211.0.0/22,209.85.152.0/22,209.85.204.0/22,35.191.0.0/16)
-      --cluster string                               The name of the kubeconfig cluster to use
-      --context string                               The name of the kubeconfig context to use
-      --default-not-ready-toleration-seconds int     Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is added by default to every pod that does not already have such a toleration. (default 300)
-      --default-unreachable-toleration-seconds int   Indicates the tolerationSeconds of the toleration for unreachable:NoExecute that is added by default to every pod that does not already have such a toleration. (default 300)
-      --insecure-skip-tls-verify                     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure
-      --ir-data-source string                        Data source used by InitialResources. Supported options: influxdb, gcm. (default "influxdb")
-      --ir-dbname string                             InfluxDB database name which contains metrics required by InitialResources (default "k8s")
-      --ir-hawkular string                           Hawkular configuration URL
-      --ir-influxdb-host string                      Address of InfluxDB which contains metrics required by InitialResources (default "localhost:8080/api/v1/namespaces/kube-system/services/monitoring-influxdb:api/proxy")
-      --ir-namespace-only                            Whether the estimation should be made only based on data from the same namespace.
-      --ir-password string                           Password used for connecting to InfluxDB (default "root")
-      --ir-percentile int                            Which percentile of samples should InitialResources use when estimating resources. For experiment purposes. (default 90)
-      --ir-user string                               User used for connecting to InfluxDB (default "root")
-      --kubeconfig string                            Path to the kubeconfig file to use for CLI requests.
-      --log-backtrace-at traceLocation               when logging hits line file:N, emit a stack trace (default :0)
-      --log-dir string                               If non-empty, write log files in this directory
-      --log-flush-frequency duration                 Maximum number of seconds between log flushes (default 5s)
-      --logtostderr                                  log to standard error instead of files (default true)
-      --match-server-version                         Require server version to match client version
-  -n, --namespace string                             If present, the namespace scope for this CLI request
-      --password string                              Password for basic authentication to the API server
-      --request-timeout string                       The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default "0")
-  -s, --server string                                The address and port of the Kubernetes API server
-      --stderrthreshold severity                     logs at or above this threshold go to stderr (default 2)
-      --token string                                 Bearer token for authentication to the API server
-      --user string                                  The name of the kubeconfig user to use
-      --username string                              Username for basic authentication to the API server
-  -v, --v Level                                      log level for V logs
-      --vmodule moduleSpec                           comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [kubefed](/docs/reference/setup-tools/kubefed/kubefed/)	 - kubefed controls a Kubernetes Cluster Federation
-
-###### Auto generated by spf13/cobra on 25-Mar-2018

content/en/docs/reference/setup-tools/kubefed/kubefed-unjoin.md

@@ -1,86 +0,0 @@
----
-title: kubefed unjoin
-notitle: true
-weight: 50
----
-## kubefed unjoin
-
-Unjoin a cluster from a federation
-
-### Synopsis
-
-
-Unjoin a cluster from a federation.
-
-    Current context is assumed to be a federation endpoint.
-    Please use the --context flag otherwise.
-
-```
-kubefed unjoin CLUSTER_NAME --host-cluster-context=HOST_CONTEXT [flags]
-```
-
-### Examples
-
-```
-  # Unjoin the specified cluster from a federation.
-  # Federation control plane's host cluster context name
-  # must be specified via the --host-cluster-context flag
-  # to properly cleanup the credentials.
-  kubectl unjoin foo --host-cluster-context=bar --cluster-context=baz
-```
-
-### Options
-
-```
-      --cluster-context string               Name of the cluster's context in the local kubeconfig. Defaults to cluster name if unspecified.
-      --federation-system-namespace string   Namespace in the host cluster where the federation system components are installed (default "federation-system")
-  -h, --help                                 help for unjoin
-      --host-cluster-context string          Host cluster context
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                              log to standard error as well as files
-      --as string                                    Username to impersonate for the operation
-      --as-group stringArray                         Group to impersonate for the operation, this flag can be repeated to specify multiple groups.
-      --cache-dir string                             Default HTTP cache directory (default "/Users/jrondeau/.kube/http-cache")
-      --certificate-authority string                 Path to a cert file for the certificate authority
-      --client-certificate string                    Path to a client certificate file for TLS
-      --client-key string                            Path to a client key file for TLS
-      --cloud-provider-gce-lb-src-cidrs cidrs        CIDRs opened in GCE firewall for LB traffic proxy & health checks (default 130.211.0.0/22,209.85.152.0/22,209.85.204.0/22,35.191.0.0/16)
-      --cluster string                               The name of the kubeconfig cluster to use
-      --context string                               The name of the kubeconfig context to use
-      --default-not-ready-toleration-seconds int     Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is added by default to every pod that does not already have such a toleration. (default 300)
-      --default-unreachable-toleration-seconds int   Indicates the tolerationSeconds of the toleration for unreachable:NoExecute that is added by default to every pod that does not already have such a toleration. (default 300)
-      --insecure-skip-tls-verify                     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure
-      --ir-data-source string                        Data source used by InitialResources. Supported options: influxdb, gcm. (default "influxdb")
-      --ir-dbname string                             InfluxDB database name which contains metrics required by InitialResources (default "k8s")
-      --ir-hawkular string                           Hawkular configuration URL
-      --ir-influxdb-host string                      Address of InfluxDB which contains metrics required by InitialResources (default "localhost:8080/api/v1/namespaces/kube-system/services/monitoring-influxdb:api/proxy")
-      --ir-namespace-only                            Whether the estimation should be made only based on data from the same namespace.
-      --ir-password string                           Password used for connecting to InfluxDB (default "root")
-      --ir-percentile int                            Which percentile of samples should InitialResources use when estimating resources. For experiment purposes. (default 90)
-      --ir-user string                               User used for connecting to InfluxDB (default "root")
-      --kubeconfig string                            Path to the kubeconfig file to use for CLI requests.
-      --log-backtrace-at traceLocation               when logging hits line file:N, emit a stack trace (default :0)
-      --log-dir string                               If non-empty, write log files in this directory
-      --log-flush-frequency duration                 Maximum number of seconds between log flushes (default 5s)
-      --logtostderr                                  log to standard error instead of files (default true)
-      --match-server-version                         Require server version to match client version
-  -n, --namespace string                             If present, the namespace scope for this CLI request
-      --password string                              Password for basic authentication to the API server
-      --request-timeout string                       The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default "0")
-  -s, --server string                                The address and port of the Kubernetes API server
-      --stderrthreshold severity                     logs at or above this threshold go to stderr (default 2)
-      --token string                                 Bearer token for authentication to the API server
-      --user string                                  The name of the kubeconfig user to use
-      --username string                              Username for basic authentication to the API server
-  -v, --v Level                                      log level for V logs
-      --vmodule moduleSpec                           comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [kubefed](/docs/reference/setup-tools/kubefed/kubefed/)	 - kubefed controls a Kubernetes Cluster Federation
-
-###### Auto generated by spf13/cobra on 25-Mar-2018

content/en/docs/reference/setup-tools/kubefed/kubefed-version.md

@@ -1,80 +0,0 @@
----
-title: kubefed version
-notitle: true
-weight: 60
----
-## kubefed version
-
-Print the client and server version information
-
-### Synopsis
-
-
-Print the client and server version information for the current context
-
-```
-kubefed version [flags]
-```
-
-### Examples
-
-```
-  # Print the client and server versions for the current context
-  kubefed version
-```
-
-### Options
-
-```
-      --client          Client version only (no server required).
-  -h, --help            help for version
-  -o, --output string   One of 'yaml' or 'json'.
-      --short           Print just the version number.
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                              log to standard error as well as files
-      --as string                                    Username to impersonate for the operation
-      --as-group stringArray                         Group to impersonate for the operation, this flag can be repeated to specify multiple groups.
-      --cache-dir string                             Default HTTP cache directory (default "/Users/jrondeau/.kube/http-cache")
-      --certificate-authority string                 Path to a cert file for the certificate authority
-      --client-certificate string                    Path to a client certificate file for TLS
-      --client-key string                            Path to a client key file for TLS
-      --cloud-provider-gce-lb-src-cidrs cidrs        CIDRs opened in GCE firewall for LB traffic proxy & health checks (default 130.211.0.0/22,209.85.152.0/22,209.85.204.0/22,35.191.0.0/16)
-      --cluster string                               The name of the kubeconfig cluster to use
-      --context string                               The name of the kubeconfig context to use
-      --default-not-ready-toleration-seconds int     Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is added by default to every pod that does not already have such a toleration. (default 300)
-      --default-unreachable-toleration-seconds int   Indicates the tolerationSeconds of the toleration for unreachable:NoExecute that is added by default to every pod that does not already have such a toleration. (default 300)
-      --insecure-skip-tls-verify                     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure
-      --ir-data-source string                        Data source used by InitialResources. Supported options: influxdb, gcm. (default "influxdb")
-      --ir-dbname string                             InfluxDB database name which contains metrics required by InitialResources (default "k8s")
-      --ir-hawkular string                           Hawkular configuration URL
-      --ir-influxdb-host string                      Address of InfluxDB which contains metrics required by InitialResources (default "localhost:8080/api/v1/namespaces/kube-system/services/monitoring-influxdb:api/proxy")
-      --ir-namespace-only                            Whether the estimation should be made only based on data from the same namespace.
-      --ir-password string                           Password used for connecting to InfluxDB (default "root")
-      --ir-percentile int                            Which percentile of samples should InitialResources use when estimating resources. For experiment purposes. (default 90)
-      --ir-user string                               User used for connecting to InfluxDB (default "root")
-      --kubeconfig string                            Path to the kubeconfig file to use for CLI requests.
-      --log-backtrace-at traceLocation               when logging hits line file:N, emit a stack trace (default :0)
-      --log-dir string                               If non-empty, write log files in this directory
-      --log-flush-frequency duration                 Maximum number of seconds between log flushes (default 5s)
-      --logtostderr                                  log to standard error instead of files (default true)
-      --match-server-version                         Require server version to match client version
-  -n, --namespace string                             If present, the namespace scope for this CLI request
-      --password string                              Password for basic authentication to the API server
-      --request-timeout string                       The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default "0")
-  -s, --server string                                The address and port of the Kubernetes API server
-      --stderrthreshold severity                     logs at or above this threshold go to stderr (default 2)
-      --token string                                 Bearer token for authentication to the API server
-      --user string                                  The name of the kubeconfig user to use
-      --username string                              Username for basic authentication to the API server
-  -v, --v Level                                      log level for V logs
-      --vmodule moduleSpec                           comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [kubefed](/docs/reference/setup-tools/kubefed/kubefed/)	 - kubefed controls a Kubernetes Cluster Federation
-
-###### Auto generated by spf13/cobra on 25-Mar-2018

content/en/docs/setup/independent/install-kubeadm.md

@@ -250,4 +250,4 @@ If you are running into difficulties with kubeadm, please consult our [troublesh
 
 * [Using kubeadm to Create a Cluster](/docs/setup/independent/create-cluster-kubeadm/)
 
-{{% /capture %}}
+{{% /capture %}}

content/en/docs/tasks/administer-cluster/developing-cloud-controller-manager.md

@@ -12,7 +12,7 @@ content_template: templates/concept
 {{< feature-state for_k8s_version="v1.11" state="beta" >}}
 In upcoming releases, Cloud Controller Manager will
 be the preferred way to integrate Kubernetes with any cloud. This will ensure cloud providers
-can develop their features independently from the core Kubernetes release cycles.**
+can develop their features independently from the core Kubernetes release cycles.
 
 {{< feature-state for_k8s_version="1.8" state="alpha" >}}
 

content/en/docs/tasks/administer-cluster/dns-custom-nameservers.md

@@ -386,4 +386,4 @@ To migrate from kube-dns to CoreDNS, [a detailed blog](https://coredns.io/2018/0
 A cluster administrator can also migrate using [the deploy script](https://github.com/coredns/deployment/blob/master/kubernetes/deploy.sh).
 
 ## What's next
-- [Debugging DNS Resolution](/docs/tasks/administer-cluster/dns-debugging-resolution/).
+- [Debugging DNS Resolution](/docs/tasks/administer-cluster/dns-debugging-resolution/).

content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-ha-1-12.md

@@ -244,4 +244,4 @@ If the upgrade fails, see whether one of the following scenarios applies:
 
 - If `kubeadm upgrade apply` on one of the secondary masters failed, the cluster is upgraded and working, but the secondary masters are in an undefined state. You need to investigate further and join the secondaries manually.
 
-{{% /capture %}}
+{{% /capture %}}

content/en/docs/tasks/administer-federation/secret.md

@@ -70,7 +70,7 @@ These secrets in underlying clusters will match the federated secret.
 You can update a federated secret as you would update a Kubernetes
 secret; however, for a federated secret, you must send the request to
 the federation apiserver instead of sending it to a specific Kubernetes cluster.
-The Federation control plan ensures that whenever the federated secret is
+The Federation control plane ensures that whenever the federated secret is
 updated, it updates the corresponding secrets in all underlying clusters to
 match it.
 

content/en/docs/tasks/extend-kubectl/kubectl-plugins.md

@@ -283,4 +283,3 @@ See the [Sample CLI Plugin](https://github.com/kubernetes/sample-cli-plugin) for
 
 {{% /capture %}}
 
-

content/en/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md

@@ -458,4 +458,4 @@ $ kubectl create -f https://k8s.io/examples/application/hpa/php-apache.yaml
 horizontalpodautoscaler.autoscaling/php-apache created
 ```
 
-{{% /capture %}}
+{{% /capture %}}

content/en/docs/tasks/run-application/horizontal-pod-autoscale.md

@@ -279,4 +279,4 @@ APIs, cluster administrators must ensure that:
 * kubectl autoscale command: [kubectl autoscale](/docs/reference/generated/kubectl/kubectl-commands/#autoscale).
 * Usage example of [Horizontal Pod Autoscaler](/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/).
 
-{{% /capture %}}
+{{% /capture %}}

content/en/docs/tutorials/clusters/apparmor.md

@@ -166,7 +166,18 @@ k8s-apparmor-example-deny-write (enforce)
 First, we need to load the profile we want to use onto our nodes. The profile we'll use simply
 denies all file writes:
 
-{{< code language="text" file="deny-write.profile" >}}
+```shell
+#include <tunables/global>
+
+profile k8s-apparmor-example-deny-write flags=(attach_disconnected) {
+  #include <abstractions/base>
+
+  file,
+
+  # Deny all file writes.
+  deny /** w,
+}
+```
 
 Since we don't know where the Pod will be scheduled, we'll need to load the profile on all our
 nodes. For this example we'll just use SSH to install the profiles, but other approaches are

content/en/docs/tutorials/clusters/deny-write.profile

@@ -1,10 +0,0 @@
-#include <tunables/global>
-
-profile k8s-apparmor-example-deny-write flags=(attach_disconnected) {
-  #include <abstractions/base>
-
-  file,
-
-  # Deny all file writes.
-  deny /** w,
-}

content/ko/docs/setup/_index.md

@@ -1,3 +1,97 @@
+<<<<<<< HEAD
+---
+no_issue: true
+title: 설치
+main_menu: true
+weight: 30
+content_template: templates/concept
+---
+
+{{% capture overview %}}
+
+Use this page to find the type of solution that best fits your needs.
+
+Deciding where to run Kubernetes depends on what resources you have available 
+and how much flexibility you need. You can run Kubernetes almost anywhere, 
+from your laptop to VMs on a cloud provider to a rack of bare metal servers. 
+You can also set up a fully-managed cluster by running a single command or craft 
+your own customized cluster on your bare metal servers.
+
+{{% /capture %}}
+
+{{% capture body %}}
+
+## Local-machine Solutions
+
+A local-machine solution is an easy way to get started with Kubernetes. You
+can create and test Kubernetes clusters without worrying about consuming cloud
+resources and quotas.
+
+You should pick a local solution if you want to:
+
+* Try or start learning about Kubernetes
+* Develop and test clusters locally
+
+Pick a [local-machine solution](/docs/setup/pick-right-solution/#local-machine-solutions).
+
+## Hosted Solutions
+
+Hosted solutions are a convenient way to create and maintain Kubernetes clusters. They 
+manage and operate your clusters so you don’t have to.  
+
+You should pick a hosted solution if you:
+
+* Want a fully-managed solution
+* Want to focus on developing your apps or services  
+* Don’t have dedicated site reliability engineering (SRE) team but want high availability
+* Don't have resources to host and monitor your clusters 
+
+Pick a [hosted solution](/docs/setup/pick-right-solution/#hosted-solutions).
+
+## Turnkey – Cloud Solutions
+
+
+These solutions allow you to create Kubernetes clusters with only a few commands and 
+are actively developed and have active community support. They can also be hosted on 
+a range of Cloud IaaS providers, but they offer more freedom and flexibility in 
+exchange for effort. 
+
+You should pick a turnkey cloud solution if you:
+
+* Want more control over your clusters than the hosted solutions allow
+* Want to take on more operations ownership 
+
+Pick a [turnkey cloud solution](/docs/setup/pick-right-solution/#turnkey-cloud-solutions)
+
+## Turnkey – On-Premises Solutions
+
+These solutions allow you to create Kubernetes clusters on your internal, secure,
+cloud network with only a few commands.
+
+You should pick a on-prem turnkey cloud solution if you:
+
+* Want to deploy clusters on your private cloud network
+* Have a dedicated SRE team
+* Have the the resources to host and monitor your clusters
+
+Pick an [on-prem turnkey cloud solution](/docs/setup/pick-right-solution/#on-premises-turnkey-cloud-solutions).
+
+## Custom Solutions
+
+Custom solutions give you the most freedom over your clusters but require the 
+most expertise. These solutions range from bare-metal to cloud providers on 
+different operating systems.
+
+Pick a [custom solution](/docs/setup/pick-right-solution/#custom-solutions).
+
+{{% /capture %}}
+
+{{% capture whatsnext %}}
+Go to [Picking the Right Solution](/docs/setup/pick-right-solution/) for a complete
+list of solutions.
+{{% /capture %}}
+||||||| merged common ancestors
+=======
 ---
 no_issue: true
 title: 설치
@@ -89,3 +183,4 @@ Pick a [custom solution](/docs/setup/pick-right-solution/#custom-solutions).
 Go to [Picking the Right Solution](/docs/setup/pick-right-solution/) for a complete
 list of solutions.
 {{% /capture %}}
+>>>>>>> master

content/ko/docs/tutorials/kubernetes-basics/_index.html

@@ -1,3 +1,120 @@
+<<<<<<< HEAD
+---
+title: 쿠버네티스 기초 학습
+linkTitle: 쿠버네티스 기초 학습
+weight: 5
+---
+
+<!DOCTYPE html>
+
+<html lang="ko">
+
+<body>
+
+<div class="layout" id="top">
+
+  <main class="content">
+
+    <div class="row">
+      <div class="col-md-9">
+        <h2>쿠버네티스 기초</h2>
+        <p>이 튜토리얼에서는 쿠버네티스 클러스터 오케스트레이션 시스템의 기초를 익힐 수 있는 가이드를 제공한다. 각각의 모듈에는 쿠버네티스의 주요 기능과 개념에 대한 배경 지식이 담겨 있으며 대화형 온라인 튜토리얼도 포함되어 있다. 대화형 튜토리얼에서 간단한 클러스터와 그 클러스터 상의 <a href="/docs/concepts/overview/what-is-kubernetes/#why-containers">컨테이너화된 애플리케이션</a>을 직접 관리해볼 수 있다.</p>
+        <p>대화형 튜토리얼을 사용해서 다음의 내용을 배울 수 있다.</p>
+        <ul>
+        <li>컨테이너화된 애플리케이션을 클러스터에 배포하기</li>
+        <li>디플로이먼트를 스케일링하기</li>
+        <li>컨테이너화된 애플리케이션을 새로운 소프트웨어 버전으로 업데이트하기</li>
+        <li>컨테이너화된 애플리케이션을 디버그하기</li>
+        </ul>
+        <p>이 튜토리얼에서는 Katacoda를 사용해서 독자의 웹브라우저에서 Minikube가 동작하는 가상 터미널을 구동시킨다. Minikube는 로컬에 설치할 수 있는 작은 규모의 쿠버네티스로써 어디에서든 작동된다. 어떤 소프트웨어도 설치할 필요가 없고, 아무 것도 설정할 필요가 없다. 왜냐하면 대화형 튜토리얼이 웹브라우저 자체에서 바로 동작하기 때문이다.</p>
+      </div>
+    </div>
+
+    <br>
+
+    <div class="row">
+      <div class="col-md-9">
+        <h2>쿠버네티스가 어떤 도움이 될까?</h2>
+        <p>오늘날의 웹서비스에 대해서, 사용자는 애플리케이션이 24/7 가용하기를 바라고, 개발자는 하루에도 몇 번이고 새로운 버전의 애플리케이션을 배포하기를 바란다. 컨테이너화를 통해 소프트웨어를 패키지하면 애플리케이션을 다운타임 없이 쉽고 빠르게 릴리스 및 업데이트할 수 있게 되어서 이런 목표를 달성하는데 도움이 된다. 쿠버네티스는 이렇게 컨테이너화된 애플리케이션을 원하는 곳 어디에든 또 언제든 구동시킬 수 있다는 확신을 갖는데 도움을 주며, 그 애플리케이션이 작동하는데 필요한 자원과 도구를 찾는 것을 도와준다. <a href="/docs/concepts/overview/what-is-kubernetes/">쿠버네티스</a>는 구글의 컨테이너 오케스트레이션 부문의 축적된 경험으로 설계되고 커뮤니티로부터 도출된 최고의 아이디어가 결합된 운영 수준의 오픈 소스 플랫폼이다.</p>
+      </div>
+    </div>
+
+    <div id="basics-modules" class="content__modules">
+      <h2>쿠버네티스 기초 모듈</h2>
+      <div class="row">
+        <div class="col-md-12">
+          <div class="row">
+            <div class="col-md-4">
+              <div class="thumbnail">
+                <a href="/docs/tutorials/kubernetes-basics/cluster-intro/"><img src="./public/images/module_01.svg?v=1469803628347" alt=""></a>
+                <div class="caption">
+                  <a href="cluster-intro/"><h5>1. 쿠버네티스 클러스터 생성하기</h5></a>
+                </div>
+              </div>
+            </div>
+            <div class="col-md-4">
+              <div class="thumbnail">
+                <a href="/docs/tutorials/kubernetes-basics/deploy-intro/"><img src="./public/images/module_02.svg?v=1469803628347" alt=""></a>
+                <div class="caption">
+                  <a href="deploy-intro/"><h5>2. 애플리케이션 배포하기</h5></a>
+                </div>
+              </div>
+            </div>
+            <div class="col-md-4">
+              <div class="thumbnail">
+                <a href="/docs/tutorials/kubernetes-basics/explore-intro/"><img src="./public/images/module_03.svg?v=1469803628347" alt=""></a>
+                <div class="caption">
+                  <a href="explore-intro/"><h5>3. 앱 조사하기</h5></a>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="col-md-12">
+          <div class="row">
+            <div class="col-md-4">
+              <div class="thumbnail">
+                <a href="/docs/tutorials/kubernetes-basics/expose-intro/"><img src="./public/images/module_04.svg?v=1469803628347" alt=""></a>
+                <div class="caption">
+                  <a href="expose-intro/"><h5>4. 앱 외부로 노출하기</h5></a>
+                </div>
+              </div>
+            </div>
+            <div class="col-md-4">
+              <div class="thumbnail">
+                <a href="/docs/tutorials/kubernetes-basics/scale-intro/"><img src="./public/images/module_05.svg?v=1469803628347" alt=""></a>
+                <div class="caption">
+                  <a href="scale-intro/"><h5>5. 애플리케이션 스케일링하기</h5></a>
+                </div>
+              </div>
+            </div>
+            <div class="col-md-4">
+              <div class="thumbnail">
+                <a href="/docs/tutorials/kubernetes-basics/update-intro/"><img src="./public/images/module_06.svg?v=1469803628347" alt=""></a>
+                <div class="caption">
+                  <a href="update-intro/"><h5>6. 앱 업데이트하기</h5></a>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-md-12">
+        <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/cluster-intro/" role="button">튜토리얼 시작하기<span class="btn__next">›</span></a>
+      </div>
+    </div>
+
+  </main>
+
+</div>
+
+</body>
+</html>
+||||||| merged common ancestors
+=======
 ---
 title: 쿠버네티스 기초 학습
 linkTitle: 쿠버네티스 기초 학습
@@ -112,3 +229,4 @@ weight: 5
 
 </body>
 </html>
+>>>>>>> master

content/ko/docs/tutorials/kubernetes-basics/create-cluster/cluster-interactive.html

@@ -1,3 +1,47 @@
+<<<<<<< HEAD
+---
+title: 대화형 튜토리얼 - 클러스터 생성하기
+weight: 20
+---
+
+<!DOCTYPE html>
+
+<html lang="ko">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+<link href="/docs/tutorials/kubernetes-basics/public/css/overrides.css" rel="stylesheet">
+<script src="https://katacoda.com/embed.js"></script>
+
+<div class="layout" id="top">
+
+    <main class="content katacoda-content">
+
+        <div class="katacoda">
+            <div class="katacoda__alert">
+                터미널로 상호 작용하기 위해서, 데스크탑/태블릿 버전을 사용해주세요
+            </div>
+            <div class="katacoda__box" id="inline-terminal-1" data-katacoda-id="kubernetes-bootcamp/1"
+                 data-katacoda-color="326de6" data-katacoda-secondary="273d6d" data-katacoda-hideintro="false"
+                 data-katacoda-font="Roboto" data-katacoda-fontheader="Roboto Slab"
+                 data-katacoda-prompt="Kubernetes Bootcamp Terminal" style="height: 600px;"></div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/deploy-intro/" role="button">
+                    모듈 2로 진행하기<span class="btn__next">›</span></a>
+            </div>
+        </div>
+
+    </main>
+
+</div>
+
+</body>
+</html>
+||||||| merged common ancestors
+=======
 ---
 title: 대화형 튜토리얼 - 클러스터 생성하기
 weight: 20
@@ -39,3 +83,4 @@ weight: 20
 
 </body>
 </html>
+>>>>>>> master

content/ko/docs/tutorials/kubernetes-basics/create-cluster/cluster-intro.html

@@ -1,3 +1,138 @@
+<<<<<<< HEAD
+---
+title: Minikube를 사용해서 클러스터 생성하기
+weight: 10
+---
+
+<!DOCTYPE html>
+
+<html lang="ko">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+
+<div class="layout" id="top">
+
+    <main class="content">
+
+        <div class="row">
+
+            <div class="col-md-8">
+                <h3>목표</h3>
+                <ul>
+                    <li>쿠버네티스 클러스터가 무엇인지 배운다.</li>
+                    <li>Minikube가 무엇인지 배운다.</li>
+                    <li>온라인 터미널을 사용해서 쿠버네티스 클러스터를 시작한다.</li>
+                </ul>
+            </div>
+
+            <div class="col-md-8">
+                <h3>쿠버네티스 클러스터</h3>
+                <p>
+                    <b>쿠버네티스는 서로 연결되어서 단일 유닛처럼 동작하는 고가용성의 컴퓨터 클러스터를 상호조정한다.</b>
+                    쿠버네티스의 추상화된 개념을 통해 개별 머신에 얽매이지 않고 컨테이너화된 애플리케이션을 클러스터에
+                    배포할 수 있다. 이렇게 새로운 배포 모델을 활용하려면, 애플리케이션을 개별 호스트에 결합되지 않는
+                    방식으로 패키지할 필요가 있다. 즉, 컨테이너화 해야 한다. 컨테이너화된 애플리케이션은 호스트에
+                    매우 깊이 통합된 패키지로써 특정 머신에 직접 설치되는 예전의 배포 모델보다 유연하고 가용성이 높다.
+                    <b>쿠버네티스는 애플리케이션 컨테이너를 클러스터에 분산시키고 스케줄링하는 일을 보다 효율적으로
+                        자동화한다.</b> 쿠버네티스는 <a href="https://github.com/kubernetes/kubernetes">오픈소스</a>
+                    플랫폼이고 운영 수준의 안정성을 가졌다.
+                </p>
+                <p>쿠버네티스 클러스터는 두 가지 형태의 자원으로 구성된다.
+                <ul>
+                    <li><b>마스터</b>는 클러스터를 상호조정한다</li>
+                    <li><b>노드</b>는 애플리케이션을 구동하는 작업자다</li>
+                </ul>
+                </p>
+            </div>
+
+            <div class="col-md-4">
+                <div class="content__box content__box_lined">
+                    <h3>요약:</h3>
+                    <ul>
+                        <li>쿠버네티스 클러스터</li>
+                        <li>Minikube</li>
+                    </ul>
+                </div>
+                <div class="content__box content__box_fill">
+                    <p><i>
+                        쿠버네티스는 컴퓨터 클러스터에 걸쳐서 애플리케이션 컨테이너의 위치(스케줄링)와 실행을 
+                        오케스트레이션하는 운영 수준의 오픈소스 플랫폼이다.
+                    </i></p>
+                </div>
+            </div>
+        </div>
+        <br>
+
+        <div class="row">
+            <div class="col-md-8">
+                <h2 style="color: #3771e3;">클러스터 다이어그램</h2>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-md-8">
+                <p><img src="/docs/tutorials/kubernetes-basics/public/images/module_01_cluster.svg"></p>
+            </div>
+        </div>
+        <br>
+
+        <div class="row">
+            <div class="col-md-8">
+                <p><b>마스터는 클러스터 관리를 담당한다.</b> 마스터는 애플리케이션을 스케줄링하거나, 애플리케이션의
+                    항상성을 유지하거나, 애플리케이션을 스케일링하고, 새로운 변경사항을 순서대로 반영하는 일과 같은
+                    클러스터 내 모든 활동을 조율한다.</p>
+                <p><b>노드는 쿠버네티스 클러스터 내 워커 머신으로써 동작하는 VM 또는 물리적인 컴퓨터다.</b>
+                    각 노드는 노드를 관리하고 쿠버네티스 마스터와 통신하는 Kubelet이라는 에이전트를 갖는다. 노드는
+                    컨테이너 운영을 담당하는 <a href="https://www.docker.com">Docker</a> 또는
+                    <a href="https://coreos.com/rkt">rkt</a>과 같은 툴도 갖는다. 운영 트래픽을 처리하는 쿠버네티스
+                    클러스터는 최소 세 대의 노드를 가져야한다.</p>
+
+            </div>
+            <div class="col-md-4">
+                <div class="content__box content__box_fill">
+                    <p><i> 마스터는 클러스터를 관리하고 노드는 구동되는 애플리케이션을 수용하는데 사용된다. </i></p>
+                </div>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-md-8">
+                <p>애플리케이션을 쿠버네티스에 배포한다는 것은, 마스터에 애플리케이션 컨테이너를 구동하라고 지시하는
+                    것이다. 마스터는 컨테이너를 클러스터의 어느 노드에 구동시킬지를 스케줄한다. <b>노드는 마스터가
+                        제공하는 쿠버네티스 API를 통해서 마스터와 통신한다.</b> 최종 사용자도 쿠버네티스 API를 직접
+                    사용해서 클러스터와 상호작용할 수 있다.</p>
+
+                <p>쿠버네티스 클러스터는 물리 및 가상 머신 모두에 설치될 수 있다. 쿠버네티스 개발을 시작하려면
+                    <a href="https://github.com/kubernetes/minikube">Minikube</a>를 사용할 수 있다. Minikube는 로컬
+                    머신에 VM을 만들고 하나의 노드로 구성된 간단한 클러스터를 배포하는 가벼운 쿠버네티스 구현체다.
+                    Minikube는 리눅스, 맥, 그리고 윈도우 시스템에서 구동이 가능하다. Minikube CLI는 클러스터에 대해
+                    시작, 중지, 상태 조회 및 삭제 등의 기본적인 부트스트래핑 기능을 제공한다. 하지만, 본 튜토리얼에서는
+                    Minikube가 미리 설치된 채로 제공되는 온라인 터미널을 사용할 것이다.</p>
+
+                <p>이제 쿠버네티스가 무엇인지 알아봤으니, 온라인 튜토리얼로 이동해서 우리의 첫 번째 클러스터를
+                    시작해보자!</p>
+
+            </div>
+        </div>
+        <br>
+
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/cluster-interactive/"
+                   role="button">대화형 튜토리얼 시작하기 <span class="btn__next">›</span></a>
+            </div>
+        </div>
+
+    </main>
+
+</div>
+
+</body>
+</html>
+||||||| merged common ancestors
+=======
 ---
 title: Minikube를 사용해서 클러스터 생성하기
 weight: 10
@@ -130,3 +265,4 @@ weight: 10
 
 </body>
 </html>
+>>>>>>> master

content/ko/docs/tutorials/kubernetes-basics/deploy-app/deploy-interactive.html

@@ -1,3 +1,51 @@
+<<<<<<< HEAD
+---
+title: 대화형 튜토리얼 - 앱 배포하기
+weight: 20
+---
+
+<!DOCTYPE html>
+
+<html lang="ko">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+<link href="/docs/tutorials/kubernetes-basics/public/css/overrides.css" rel="stylesheet">
+<script src="https://katacoda.com/embed.js"></script>
+
+<div class="layout" id="top">
+
+    <main class="content katacoda-content">
+
+        <br>
+        <div class="katacoda">
+            <div class="katacoda__alert">
+                터미널로 상호 작용하기 위해서, 데스크탑/태블릿 버전을 사용해주세요
+            </div>
+
+            <div class="katacoda__box" id="inline-terminal-1" data-katacoda-id="kubernetes-bootcamp/7"
+                 data-katacoda-color="326de6" data-katacoda-secondary="273d6d" data-katacoda-hideintro="false"
+                 data-katacoda-font="Roboto" data-katacoda-fontheader="Roboto Slab"
+                 data-katacoda-prompt="Kubernetes Bootcamp Terminal" style="height: 600px;">
+            </div>
+
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/explore-intro/" role="button">
+                    모듈 3으로 진행하기<span class="btn__next">›</span></a>
+            </div>
+        </div>
+
+    </main>
+
+</div>
+
+</body>
+</html>
+||||||| merged common ancestors
+=======
 ---
 title: 대화형 튜토리얼 - 앱 배포하기
 weight: 20
@@ -43,3 +91,4 @@ weight: 20
 
 </body>
 </html>
+>>>>>>> master

content/ko/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html

@@ -1,3 +1,135 @@
+<<<<<<< HEAD
+---
+title: kubectl을 사용해서 디플로이먼트 생성하기
+weight: 10
+---
+
+<!DOCTYPE html>
+
+<html lang="ko">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+
+<div class="layout" id="top">
+
+    <main class="content">
+
+        <div class="row">
+
+            <div class="col-md-8">
+                <h3>목표</h3>
+                <ul>
+                    <li>애플리케이션 디플로이먼트(Deployment)에 대해 배운다.</li>
+                    <li>kubectl로 첫 애플리케이션을 쿠버네티스에 배포한다.</li>
+                </ul>
+            </div>
+
+            <div class="col-md-8">
+                <h3>쿠버네티스 디플로이먼트</h3>
+                <p>
+                    일단 쿠버네티스 클러스터를 구동시키면, 그 위에 컨테이너화된 애플리케이션을 배포할 수 있다.
+                    그러기 위해서, 쿠버네티스 <b>디플로이먼트</b> 설정을 만들어야 한다. 디플로이먼트는 쿠버네티스가
+                    애플리케이션의 인스턴스를 어떻게 생성하고 업데이트해야 하는지를 지시한다. 디플로이먼트가 만들어지면,
+                    쿠버네티스 마스터가 해당 애플리케이션 인스턴스를 클러스터의 개별 노드에 스케줄한다.
+                </p>
+
+                <p>애플리케이션 인스턴스가 생성되면, 쿠버네티스 디플로이먼트 컨트롤러는 지속적으로 이들 인스턴스를
+                    모니터링한다. 인스턴스를 구동 중인 노드가 다운되거나 삭제되면, 디플로이먼트 컨트롤러가 인스턴스를
+                    교체시켜준다. <b>이렇게 머신의 장애나 정비에 대응할 수 있는 자동 복구(self-healing) 메커니즘을
+                        제공한다.</b></p>
+
+                <p>오케스트레이션 기능이 없던 환경에서는, 설치 스크립트가 애플리케이션을 시작하는데 종종 사용되곤
+                    했지만, 머신의 장애가 발생한 경우 복구를 해주지는 않았다. 쿠버네티스 디플로이먼트는 애플리케이션
+                    인스턴스를 생성해주고 여러 노드에 걸쳐서 지속적으로 인스턴스가 구동되도록 하는 두 가지를 모두
+                    하기 때문에 애플리케이션 관리를 위한 접근법에서 근본적인 차이를 가져다준다.</p>
+
+            </div>
+
+            <div class="col-md-4">
+                <div class="content__box content__box_lined">
+                    <h3>요약:</h3>
+                    <ul>
+                        <li>디플로이먼트</li>
+                        <li>Kubectl</li>
+                    </ul>
+                </div>
+                <div class="content__box content__box_fill">
+                    <p><i>
+                        디플로이먼트는 애플리케이션 인스턴스를 생성하고 업데이트하는 역할을 담당한다.
+                    </i></p>
+                </div>
+            </div>
+        </div>
+        <br>
+
+        <div class="row">
+            <div class="col-md-8">
+                <h2 style="color: #3771e3;">쿠버네티스에 첫 번째 애플리케이션 배포하기</h2>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-md-8">
+                <p><img src="/docs/tutorials/kubernetes-basics/public/images/module_02_first_app.svg"></p>
+            </div>
+        </div>
+        <br>
+
+        <div class="row">
+            <div class="col-md-8">
+
+                <p><b>Kubectl</b>이라는 쿠버네티스 CLI를 통해 디플로이먼트를 생성하고 관리할 수 있다.
+                    Kubectl은 클러스터와 상호 작용하기 위해 쿠버네티스 API를 사용한다. 이 모듈에서는, 쿠버네티스
+                    클러스터 상에 애플리케이션을 구동시키는 디플로이먼트를 생성하기 위해 필요한 가장 일반적인 Kubectl
+                    명령어를 배우게 된다.</p>
+
+                <p>디플로이먼트를 생성할 때, 애플리케이션에 대한 컨테이너 이미지와 구동시키고자 하는 복제 수를 지정해야
+                    한다. 디플로이먼트를 업데이트해서 이런 정보를 나중에 변경할 수 있다. 모듈
+                    <a href="/docs/tutorials/kubernetes-basics/scale-intro/">5</a>와 <a
+                            href="/docs/tutorials/kubernetes-basics/update-intro/">6</a>의 부트캠프에서 어떻게
+                    스케일하고 업데이트하는지에 대해 다룬다.</p>
+
+
+            </div>
+            <div class="col-md-4">
+                <div class="content__box content__box_fill">
+                    <p><i> 애플리케이션이 쿠버네티스 상에 배포되려면 지원되는 컨테이너 형식 중 하나로 패키지 되어야한다.
+                    </i></p>
+                </div>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-md-8">
+
+                <p>우리의 첫 번째 디플로이먼트로, Docker 컨테이너로 패키지된 <a href="https://nodejs.org">Node.js</a>
+                    애플리케이션을 사용해보자. 소스 코드와 Dockerfile은 <a
+                            href="https://github.com/kubernetes/website/tree/master/content/en/docs/tutorials">GitHub
+                        저장소</a>에서 찾을 수 있다.</p>
+
+                <p>이제 디플로이먼트를 이해했으니, 온라인 튜토리얼을 통해 우리의 첫 번째 애플리케이션을 배포해보자!</p>
+
+            </div>
+        </div>
+        <br>
+
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/deploy-interactive/"
+                   role="button">대화형 튜토리얼 시작하기 <span class="btn__next">›</span></a>
+            </div>
+        </div>
+
+    </main>
+
+</div>
+
+</body>
+</html>
+||||||| merged common ancestors
+=======
 ---
 title: kubectl을 사용해서 디플로이먼트 생성하기
 weight: 10
@@ -127,3 +259,4 @@ weight: 10
 
 </body>
 </html>
+>>>>>>> master

content/ko/docs/tutorials/kubernetes-basics/explore/explore-interactive.html

@@ -1,3 +1,51 @@
+<<<<<<< HEAD
+---
+title: 대화형 튜토리얼 - 앱 조사하기
+weight: 20
+---
+
+<!DOCTYPE html>
+
+<html lang="ko">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+<link href="/docs/tutorials/kubernetes-basics/public/css/overrides.css" rel="stylesheet">
+<script src="https://katacoda.com/embed.js"></script>
+
+<div class="layout" id="top">
+
+    <main class="content katacoda-content">
+
+        <br>
+        <div class="katacoda">
+
+            <div class="katacoda__alert">
+                터미널과 상호작용하기 위해, 데스크탑/태블릿 버전을 이용한다.
+            </div>
+
+            <div class="katacoda__box" id="inline-terminal-1" data-katacoda-id="kubernetes-bootcamp/4"
+                 data-katacoda-color="326de6" data-katacoda-secondary="273d6d" data-katacoda-hideintro="false"
+                 data-katacoda-font="Roboto" data-katacoda-fontheader="Roboto Slab"
+                 data-katacoda-prompt="Kubernetes Bootcamp Terminal" style="height: 600px;">
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/expose-intro/" role="button">모듈 4로
+                    진행하기<span class="btn__next">›</span></a>
+            </div>
+        </div>
+
+    </main>
+
+</div>
+
+</body>
+</html>
+||||||| merged common ancestors
+=======
 ---
 title: 대화형 튜토리얼 - 앱 조사하기
 weight: 20
@@ -43,3 +91,4 @@ weight: 20
 
 </body>
 </html>
+>>>>>>> master

content/ko/docs/tutorials/kubernetes-basics/explore/explore-intro.html

@@ -1,3 +1,149 @@
+<<<<<<< HEAD
+---
+title: 파드와 노드 보기
+weight: 10
+---
+
+<!DOCTYPE html>
+
+<html lang="ko">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+
+
+<div class="layout" id="top">
+
+    <main class="content">
+
+        <div class="row">
+
+     <div class="col-md-8">
+          <h3>목표</h3>
+                <ul>
+                    <li>쿠버네티스 파드에 대해 배운다.</li>
+                    <li>쿠버네티스 노드에 대해 배운다.</li>
+                    <li>배포된 애플리케이션의 문제를 해결한다.</li>
+                </ul>
+            </div>
+
+            <div class="col-md-8">
+                <h2>쿠버네티스 파드</h2>
+                <p>모듈 <a href="/docs/tutorials/kubernetes-basics/deploy-intro/">2</a>에서 배포를 생성했을 때, 쿠버네티스는 여러분의 애플리케이션 인스턴스에 <b>파드</b>를 생성했다. 파드는 하나 또는 그 이상의 애플리케이션 컨테이너 (도커 또는 rkt와 같은)들의 그룹을 나타내는 쿠버네티스의 추상적 개념으로 일부는 컨테이너에 대한 자원을 공유한다. 그 자원은 다음을 포함한다:</p>
+                <ul>
+                    <li>볼륨과 같은, 공유 스토리지</li>
+                    <li>클러스터 IP 주소와 같은, 네트워킹</li>
+                    <li>컨테이너 이미지 버전 또는 사용할 특정 포트와 같이, 각 컨테이너가 동작하는 방식에 대한 정보</li>
+                </ul>
+                <p>파드는 특유한 "로컬호스트" 애플리케이션 모형을 만들어. 상대적으로 밀접하게 결합되어진 상이한 애플리케이션 컨테이너들을 수용할 수 있다. 가령, 파드는 Node.js 앱과 더불어 Node.js 웹서버에 의해 발행되는 데이터를 공급하는 상이한 컨테이너를 함께 수용할 수 있다. 파드 내 컨테이너는 IP 주소, 그리고 포트 스페이스를 공유하고 항상 함께 위치하고 함께 스케쥴링 되고 동일 노드 상의 컨텍스트를 공유하면서 동작한다.</p>
+
+            <p>파드는 쿠버네티스 플랫폼 상에서 최소 단위가 된다. 우리가 쿠버네티스에서 배포를 생성할 때, 그 배포는 컨테이너 내부에서 컨테이너와 함께 파드를 생성한다. 각 파드는 스케쥴 되어진 노드에게 묶여지게 된다. 그리고 (재구동 정책에 따라) 소멸되거나 삭제되기 전까지 그 노드에 유지된다. 노드에 실패가 발생할 경우, 클러스터 내에 가용한 다른 노드들을 대상으로 스케쥴되어진다.</p>
+
+            </div>
+            <div class="col-md-4">
+                <div class="content__box content__box_lined">
+                    <h3>요약:</h3>
+                    <ul>
+                        <li>파드</li>
+                        <li>노드</li>
+                        <li>Kubectl 주요 명령어</li>
+                    </ul>
+                </div>
+                <div class="content__box content__box_fill">
+                        <p><i>
+                          파드는 하나 또는 그 이상의 애플리케이션 컨테이너 (도커 또는 rkt와 같은)들의 그룹이고 공유 스토리지 (볼륨), IP 주소 그리고 그것을 동작시키는 방식에 대한 정보를 포함하고 있다.
+                        </i></p>
+                </div>
+            </div>
+        </div>
+        <br>
+
+        <div class="row">
+            <div class="col-md-8">
+                <h2 style="color: #3771e3;">파드 개요</h2>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-md-8">
+                <p><img src="/docs/tutorials/kubernetes-basics/public/images/module_03_pods.svg"></p>
+            </div>
+        </div>
+        <br>
+
+        <div class="row">
+            <div class="col-md-8">
+                <h2>노드</h2>
+                <p>파드는 언제나 <b>노드</b> 상에서 동작한다. 노드는 쿠버네티스에서 워커 머신을 말하며 클러스터에 따라 가상 또는 물리 머신일 수 있다. 각 노드는 마스터에 의해 관리된다. 하나의 노드는 여러 개의 파드를 가질 수 있고, 쿠버네티스 마스터는 클러스터 내 노드를 통해서 파드에 대한 스케쥴링을 자동으로 처리한다.</p>
+
+                <p>모든 쿠버네티스 노드는 최소한 다음과 같이 동작한다.</p>
+                <ul>
+                    <li>Kubelet은, 쿠버네티스 마스터와 노드 간 통신을 책임지는 프로세스이며, 하나의 머신 상에서 동작하는 파드와 컨테이너를 관리한다.</li>
+                    <li>(도커, rkt)와 같은 컨테이너 런타임은 레지스트리에서 컨테이너 이미지를 가져와 묶여 있는 것을 풀고 애플리케이션을 동작시키는 책임을 맡는다. </li>
+                </ul>
+
+            </div>
+            <div class="col-md-4">
+                <div class="content__box content__box_fill">
+                    <p><i> 만약 컨테이너들이 밀접하고 결합되어 있고 디스크와 같은 자원을 공유해야 한다면 오직 하나의 단일 파드에 함께 스케쥴되어져야 한다. </i></p>
+                </div>
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row">
+            <div class="col-md-8">
+                <h2 style="color: #3771e3;">노드 개요</h2>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-md-8">
+                <p><img src="/docs/tutorials/kubernetes-basics/public/images/module_03_nodes.svg"></p>
+            </div>
+        </div>
+        <br>
+
+        <div class="row">
+            <div class="col-md-8">
+                <h2>kubectl로 문제해결하기</h2>
+                <p>모듈 <a href="/docs/tutorials/kubernetes-basics/deploy-intro/">2</a>에서, 여러분은 Kubectl 커맨드-라인 인터페이스를 사용하였다. 여러분은 배포된 애플리케이션과 그 환경에 대한 정보를 얻기 위해 모듈 3에서도 계속 그것을 사용하게 될 것이다. 가장 보편적인 운용업무는 다음 kubectl 명령어를 이용해 처리될 수 있다:</p>
+                <ul>
+                    <li><b>kubectl get</b> - 자원을 나열한다</li>
+                    <li><b>kubectl describe</b> - 자원에 대해 상세한 정보를 보여준다.</li>
+                    <li><b>kubectl logs</b> - 파드 내 컨테이너의 로그들을 출력한다</li>
+                    <li><b>kubectl exec</b> - 파드 내 컨테이너에 대한 명령을 실행한다.</li>
+                </ul>
+
+                <p>언제 애플리케이션이 배포되었으며, 현재 상태가 어떠한지, 그것의 구성은 어떠한지 등을 보기 위해 이러한 명령을 이용할 수 있다.</p>
+
+                <p>이제 클러스터 컴포넌트와 커맨드 라인에 대해 알아 보았으니, 애플리케이션을 조사해 보자.</p>
+
+            </div>
+            <div class="col-md-4">
+                <div class="content__box content__box_fill">
+                    <p><i> 노드는 쿠버네티스에 있어서 워커 머신이며 클러스터에 따라 VM 또는 물리 머신이 될 수 있다. 여러개의 파드는 하나의 노드 위에서 동작할 수 있다.</i></p>
+                </div>
+            </div>
+        </div>
+        <br>
+
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/explore-interactive/" role="button">대화형 튜토리얼 시작하기 <span class="btn__next">›</span></a>
+            </div>
+        </div>
+
+    </main>
+
+</div>
+
+</body>
+</html>
+||||||| merged common ancestors
+=======
 ---
 title: 파드와 노드 보기
 weight: 10
@@ -141,3 +287,4 @@ weight: 10
 
 </body>
 </html>
+>>>>>>> master

content/ko/docs/tutorials/kubernetes-basics/expose/expose-interactive.html

@@ -1,3 +1,44 @@
+<<<<<<< HEAD
+---
+title: 대화형 튜토리얼 - 앱 노출하기
+weight: 20
+---
+
+<!DOCTYPE html>
+
+<html lang="ko">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+<link href="/docs/tutorials/kubernetes-basics/public/css/overrides.css" rel="stylesheet">
+<script src="https://katacoda.com/embed.js"></script>
+
+<div class="layout" id="top">
+
+    <main class="content katacoda-content">
+
+        <div class="katacoda">
+            <div class="katacoda__alert">
+                터미널과 상호작용하기 위해, 데스크탑/태블릿 버전을 이용한다.
+            </div>
+            <div class="katacoda__box" id="inline-terminal-1"  data-katacoda-id="kubernetes-bootcamp/8" data-katacoda-color="326de6" data-katacoda-secondary="273d6d" data-katacoda-hideintro="false" data-katacoda-font="Roboto" data-katacoda-fontheader="Roboto Slab" data-katacoda-prompt="Kubernetes Bootcamp Terminal" style="height: 600px;">
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/scale-intro/" role="button">모듈 5로 진행하기<span class="btn__next">›</span></a>
+            </div>
+        </div>
+
+    </main>
+
+</div>
+
+</body>
+</html>
+||||||| merged common ancestors
+=======
 ---
 title: 대화형 튜토리얼 - 앱 노출하기
 weight: 20
@@ -36,3 +77,4 @@ weight: 20
 
 </body>
 </html>
+>>>>>>> master

content/ko/docs/tutorials/kubernetes-basics/expose/expose-intro.html

@@ -1,3 +1,120 @@
+<<<<<<< HEAD
+---
+title: 앱 노출을 위해 서비스 이용하기
+weight: 10
+---
+
+<!DOCTYPE html>
+
+<html lang="ko">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+
+<div class="layout" id="top">
+
+	<main class="content">
+
+		<div class="row">
+			<div class="col-md-8">
+    		<h3>목표</h3>
+				<ul>
+					<li>쿠버네티스의 서비스에 대해 배운다.</li>
+					<li>레이블과 레이블셀랙터 오브젝트가 어떻게 서비스와 연관되는지 이해한다.</li>
+					<li>서비스를 이용하여 쿠버네티스 클러스터 외부로 애플리케이션을 노출한다.</li>
+				</ul>
+			</div>
+
+			<div class="col-md-8">
+			<h3>쿠버네티스 서비스들에 대한 개요</h3>
+
+			<p>쿠버네티스 <a href="/docs/concepts/workloads/pods/pod-overview/">파드들</a> 은 언젠가는 죽게된다. 실제 파드들은  <a href="/docs/concepts/workloads/pods/pod-lifecycle/">생명주기</a>를 갖는다. 워커 노드가 죽으면, 노드 상에서 동작하는 파드들 또한 종료된다. <a href="/docs/user-guide/replication-controller/#what-is-a-replicationcontroller">레플리케이션 컨트롤러</a>는 여러분의 애플리케이션이 지속적으로 동작할 수 있도록 새로운 파드들의 생성을 통해 동적으로 클러스터를 미리 지정해 둔 상태로 되돌려 줄 수도 있다. 또 다른 예시로서, 3개의 복제본을 갖는 이미지 처리용 백엔드를 고려해 보자. 그 복제본들은 대체 가능한 상태이다. 그래서 프론트엔드 시스템은 하나의 파드가 소멸되어 재생성이 되더라도, 백엔드 복제본들에 의한 영향을 받아서는 안된다. 즉, 동일 노드 상의 파드들이라 할지라도, 쿠버네티스 클러스터 내 각 파드는 유일한 IP 주소를 가지며, 여러분의 애플리케이션들이 지속적으로 기능할 수 있도록 파드들 속에서 발생하는 변화에 대해 자동으로 조정해 줄 방법이 있어야 한다.</p>
+
+			<p>쿠버네티스에서 서비스는 하나의 논리적인 파드 셋과 그 파드들에 접근할 수 있는 정책을 정의하는 추상적 개념이다. 서비스는 종속적인 파드들 사이를 느슨하게 결합되도록 해준다. 서비스는 모든 쿠버네티스 오브젝트들과 같이 YAML <a href="/docs/concepts/configuration/overview/#general-config-tips">(보다 선호하는)</a> 또는 JSON을 이용하여 정의된다. 서비스가 대상으로 하는 파드 셋은 보통 <i>LabelSelector</i>에 의해 결정된다 (여러분이 왜 스펙에 <code>selector</code>가 포함되지 않은 서비스를 필요로 하게 될 수도 있는지에 대해 아래에서 확인해 보자).</p>
+
+			<p>비록 각 파드들이 고유의 IP를 갖고 있기는 하지만, 그 IP들은 서비스의 도움없이 클러스터 외부로 노출되어질 수 없다. 서비스들은 여러분의 애플리케이션들에게 트래픽이 실릴 수 있도록 허용해준다. 서비스들은 ServiceSpec에서 <code>type</code>을 지정함으로써 다양한 방식들로 노출시킬 수 있다:</p>
+			<ul>
+				<li><i>ClusterIP</i> (기본값) - 클러스터 내에서 내부 IP 에 대해 서비스를 노출해준다. 이 방식은 오직 클러스터 내에서만 서비스가 접근될 수 있도록 해준다.</li>
+				<li><i>NodePort</i> - NAT가 이용되는 클러스터 내에서 각각 선택된 노드들의 동일한 포트에 서비스를 노출시켜준다. <code>&lt;NodeIP&gt;:&lt;NodePort&gt;</code>를 이용하여 클러스터 외부로부터 서비스가 접근할 수 있도록 해준다. CluserIP의 상위 집합이다.</li>
+				<li><i>LoadBalancer</i> - (지원 가능한 경우) 기존 클라우드에서 외부용 로드밸런서를 생성하고 서비스에 고정된 공인 IP를 할당해준다. NodePort의 상위 집합이다. </li>
+				<li><i>ExternalName</i> - 이름으로 CNAME 레코드를 반환함으로써 임의의 이름(스펙에서 <code>externalName</code>으로 명시)을 이용하여 서비스를 노출시켜준다. 프록시는 사용되지 않는다. 이 방식은 <code>kube-dns</code> 버전 1.7 이상에서 지원 가능하다.</li>
+			</ul>
+			<p>다른 서비스 타입들에 대한 추가 정보는 <a href="/docs/tutorials/services/source-ip/">소스 IP 이용하기</a>  튜토리얼에서 확인 가능하다. 또한 <a href="/docs/concepts/services-networking/connect-applications-service">서비스들로 애플리케이션에 접속하기</a>도 참고해 보자.</p>
+			<p>부가적으로, spec에 <code>selector</code>를 정의하지 않고 말아넣은 서비스들의 몇 가지 유즈케이스들이 있음을 주의하자. <code>selector</code> 없이 생성된 서비스는 상응하는 엔드포인트 오브젝트들 또한 생성하지 않는다. 이로써 사용자들로 하여금 하나의 서비스를 특정한 엔드포인트에 매핑 시킬수 있도록 해준다. selector를 생략하게 되는 또 다른 가능성은 여러분이 <code>type: ExternalName</code>을 이용하겠다고 확고하게 의도하는 경우이다.</p>
+			</div>
+			<div class="col-md-4">
+				<div class="content__box content__box_lined">
+					<h3>요약</h3>
+					<ul>
+						<li>파드들을 외부 트래픽에 노출하기</li>
+						<li>여러 파드에 걸쳐서 트래픽 로드밸런싱 하기</li>
+						<li>레이블 사용하기</li>
+					</ul>
+				</div>
+				<div class="content__box content__box_fill">
+						<p><i>쿠버네티스 서비스는 논리적 파드 셋을 정의하고 외부 트래픽 노출, 로드밸런싱 그리고 그 파드들에 대한 서비스 디스커버리를 가능하게 해주는 추상 계층이다.</i></p>
+				</div>
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+				<h3>서비스와 레이블</h3>
+			</div>
+		</div>
+
+		<div class="row">
+			<div class="col-md-8">
+				<p><img src="/docs/tutorials/kubernetes-basics/public/images/module_04_services.svg" width="150%" height="150%"></p>
+			</div>
+		</div>
+
+		<div class="row">
+			<div class="col-md-8">
+				<p>서비스는 파드 셋에 걸쳐서 트래픽을 라우트한다. 여러분의 애플리케이션에 영향을 주지 않으면서 쿠버네티스에서 파드들이 죽게도 하고, 복제가 되게도 해주는 추상적 개념이다. 종속적인 파드들 사이에서의 디스커버리와 라우팅은 (하나의 애플리케이션에서 프로트엔드와 백엔드 컴포넌트와 같은) 쿠버네티스 서비스들에 의해 처리된다.</p>
+				<p>서비스는 쿠버네티스의 객체들에 대해 논리 연산을 허용해주는 기본 그룹핑 단위인, <a href="/docs/concepts/overview/working-with-objects/labels">레이블과 셀렉터</a>를 이용하여 파드 셋과 매치시킨다. 레이블은 오브젝트들에 붙여진 키/밸류 쌍으로 다양한 방식으로 이용 가능하다:</p>
+				<ul>
+					<li>개발, 테스트, 그리고 상용환경에 대한 객체들의 지정</li>
+					<li>임베디드된 버전 태그들</li>
+					<li>태그들을 이용하는 객체들에 대한 분류</li>
+				</ul>
+
+			</div>
+			<div class="col-md-4">
+				<div class="content__box content__box_fill">
+					<p><i>여러분은 kubectl 명령에<br><code>--expose</code> 옵션을 사용함으로써 디플로이먼트 생성과 동일 시점에 서비스를 생성할 수 있다.</i></p>
+				</div>
+			</div>
+		</div>
+
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+				<p><img src="/docs/tutorials/kubernetes-basics/public/images/module_04_labels.svg"></p>
+			</div>
+		</div>
+		<br>
+		<div class="row">
+			<div class="col-md-8">
+				<p>레이블은 오브젝트의 생성 시점 또는 이후 시점에 붙여질 수 있다. 언제든지 수정이 가능하다. 이제 서비스를 이용하여 우리의 애플리케이션을 노출도 시켜보고 레이블도 적용해 보자.</p>
+			</div>
+		</div>
+		<br>
+		<div class="row">
+			<div class="col-md-12">
+				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/expose-interactive/" role="button">대화형 튜토리얼 시작<span class="btn__next">›</span></a>
+			</div>
+		</div>
+	</main>
+</div>
+
+</body>
+</html>
+||||||| merged common ancestors
+=======
 ---
 title: 앱 노출을 위해 서비스 이용하기
 weight: 10
@@ -112,3 +229,4 @@ weight: 10
 
 </body>
 </html>
+>>>>>>> master

content/ko/docs/tutorials/kubernetes-basics/scale/scale-interactive.html

@@ -1,3 +1,50 @@
+<<<<<<< HEAD
+---
+title: 대화형 튜토리얼 - 앱 스케일링하기
+weight: 20
+---
+
+<!DOCTYPE html>
+
+<html lang="ko">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+<link href="/docs/tutorials/kubernetes-basics/public/css/overrides.css" rel="stylesheet">
+<script src="https://katacoda.com/embed.js"></script>
+
+<div class="layout" id="top">
+
+    <main class="content katacoda-content">
+
+        <div class="katacoda">
+            <div class="katacoda__alert">
+                터미널로 상호 작용하기 위해서, 데스크탑/태블릿 버전을 사용해주세요
+            </div>
+            <div class="katacoda__box" id="inline-terminal-1" data-katacoda-id="kubernetes-bootcamp/5"
+                 data-katacoda-color="326de6" data-katacoda-secondary="273d6d" data-katacoda-hideintro="false"
+                 data-katacoda-font="Roboto" data-katacoda-fontheader="Roboto Slab"
+                 data-katacoda-prompt="Kubernetes Bootcamp Terminal" style="height: 600px;">
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/update-intro/" role="button">
+                    모듈 6으로 진행하기<span class="btn__next">›</span></a>
+            </div>
+        </div>
+
+    </main>
+
+    <a class="scrolltop" href="#top"></a>
+
+</div>
+
+</body>
+</html>
+||||||| merged common ancestors
+=======
 ---
 title: 대화형 튜토리얼 - 앱 스케일링하기
 weight: 20
@@ -42,3 +89,4 @@ weight: 20
 
 </body>
 </html>
+>>>>>>> master

content/ko/docs/tutorials/kubernetes-basics/scale/scale-intro.html

@@ -1,3 +1,142 @@
+<<<<<<< HEAD
+---
+title: 복수의 앱 인스턴스를 구동하기
+weight: 10
+---
+
+<!DOCTYPE html>
+
+<html lang="ko">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+
+<div class="layout" id="top">
+
+    <main class="content">
+
+        <div class="row">
+
+            <div class="col-md-8">
+                <h3>목표</h3>
+                <ul>
+                    <li>kubectl을 사용해서 애플리케이션을 스케일한다.</li>
+                </ul>
+            </div>
+
+            <div class="col-md-8">
+                <h3>애플리케이션을 스케일하기</h3>
+
+                <p>지난 모듈에서 <a
+                        href="https://kubernetes.io/docs/concepts/workloads/controllers/deployment/"> 디플로이먼트</a>,
+                    를 만들고 <a href="https://kubernetes.io/docs/concepts/services-networking/service/">서비스</a>를
+                    통해서 디플로이먼트를 외부에 노출시켜 봤다. 해당 디플로이먼트는 애플리케이션을 구동하기 위해 단
+                    하나의 파드(Pod)만을 생성했었다. 트래픽이 증가하면, 사용자 요청에 맞추어 애플리케이션의 규모를
+                    조정할 필요가 있다.</p>
+
+                <p>디플로이먼트의 복제 수를 변경하면 <b>스케일링</b>이 수행된다</p>
+
+            </div>
+            <div class="col-md-4">
+                <div class="content__box content__box_lined">
+                    <h3>요약:</h3>
+                    <ul>
+                        <li>디플로이먼트 스케일링하기</li>
+                    </ul>
+                </div>
+                <div class="content__box content__box_fill">
+                    <p><i> kubectl run 명령에 --replicas 파라미터를 사용해서 처음부터 복수의 인스턴스로 구동되는
+                        디플로이먼트를 만들 수도 있다 </i></p>
+                </div>
+            </div>
+        </div>
+        <br>
+
+        <div class="row">
+            <div class="col-md-8">
+                <h2 style="color: #3771e3;">스케일링 개요</h2>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-md-1"></div>
+            <div class="col-md-8">
+                <div id="myCarousel" class="carousel" data-ride="carousel" data-interval="3000">
+                    <ol class="carousel-indicators">
+                        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+                        <li data-target="#myCarousel" data-slide-to="1"></li>
+                    </ol>
+                    <div class="carousel-inner" role="listbox">
+                        <div class="item active">
+                            <img src="/docs/tutorials/kubernetes-basics/public/images/module_05_scaling1.svg">
+                        </div>
+
+                        <div class="item">
+                            <img src="/docs/tutorials/kubernetes-basics/public/images/module_05_scaling2.svg">
+                        </div>
+                    </div>
+
+                    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+                        <span class="sr-only ">이전</span>
+                    </a>
+                    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+                        <span class="sr-only">다음</span>
+                    </a>
+
+                </div>
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row">
+            <div class="col-md-8">
+
+                <p>디플로이먼트를 스케일 아웃하면 신규 파드가 생성되어서 가용한 자원이 있는 노드에 스케줄된다.
+                    스케일링 기능은 새로 의도한 상태(desired state)까지 파드의 수를 늘린다. 쿠버네티스는
+                    파드의 <a href="http://kubernetes.io/docs/user-guide/horizontal-pod-autoscaling/">오토스케일링</a>
+                    도 지원하지만 본 튜토리얼에서는 다루지 않는다. 0까지 스케일링하는 것도 가능하다. 이 경우 해당
+                    디플로이먼트의 모든 파드가 종료된다.</p>
+
+                <p>애플리케이션의 인스턴스를 복수로 구동하게 되면 트래픽을 해당 인스턴스 모두에 분산시킬 방법이
+                    필요해진다. 서비스는 노출된 디플로이먼트의 모든 파드에 네트워크 트래픽을 분산시켜줄 통합된
+                    로드밸런서를 갖는다. 서비스는 엔드포인트를 이용해서 구동중인 파드를 지속적으로 모니터링함으로써
+                    가용한 파드에만 트래픽이 전달되도록 해준다.</p>
+
+            </div>
+            <div class="col-md-4">
+                <div class="content__box content__box_fill">
+                    <p><i>디플로이먼트의 복제 수를 변경하면 스케일링이 수행된다.</i></p>
+                </div>
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row">
+            <div class="col-md-8">
+                <p> 일단 복수의 애플리케이션의 인스턴스가 구동 중이면, 다운타임 없이 롤링 업데이트를 할 수 있다.
+                    다음 모듈에서 이 내용을 다루도록 하겠다. 이제 온라인 터미널로 가서 애플리케이션을 스케일해보자.</p>
+            </div>
+        </div>
+        <br>
+
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/scale-interactive/"
+                   role="button">대화형 튜토리얼 시작하기 <span class="btn__next">›</span></a>
+            </div>
+        </div>
+
+    </main>
+
+</div>
+
+</body>
+</html>
+||||||| merged common ancestors
+=======
 ---
 title: 복수의 앱 인스턴스를 구동하기
 weight: 10
@@ -134,3 +273,4 @@ weight: 10
 
 </body>
 </html>
+>>>>>>> master

content/ko/docs/tutorials/kubernetes-basics/update/update-interactive.html

@@ -1,3 +1,43 @@
+<<<<<<< HEAD
+---
+title: 대화형 튜토리얼 - 앱 업데이트 하기
+weight: 20
+---
+
+<!DOCTYPE html>
+
+<html lang="ko">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+<link href="/docs/tutorials/kubernetes-basics/public/css/overrides.css" rel="stylesheet">
+<script src="https://katacoda.com/embed.js"></script>
+
+<div class="layout" id="top">
+
+    <main class="content katacoda-content">
+
+        <div class="katacoda">
+            <div class="katacoda__alert">
+                터미널과 상호작용하기 위해, 데스크탑/태블릿 버전을 이용한다.
+            </div>
+            <div class="katacoda__box" id="inline-terminal-1"  data-katacoda-id="kubernetes-bootcamp/6" data-katacoda-color="326de6" data-katacoda-secondary="273d6d" data-katacoda-hideintro="false" data-katacoda-font="Roboto" data-katacoda-fontheader="Roboto Slab" data-katacoda-prompt="Kubernetes Bootcamp Terminal" style="height: 600px;">
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/" role="button">쿠버네티스 기초로 돌아가기<span class="btn__next">›</span></a>
+            </div>
+        </div>
+    </main>
+
+</div>
+
+</body>
+</html>
+||||||| merged common ancestors
+=======
 ---
 title: 대화형 튜토리얼 - 앱 업데이트 하기
 weight: 20
@@ -35,3 +75,4 @@ weight: 20
 
 </body>
 </html>
+>>>>>>> master

content/ko/docs/tutorials/kubernetes-basics/update/update-intro.html

@@ -1,3 +1,147 @@
+<<<<<<< HEAD
+---
+title: 롤링 업데이트 수행하기
+weight: 10
+---
+
+<!DOCTYPE html>
+
+<html lang="ko">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+
+<div class="layout" id="top">
+
+    <main class="content">
+
+        <div class="row">
+
+            <div class="col-md-8">
+                <h3>목표</h3>
+                <ul>
+                    <li>kubectl을 이용하여 롤링 업데이트 수행하기</li>
+                </ul>
+            </div>
+
+            <div class="col-md-8">
+                <h3>애플리케이션 업데이트하기</h3>
+
+                <p>사용자들은 애플리케이션이 항상 가용한 상태일 것이라 여기고 개발자들은 하루에 여러번씩 새로운 버전을
+                   배포하도록 요구 받고있다. 쿠버네티스에서는 이것을 롤링 업데이트를 통해 이루고 있다. <b>롤링 업데이트</b>는 파드 인스턴스를 점진적으로 새로운 것으로 업데이트하여 디플로이먼트 업데이트가 서비스 중단 없이 이루어질 수 있도록 해준다.
+                   새로운 파드는 가용한 자원을 보유한 노드로 스케줄될 것이다.</p>
+
+                <p>이전 모듈에서 여러 개의 인스턴스를 동작시키도록 애플리케이션을 스케일했다. 이것은 애플리케이션의 가용성에 영향을 미치지 않으면서
+                   업데이트를 수행하는 것에 대한 요구이다. 기본적으로, 업데이트가 이루어지는 동안 이용 불가한 파드의 최대 개수와 생성 가능한 새로운 파드의 최대 개수는 하나다.
+                   두 옵션은 (파드에 대한) 개수 또는 백분율로 구성될 수 있다.
+                    쿠버네티스에서, 업데이트는 버전으로 관리되고 어떠한 디플로이먼트 업데이트라도 이전의 (안정적인) 버전으로 원복이 가능하다.</p>
+
+            </div>
+            <div class="col-md-4">
+                <div class="content__box content__box_lined">
+                    <h3>요약:</h3>
+                    <ul>
+                        <li>앱 업데이트하기</li>
+                    </ul>
+                </div>
+                <div class="content__box content__box_fill">
+                    <p><i>롤링 업데이트는 파드 인스턴스를 점진적으로 새로운 것으로 업데이트하여 디플로이먼트 업데이트가 서비스 중단 없이 이루어질 수 있도록 해준다. </i></p>
+                </div>
+            </div>
+        </div>
+        <br>
+
+        <div class="row">
+            <div class="col-md-8">
+                <h2 style="color: #3771e3;">롤링 업데이트 개요</h2>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-1"></div>
+            <div class="col-md-8">
+                <div id="myCarousel" class="carousel" data-ride="carousel" data-interval="3000">
+                    <ol class="carousel-indicators">
+                        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+                        <li data-target="#myCarousel" data-slide-to="1"></li>
+                        <li data-target="#myCarousel" data-slide-to="2"></li>
+                        <li data-target="#myCarousel" data-slide-to="3"></li>
+                    </ol>
+                    <div class="carousel-inner" role="listbox">
+                        <div class="item active">
+                            <img src="/docs/tutorials/kubernetes-basics/public/images/module_06_rollingupdates1.svg">
+                        </div>
+
+                        <div class="item">
+                            <img src="/docs/tutorials/kubernetes-basics/public/images/module_06_rollingupdates2.svg">
+                        </div>
+
+                        <div class="item">
+                            <img src="/docs/tutorials/kubernetes-basics/public/images/module_06_rollingupdates3.svg">
+                        </div>
+
+                        <div class="item">
+                            <img src="/docs/tutorials/kubernetes-basics/public/images/module_06_rollingupdates4.svg">
+                        </div>
+                    </div>
+
+                    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+                        <span class="sr-only ">이전</span>
+                    </a>
+                    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+                        <span class="sr-only">다음</span>
+                    </a>
+
+                </div>
+            </div>
+        </div>
+        <br>
+
+        <div class="row">
+            <div class="col-md-8">
+
+                <p>애플리케이션 스케일링과 유사하게, 디플로이먼트가 외부로 노출되면, 서비스는 업데이트가 이루어지는 동안 오직 가용한 파드에게만 트래픽을 로드밸런스 할 것이다. 가용한 파드란 애플리케이션의 사용자들에게 가용한 상태의 인스턴스를 말한다.</p>
+
+                <p>롤링 업데이트는 다음 동작들을 허용해준다:</p>
+                <ul>
+                    <li>하나의 환경에서 또 다른 환경으로의 애플리케이션 프로모션 (컨테이너 이미지 업데이트를 통해)</li>
+                    <li>이전 버전으로의 롤백</li>
+                    <li>서비스 중단 없는 애플리케이션의 지속적인 통합과 지속적인 전달</li>
+
+                </ul>
+
+            </div>
+            <div class="col-md-4">
+                <div class="content__box content__box_fill">
+                    <p><i>디플로이먼트가 외부로 노출되면, 서비스는 업데이트가 이루어지는 동안 오직 가용한 파드에게만 트래픽을 로드밸런스 할 것이다. </i></p>
+                </div>
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row">
+            <div class="col-md-8">
+                <p> 다음 대화형 튜토리얼에서, 새로운 버전으로 애플리케이션을 업데이트하고, 롤백 또한 수행해 볼 것이다.</p>
+            </div>
+        </div>
+        <br>
+
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/update-interactive/"
+                   role="button">대화형 튜토리얼 시작하기 <span class="btn__next">›</span></a>
+            </div>
+        </div>
+
+    </main>
+
+</div>
+
+</body>
+</html>
+||||||| merged common ancestors
+=======
 ---
 title: 롤링 업데이트 수행하기
 weight: 10
@@ -139,3 +283,4 @@ weight: 10
 
 </body>
 </html>
+>>>>>>> master

content/zh/_common-resources/index.md

@@ -0,0 +1,3 @@
+---
+headless: true
+---

content/zh/_index.html

@@ -1,153 +1,89 @@
 ---
 title: "生产级别的容器编排系统"
 abstract: "自动化的容器部署、扩展和管理"
-cid: "home"
+cid: home
 ---
 
-<section id="oceanNodes">
-    <main>
-        <div class="image-wrapper"><img src="https://d33wubrfki0l68.cloudfront.net/1567471e7c58dc9b7d9c65dcd54e60cbf5870daa/da576/_common-resources/images/flower.png" alt="images/flower.png"></div>
-        <div class="content">
-            
-            <h3><a href="/docs/concepts/overview/what-is-kubernetes/">Kubernetes</a> 是用于自动部署，扩展和管理容器化应用程序的开源系统。</h3>
-            <p>它将组成应用程序的容器组合成逻辑单元，以便于管理和服务发现，Kubernetes 构建在 <a href="http://queue.acm.org/detail.cfm?id=2898444"> Google 15 年生产环境经验</a>基础之上,并结合来自社区的最佳创意和实践。</p>
-        </div>
-    </main>
-    <main>
-        <div class="image-wrapper"><img src="https://d33wubrfki0l68.cloudfront.net/33a12d8be0bc50be4738443101616e968c7afb8f/2c641/_common-resources/images/scalable.png" alt="images/scalable.png"></div>
-        <div class="content">
-            
-            <h4>星际尺度</h4>
-            <p>根据同样的原则设计，允许 Google 每周运行数十亿个容器，Kubernetes 可以在不增加您的 ops 团队的情况下进行弹性扩展。</p>
-        </div>
-    </main>
-    <main>
-        <div class="image-wrapper"><img src="https://d33wubrfki0l68.cloudfront.net/dbc75a944a909b2d52bf24ad06d485eca12af892/4fb42/_common-resources/images/blocks.png" alt="images/blocks.png"></div>
-        <div class="content">
-            
-            <h4>永不过时</h4>
-            <p>无论您应用运行在本地还是运行于全球任何地域，Kubernetes 的灵活性都可以随着您的需求复杂度不断增加，还可以持续、轻松地对外提供服务。</p>
-        </div>
-    </main>
-    <main>
-        <div class="image-wrapper"><img src="https://d33wubrfki0l68.cloudfront.net/bc2e475ac5fee0199eb3f4a0879cd559e8929f3a/4a628/_common-resources/images/suitcase.png" alt="images/suitcase.png"></div>
-        <div class="content">
-            
-            <h4>随处运行</h4>
-            <p>Kubernetes 是开源的，可以让您自由地部署在企业内部，私有云、混合云或公有云基础架构，使您轻松将应用迁移至任何位置。</p>
-        </div>
-    </main>
-</section>
-<section id="video">
-    <div class="light-text">
-        
-        <h2>Kubernetes: 最后&hellip; 它是真正的云平台</h2>
-        <p>Box 的联合创始人和服务架构师 Sam Ghods 发表了热情洋溢的演讲，随着使用 Kubernetes，我们首次有一个通用接口，可以建立真正的部署工具。</p>
-        <button id="desktopShowVideoButton" onclick="kub.showVideo()">观看视频</button>
-    </div>
-    <button id="mobileShowVideoButton" onclick="kub.showVideo()"></button>
-</section>
-<section id="features">
-    <main>
-        
-        <h3 class="center">Kubernetes 特性</h3>
-        <div class="feature-box">
-            <div>
-                
-                <h4><a href="/docs/concepts/configuration/manage-compute-resources-container/">自动包装</a></h4>
-                <p>根据资源需求和其他约束自动放置容器，同时不会牺牲可用性，混合关键和最大努力的工作负载，以提高资源利用率并节省更多资源。</p>
-            </div>
-            <div>
-                
-                <h4><a href="/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller">自我修复</a></h4>
-                <p>重新启动失败的容器，在节点不可用时，替换和重新编排节点上的容器，终止不对用户定义的健康检查做出响应的容器，并且不会在客户端准备投放之前将其通告给客户端。</p>
-            </div>
-        </div>
-        <div class="feature-box">
-            <div>
-                
-                <h4><a href="/docs/tasks/run-application/horizontal-pod-autoscale/">横向缩放</a></h4>
-                <p>使用简单的命令或 UI，或者根据 CPU 的使用情况自动调整应用程序副本数。</p>
-            </div>
-            <div>
-                
-                <h4><a href="/docs/concepts/services-networking/service/">服务发现和负载均衡</a></h4>
-                <p>不需要修改您的应用程序来使用不熟悉的服务发现机制，Kubernetes 为容器提供了自己的 IP 地址和一组容器的单个 DNS 名称，并可以在它们之间进行负载均衡。</p>
-            </div>
-        </div>
-        <div class="feature-box">
-            <div>
-                
-                <h4><a href="/docs/concepts/workloads/controllers/deployment/#what-is-a-deployment">自动部署和回滚</a></h4>
-                <p>Kubernetes 逐渐部署对应用程序或其配置的更改，同时监视应用程序运行状况，以确保它不会同时终止所有实例。 如果出现问题，Kubernetes会为您恢复更改，利用日益增长的部署解决方案的生态系统。</p>
-            </div>
-            <div>
-                <h4><a href="/docs/concepts/configuration/secret/">密钥</a> 和 <a href="/docs/tasks/configure-pod-container/configure-pod-configmap/">配置</a> 管理</h4>
-                <p>部署和更新密钥和应用程序配置，不会重新编译您的镜像，不会在堆栈配置中暴露密钥(secrets)。</p>
-            </div>
-        </div>
-        <div class="feature-box">
-            <div>
-                <h4><a href="/docs/concepts/storage/persistent-volumes/">存储编排</a></h4>
-                <p>自动安装您所选择的存储系统，无论是本地存储，如公有云提供商 <a href="https://cloud.google.com/storage/">GCP</a> 或 <a href="https://aws.amazon.com/products/storage/">AWS</a>, 还是网络存储系统 NFS, iSCSI,
-            Gluster, Ceph, Cinder, 或 Flocker。</p>
-        </div>
-        <div>
-            <h4><a href="/docs/concepts/workloads/controllers/jobs-run-to-completion/">批处理</a></h4>
-            <p>除了服务之外，Kubernetes还可以管理您的批处理和 CI 工作负载，如果需要，替换出现故障的容器。</p>
-        </div>
-    </div>
-</main>
-</section>
-<section id="talkToUs">
-<main>
-    
-    <h3>实例探究</h3>
-    <div id="caseStudiesWrapper">
-        <div>
-            <p>使用Kubernetes来重塑世界上最大的教育公司</p>
-            <a href="/case-studies/pearson/">阅读更多</a>
-        </div>
-        <div>
-            <p>Kubernetes at Box: 微服务的最大优势</p>
-            <a href="https://blog.box.com/blog/kubernetes-box-microservices-maximum-velocity/">阅读更多</a>
-        </div>
-        <div>
-            <p>在 eBay 内部转移到 OpenStack 上的 Kubernetes 和容器</p>
-            <a href="https://www.nextplatform.com/2015/11/12/inside-ebays-shift-to-kubernetes-and-containers-atop-openstack/">阅读更多</a>
-        </div>
-        <div>
-            <p>将本地的集群迁移至 Kubernetes</p>
-            <a href="https://www.youtube.com/watch?v=6XGUTu3WhBw">观看视频</a>
-        </div>
-    </div>
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    <h5 style="text-align: center"><a href="/case-studies/" style="color: #3371E3; font-weight: 400">探究所有的案例</a></h5>
-</main>
-</section>
+{{< deprecationwarning >}}
+
+{{< blocks/section id="oceanNodes" >}}
+{{% blocks/feature image="flower" %}}
+
+<!-- ### [Kubernetes]({{< relref "/docs/concepts/overview/what-is-kubernetes" >}}) is an open-source system for automating deployment, scaling, and management of containerized applications. -->
+### [Kubernetes]({{< relref "/docs/concepts/overview/what-is-kubernetes" >}}) 是用于自动部署，扩展和管理容器化应用程序的开源系统。
+
+<!-- It groups containers that make up an application into logical units for easy management and discovery.
+Kubernetes builds upon [15 years of experience of running production workloads at Google](http://queue.acm.org/detail.cfm?id=2898444),
+combined with best-of-breed ideas and practices from the community. -->
+
+它将组成应用程序的容器组合成逻辑单元，以便于管理和服务发现。Kubernetes 源自[Google 15 年生产环境的运维经验](http://queue.acm.org/detail.cfm?id=2898444)，同时凝聚了社区的最佳创意和实践。
+
+{{% /blocks/feature %}}
+
+{{% blocks/feature image="scalable" %}}
+
+<!-- #### Planet Scale -->
+#### 星际尺度
+
+<!-- Designed on the same principles that allows Google to run billions of containers a week,
+Kubernetes can scale without increasing your ops team. -->
+
+Google 每周运行数十亿个容器，Kubernetes 基于与之相同的原则来设计，能够在不扩张运维团队的情况下进行规模扩展。
+
+{{% /blocks/feature %}}
+
+{{% blocks/feature image="blocks" %}}
+
+<!-- #### Never Outgrow -->
+#### 处处适用
+
+<!-- Whether testing locally or running a global enterprise, Kubernetes flexibility grows with you to deliver your applications
+consistently and easily no matter how complex your need is. -->
+
+无论是本地测试，还是跨国公司，Kubernetes 的灵活性都能让你在应对复杂系统时得心应手。
+
+{{% /blocks/feature %}}
+
+{{% blocks/feature image="suitcase" %}}
+
+<!-- #### Run Anywhere -->
+#### 永不过时
+
+<!-- Kubernetes is open source giving you the freedom to take advantage of on-premises, hybrid,
+or public cloud infrastructure, letting you effortlessly move workloads to where it matters to you. -->
+
+Kubernetes 是开源系统，可以自由地部署在企业内部，私有云、混合云或公有云，让您轻松地做出合适的选择。
+
+{{% /blocks/feature %}}
+
+{{< /blocks/section >}}
+
+{{< blocks/section id="video" background-image="kub_video_banner_homepage" >}}
+
+<div class="light-text">
+    <!-- <h2>The Challenges of Migrating 150+ Microservices to Kubernetes</h2> -->
+    <h2>将 150+ 微服务迁移到 Kubernetes 上的挑战</h2>
+    <!-- <p>By Sarah Wells, Technical Director for Operations and Reliability, Financial Times</p> -->
+    <p>Sarah Wells, 运营和可靠性技术总监, 金融时报</p>
+    <button id="desktopShowVideoButton" onclick="kub.showVideo()">Watch Video</button>
+    <br>
+    <br>
+    <br>
+    <!-- <a href="https://www.lfasiallc.com/events/kubecon-cloudnativecon-china-2018/" button id="desktopKCButton">Attend KubeCon in Shanghai on Nov. 13-15, 2018</a> -->
+    <a href="https://www.lfasiallc.com/events/kubecon-cloudnativecon-china-2018/" button id="desktopKCButton">参加11月13日到15日的上海 KubeCon</a>
+    <br>
+    <br>
+    <br>
+    <br>
+    <!-- <a href="https://events.linuxfoundation.org/events/kubecon-cloudnativecon-north-america-2018/" button id="desktopKCButton">Attend KubeCon in Seattle on Dec. 11-13, 2018</a> -->
+    <a href="https://events.linuxfoundation.org/events/kubecon-cloudnativecon-north-america-2018/" button id="desktopKCButton">参加12月11日到13日的西雅图 KubeCon</a>
+</div>
 <div id="videoPlayer">
-<iframe data-url="https://www.youtube.com/embed/of45hYbkIZs?autoplay=1" frameborder="0" allowfullscreen></iframe>
-<button id="closeButton"></button>
-</div>
+    <iframe data-url="https://www.youtube.com/embed/H06qrNmGqyE?autoplay=1" frameborder="0" allowfullscreen></iframe>
+    <button id="closeButton"></button>
+</div>
+{{< /blocks/section >}}
+
+{{< blocks/kubernetes-features >}}
+
+{{< blocks/case-studies >}}

content/zh/blog/_posts/2015-03-00-Kubernetes-Gathering-Videos.md

@@ -0,0 +1,27 @@
+---
+
+title: " Kubernetes 采集视频 "
+date: 2015-03-23
+slug: kubernetes-gathering-videos
+url: /blog/2015/03/Kubernetes-Gathering-Videos
+---
+
+<!--
+---
+
+title: " Kubernetes Gathering Videos "
+date: 2015-03-23
+slug: kubernetes-gathering-videos
+url: /blog/2015/03/Kubernetes-Gathering-Videos
+---
+-->
+
+<!--
+If you missed the Kubernetes Gathering in SF last month, fear not! Here are the videos from the evening presentations organized into a playlist on YouTube
+
+[![Kubernetes Gathering](https://img.youtube.com/vi/q8lGZCKktYo/0.jpg)](https://www.youtube.com/playlist?list=PL69nYSiGNLP2FBVvSLHpJE8_6hRHW8Kxe)
+-->
+
+如果你错过了上个月在旧金山举行的 Kubernetes 大会，不要害怕!以下是在 YouTube 上组织成播放列表的晚间演示文稿中的视频。
+
+[![Kubernetes Gathering](https://img.youtube.com/vi/q8lGZCKktYo/0.jpg)](https://www.youtube.com/playlist?list=PL69nYSiGNLP2FBVvSLHpJE8_6hRHW8Kxe)

content/zh/blog/_posts/2015-03-00-Weekly-Kubernetes-Community-Hangout.md

@@ -0,0 +1,186 @@
+---
+title: " Kubernetes 社区每周聚会笔记 - 2015年3月27日 "
+date: 2015-03-28
+slug: weekly-kubernetes-community-hangout
+url: /blog/2015/03/Weekly-Kubernetes-Community-Hangout
+---
+
+<!--
+---
+title: " Weekly Kubernetes Community Hangout Notes - March 27 2015 "
+date: 2015-03-28
+slug: weekly-kubernetes-community-hangout
+url: /blog/2015/03/Weekly-Kubernetes-Community-Hangout
+---
+-->
+
+<!--
+Every week the Kubernetes contributing community meet virtually over Google Hangouts. We want anyone who's interested to know what's discussed in this forum.
+-->
+每个星期，Kubernetes 贡献者社区几乎都会在谷歌 Hangouts 上聚会。我们希望任何对此感兴趣的人都能了解这个论坛的讨论内容。
+
+<!--
+Agenda:
+-->
+日程安排：
+
+<!--
+
+\- Andy - demo remote execution and port forwarding
+
+\- Quinton - Cluster federation - Postponed
+
+\- Clayton - UI code sharing and collaboration around Kubernetes
+
+-->
+
+\- Andy - 演示远程执行和端口转发
+
+\- Quinton - 联邦集群 - 延迟
+
+\- Clayton - 围绕 Kubernetes 的 UI 代码共享和协作
+
+<!--
+Notes from meeting:
+-->
+从会议指出：
+
+<!--
+
+1\. Andy from RedHat:
+
+-->
+
+1\. Andy 从 RedHat：
+
+<!--
+
+* Demo remote execution
+
+-->
+
+* 演示远程执行
+
+<!--
+
+    * kubectl exec -p $POD -- $CMD
+
+    * Makes a connection to the master as proxy, figures out which node the pod is on, proxies connection to kubelet, which does the interesting bit.  via nsenter.
+
+    * Multiplexed streaming over HTTP using SPDY
+
+    * Also interactive mode:
+
+    * Assumes first container.  Can use -c $CONTAINER to pick a particular one.
+
+    * If have gdb pre-installed in container, then can interactively attach it to running process
+
+        * backtrace, symbol tbles, print, etc.  Most things you can do with gdb.
+
+    * Can also with careful flag crafting run rsync over this or set up sshd inside container.
+
+    * Some feedback via chat:
+    
+-->
+
+    * kubectl exec -p $POD -- $CMD
+
+    * 作为代理与主机建立连接，找出 pod 所在的节点，代理与 kubelet 的连接，这一点很有趣。通过 nsenter。
+
+    * 使用 SPDY 通过 HTTP 进行多路复用流式传输
+
+    * 还有互动模式：
+
+    * 假设第一个容器，可以使用 -c $CONTAINER 一个特定的。
+
+    * 如果在容器中预先安装了 gdb，则可以交互地将其附加到正在运行的进程中
+
+        * backtrace、symbol tbles、print 等。  使用gdb可以做的大多数事情。
+
+    * 也可以用精心制作的参数在上面运行 rsync 或者在容器内设置 sshd。
+
+    * 一些聊天反馈：
+
+<!--
+
+* Andy also demoed port forwarding
+* nsenter vs. docker exec
+
+-->
+
+* Andy 还演示了端口转发
+* nnsenter 与 docker exec
+
+<!--
+
+    * want to inject a binary under control of the host, similar to pre-start hooks
+
+    * socat, nsenter, whatever the pre-start hook needs
+    
+-->
+
+    * 想要在主机的控制下注入二进制文件，类似于预启动钩子
+
+    * socat、nsenter，任何预启动钩子需要的
+
+<!--
+
+* would be nice to blog post on this
+* version of nginx in wheezy is too old to support needed master-proxy functionality
+
+-->
+
+* 如果能在博客上发表这方面的文章就太好了
+* wheezy 中的 nginx 版本太旧，无法支持所需的主代理功能
+
+<!--
+
+2\. Clayton: where are we wrt a community organization for e.g. kubernetes UI components?
+
+* google-containers-ui IRC channel, mailing list.
+* Tim: google-containers prefix is historical, should just do "kubernetes-ui"
+* also want to put design resources in, and bower expects its own repo.
+* General agreement
+
+-->
+
+2\. Clayton: 我们的社区组织在哪里，例如 kubernetes UI 组件？
+
+* google-containers-ui IRC 频道，邮件列表。
+* Tim: google-containers 前缀是历史的，应该只做 "kubernetes-ui"
+* 也希望将设计资源投入使用，并且 bower 期望自己的仓库。
+* 通用协议
+
+<!--
+
+3\. Brian Grant:
+
+* Testing v1beta3, getting that ready to go in.
+* Paul working on changes to commandline stuff.
+* Early to mid next week, try to enable v1beta3 by default?
+* For any other changes, file issue and CC thockin.
+
+-->
+
+3\. Brian Grant:
+
+* 测试 v1beta3，准备进入。
+* Paul 力于改变命令行的内容。
+* 下周初至中旬，尝试默认启用v1beta3 ?
+* 对于任何其他更改，请发出文件并抄送 thockin。
+
+<!--
+
+4\. General consensus that 30 minutes is better than 60
+
+-->
+
+4\. 一般认为30分钟比60分钟好
+
+<!--
+
+* Shouldn't artificially try to extend just to fill time.
+
+-->
+
+* 不应该为了填满时间而人为地延长。

content/zh/blog/_posts/2015-03-00-Welcome-To-Kubernetes-Blog.md

@@ -0,0 +1,62 @@
+---
+title: 欢迎来到 Kubernetes 博客!
+date: 2015-03-20
+slug: welcome-to-kubernetes-blog
+url: /blog/2015/03/Welcome-To-Kubernetes-Blog
+---
+
+<!--
+---
+title: Welcome to the Kubernetes Blog! 
+date: 2015-03-20
+slug: welcome-to-kubernetes-blog
+url: /blog/2015/03/Welcome-To-Kubernetes-Blog
+---
+-->
+
+<!--
+Welcome to the new Kubernetes Blog. Follow this blog to learn about the Kubernetes Open Source project. We plan to post release notes, how-to articles, events, and maybe even some off topic fun here from time to time.
+-->
+欢迎来到新的 Kubernetes 博客。关注此博客，了解 Kubernetes 开源项目。我们计划不时发布发布说明，操作方法文章，活动，甚至一些非常有趣的话题。
+
+<!--
+If you are using Kubernetes or contributing to the project and would like to do a guest post, [please let me know](mailto:kitm@google.com).
+-->
+如果您正在使用 Kubernetes 或为该项目做出贡献并想要发帖子，[请告诉我](mailto:kitm@google.com)。
+
+<!--
+To start things off, here's a roundup of recent Kubernetes posts from other sites:
+-->
+首先，以下是 Kubernetes 最近在其他网站上发布的文章摘要：
+
+<!--
+- [Scaling MySQL in the cloud with Vitess and Kubernetes](http://googlecloudplatform.blogspot.com/2015/03/scaling-MySQL-in-the-cloud-with-Vitess-and-Kubernetes.html)
+- [Container Clusters on VMs](http://googlecloudplatform.blogspot.com/2015/02/container-clusters-on-vms.html)
+- [Everything you wanted to know about Kubernetes but were afraid to ask](http://googlecloudplatform.blogspot.com/2015/01/everything-you-wanted-to-know-about-Kubernetes-but-were-afraid-to-ask.html)
+- [What makes a container cluster?](http://googlecloudplatform.blogspot.com/2015/01/what-makes-a-container-cluster.html)
+- [Integrating OpenStack and Kubernetes with Murano](https://www.mirantis.com/blog/integrating-openstack-and-kubernetes-with-murano/)
+- [An introduction to containers, Kubernetes, and the trajectory of modern cloud computing](http://googlecloudplatform.blogspot.com/2015/01/in-coming-weeks-we-will-be-publishing.html)
+- [What is Kubernetes and how to use it?](http://www.centurylinklabs.com/what-is-kubernetes-and-how-to-use-it/)
+- [OpenShift V3, Docker and Kubernetes Strategy](https://blog.openshift.com/v3-docker-kubernetes-interview/)
+- [An Introduction to Kubernetes](https://www.digitalocean.com/community/tutorials/an-introduction-to-kubernetes)
+-->
+
+- [使用 Vitess 和 Kubernetes 在云中扩展 MySQL](http://googlecloudplatform.blogspot.com/2015/03/scaling-MySQL-in-the-cloud-with-Vitess-and-Kubernetes.html)
+- [虚拟机上的容器群集](http://googlecloudplatform.blogspot.com/2015/02/container-clusters-on-vms.html)
+- [想知道的关于 kubernetes 的一切，却又不敢问](http://googlecloudplatform.blogspot.com/2015/01/everything-you-wanted-to-know-about-Kubernetes-but-were-afraid-to-ask.html)
+- [什么构成容器集群？](http://googlecloudplatform.blogspot.com/2015/01/what-makes-a-container-cluster.html)
+- [将 OpenStack 和 Kubernetes 与 Murano 集成](https://www.mirantis.com/blog/integrating-openstack-and-kubernetes-with-murano/)
+- [容器介绍，Kubernetes 以及现代云计算的发展轨迹](http://googlecloudplatform.blogspot.com/2015/01/in-coming-weeks-we-will-be-publishing.html)
+- [什么是 Kubernetes 以及如何使用它？](http://www.centurylinklabs.com/what-is-kubernetes-and-how-to-use-it/)
+- [OpenShift V3，Docker 和 Kubernetes 策略](https://blog.openshift.com/v3-docker-kubernetes-interview/)
+- [Kubernetes 简介](https://www.digitalocean.com/community/tutorials/an-introduction-to-kubernetes)
+
+<!--
+Happy cloud computing!
+-->
+快乐的云计算！
+
+<!--
+ - Kit Merker - Product Manager, Google Cloud Platform
+-->
+ - Kit Merker - Google 云平台产品经理

content/zh/blog/_posts/2015-04-00-Kubernetes-Release-0150.md

@@ -0,0 +1,176 @@
+---
+title: " Kubernetes Release: 0.15.0 "
+date: 2015-04-16
+slug: kubernetes-release-0150
+url: /blog/2015/04/Kubernetes-Release-0150
+---
+
+<!--
+Release Notes:
+-->
+
+Release 说明：
+
+<!--
+
+* Enables v1beta3 API and sets it to the default API version ([#6098][1])
+* Added multi-port Services ([#6182][2])
+    * New Getting Started Guides
+    * Multi-node local startup guide ([#6505][3])
+    * Mesos on Google Cloud Platform ([#5442][4])
+    * Ansible Setup instructions ([#6237][5])
+* Added a controller framework ([#5270][6], [#5473][7])
+* The Kubelet now listens on a secure HTTPS port ([#6380][8])
+* Made kubectl errors more user-friendly ([#6338][9])
+* The apiserver now supports client cert authentication ([#6190][10])
+* The apiserver now limits the number of concurrent requests it processes ([#6207][11])
+* Added rate limiting to pod deleting ([#6355][12])
+* Implement Balanced Resource Allocation algorithm as a PriorityFunction in scheduler package ([#6150][13])
+* Enabled log collection from master ([#6396][14])
+* Added an api endpoint to pull logs from Pods ([#6497][15])
+* Added latency metrics to scheduler ([#6368][16])
+* Added latency metrics to REST client ([#6409][17])
+
+-->
+
+* 启用 1beta3 API 并将其设置为默认 API 版本 ([#6098][1])
+* 增加了多端口服务([#6182][2])
+    * 新入门指南
+    * 多节点本地启动指南 ([#6505][3])
+    * Google 云平台上的 Mesos ([#5442][4])
+    * Ansible 安装说明 ([#6237][5])
+* 添加了一个控制器框架 ([#5270][6], [#5473][7])
+* Kubelet 现在监听一个安全的 HTTPS 端口 ([#6380][8])
+* 使 kubectl 错误更加友好 ([#6338][9])
+* apiserver 现在支持客户端 cert 身份验证 ([#6190][10])
+* apiserver 现在限制了它处理的并发请求的数量 ([#6207][11])
+* 添加速度限制删除 pod ([#6355][12])
+* 将平衡资源分配算法作为优先级函数实现在调度程序包中 ([#6150][13])
+* 从主服务器启用日志收集功能 ([#6396][14])
+* 添加了一个 api 端口来从 Pod 中提取日志 ([#6497][15])
+* 为调度程序添加了延迟指标 ([#6368][16])
+* 为 REST 客户端添加了延迟指标 ([#6409][17])
+
+<!--
+
+* etcd now runs in a pod on the master ([#6221][18])
+* nginx now runs in a container on the master ([#6334][19])
+* Began creating Docker images for master components ([#6326][20])
+* Updated GCE provider to work with gcloud 0.9.54 ([#6270][21])
+* Updated AWS provider to fix Region vs Zone semantics ([#6011][22])
+* Record event when image GC fails ([#6091][23])
+* Add a QPS limiter to the kubernetes client ([#6203][24])
+* Decrease the time it takes to run make release ([#6196][25])
+* New volume support
+    * Added iscsi volume plugin ([#5506][26])
+    * Added glusterfs volume plugin ([#6174][27])
+    * AWS EBS volume support ([#5138][28])
+* Updated to heapster version to v0.10.0 ([#6331][29])
+* Updated to etcd 2.0.9 ([#6544][30])
+* Updated to Kibana to v1.2 ([#6426][31])
+* Bug Fixes
+    * Kube-proxy now updates iptables rules if a service's public IPs change ([#6123][32])
+    * Retry kube-addons creation if the initial creation fails ([#6200][33])
+    * Make kube-proxy more resiliant to running out of file descriptors ([#6727][34])
+
+-->
+
+* etcd 现在在 master 上的一个 pod 中运行 ([#6221][18])
+* nginx 现在在 master上的容器中运行 ([#6334][19])
+* 开始为主组件构建 Docker 镜像 ([#6326][20])
+* 更新了 GCE 程序以使用 gcloud 0.9.54 ([#6270][21])
+* 更新了 AWS 程序来修复区域与区域语义 ([#6011][22])
+* 记录镜像 GC 失败时的事件 ([#6091][23])
+* 为 kubernetes 客户端添加 QPS 限制器 ([#6203][24])
+* 减少运行 make release 所需的时间 ([#6196][25])
+* 新卷的支持
+    * 添加 iscsi 卷插件 ([#5506][26])
+    * 添加 glusterfs 卷插件 ([#6174][27])
+    * AWS EBS 卷支持 ([#5138][28])
+* 更新到 heapster 版本到 v0.10.0 ([#6331][29])
+* 更新到 etcd 2.0.9 ([#6544][30])
+* 更新到 Kibana 到 v1.2 ([#6426][31])
+* 漏洞修复
+    * 如果服务的公共 IP 发生变化，Kube-proxy现在会更新iptables规则 ([#6123][32])
+    * 如果初始创建失败，则重试 kube-addons 创建 ([#6200][33])
+    * 使 kube-proxy 对耗尽文件描述符更具弹性 ([#6727][34])
+
+<!--
+To download, please visit https://github.com/GoogleCloudPlatform/kubernetes/releases/tag/v0.15.0
+-->
+要下载，请访问 https://github.com/GoogleCloudPlatform/kubernetes/releases/tag/v0.15.0
+
+<!--
+[1]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6098 "Enabling v1beta3 api version by default in master"
+[2]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6182 "Implement multi-port Services"
+[3]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6505 "Docker multi-node"
+[4]: https://github.com/GoogleCloudPlatform/kubernetes/pull/5442 "Getting started guide for Mesos on Google Cloud Platform"
+[5]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6237 "example ansible setup repo"
+[6]: https://github.com/GoogleCloudPlatform/kubernetes/pull/5270 "Controller framework"
+[7]: https://github.com/GoogleCloudPlatform/kubernetes/pull/5473 "Add DeltaFIFO (a controller framework piece)"
+[8]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6380 "Configure the kubelet to use HTTPS (take 2)"
+[9]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6338 "Return a typed error for config validation, and make errors simple"
+[10]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6190 "Add client cert authentication"
+[11]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6207 "Add a limit to the number of in-flight requests that a server processes."
+[12]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6355 "Added rate limiting to pod deleting"
+[13]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6150 "Implement Balanced Resource Allocation (BRA) algorithm as a PriorityFunction in scheduler package."
+[14]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6396 "Enable log collection from master."
+[15]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6497 "Pod log subresource"
+[16]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6368 "Add basic latency metrics to scheduler."
+[17]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6409 "Add latency metrics to REST client"
+[18]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6221 "Run etcd 2.0.5 in a pod"
+[19]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6334 "Add an nginx docker image for use on the master."
+[20]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6326 "Create Docker images for master components "
+[21]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6270 "Updates for gcloud 0.9.54"
+-->
+[1]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6098 "在 master 中默认启用 v1beta3 api 版本"
+[2]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6182 "实现多端口服务"
+[3]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6505 "Docker 多节点"
+[4]: https://github.com/GoogleCloudPlatform/kubernetes/pull/5442 "谷歌云平台上 Mesos 入门指南"
+[5]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6237 "示例 ansible 设置仓库"
+[6]: https://github.com/GoogleCloudPlatform/kubernetes/pull/5270 "控制器框架"
+[7]: https://github.com/GoogleCloudPlatform/kubernetes/pull/5473 "添加 DeltaFIFO（控制器框架块）"
+[8]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6380 "将 kubelet 配置为使用 HTTPS (获得 2)"
+[9]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6338 "返回用于配置验证的类型化错误，并简化错误"
+[10]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6190 "添加客户端证书认证"
+[11]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6207 "为服务器处理的正在运行的请求数量添加一个限制。"
+[12]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6355 "添加速度限制删除 pod"
+[13]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6150 "将均衡资源分配算法作为优先级函数实现在调度程序包中。"
+[14]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6396 "启用主服务器收集日志。"
+[15]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6497 "pod 子日志资源"
+[16]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6368 "将基本延迟指标添加到调度程序。"
+[17]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6409 "向 REST 客户端添加延迟指标"
+[18]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6221 "在 pod 中运行 etcd 2.0.5"
+[19]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6334 "添加一个 nginx docker 镜像用于主程序。"
+[20]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6326 "为主组件创建 Docker 镜像"
+[21]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6270 "gcloud 0.9.54 的更新"
+
+<!--
+[22]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6011 "Fix AWS region vs zone"
+[23]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6091 "Record event when image GC fails."
+[24]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6203 "Add a QPS limiter to the kubernetes client."
+[25]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6196 "Parallelize architectures in both the building and packaging phases of `make release`"
+[26]: https://github.com/GoogleCloudPlatform/kubernetes/pull/5506 "add iscsi volume plugin"
+[27]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6174 "implement glusterfs volume plugin"
+[28]: https://github.com/GoogleCloudPlatform/kubernetes/pull/5138 "AWS EBS volume support"
+[29]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6331 "Update heapster version to v0.10.0"
+[30]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6544 "Build etcd image (version 2.0.9), and upgrade kubernetes cluster to the new version"
+[31]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6426 "Update Kibana to v1.2 which paramaterizes location of Elasticsearch"
+[32]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6123 "Fix bug in kube-proxy of not updating iptables rules if a service's public IPs change"
+[33]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6200 "Retry kube-addons creation if kube-addons creation fails."
+[34]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6727 "pkg/proxy: panic if run out of fd"
+-->
+[22]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6011 "修复 AWS 区域 与 zone"
+[23]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6091 "记录镜像 GC 失败时的事件。"
+[24]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6203 "向 kubernetes 客户端添加 QPS 限制器。"
+[25]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6196 "在 `make release` 的构建和打包阶段并行化架构"
+[26]: https://github.com/GoogleCloudPlatform/kubernetes/pull/5506 "添加 iscsi 卷插件"
+[27]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6174 "实现 glusterfs 卷插件"
+[28]: https://github.com/GoogleCloudPlatform/kubernetes/pull/5138 "AWS EBS 卷支持"
+[29]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6331 "将 heapster 版本更新到 v0.10.0"
+[30]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6544 "构建 etcd 镜像(版本 2.0.9)，并将 kubernetes 集群升级到新版本"
+[31]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6426 "更新 Kibana 到 v1.2，它对 Elasticsearch 的位置进行了参数化"
+[32]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6123 "修复了 kube-proxy 中的一个错误，如果一个服务的公共 ip 发生变化，它不会更新 iptables 规则"
+[33]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6200 "如果 kube-addons 创建失败，请重试 kube-addons 创建。"
+[34]: https://github.com/GoogleCloudPlatform/kubernetes/pull/6727 "pkg/proxy: fd 用完后引起恐慌"
+

content/zh/blog/_posts/2015-04-00-Weekly-Kubernetes-Community-Hangout_17.md

@@ -0,0 +1,287 @@
+---
+title: " Kubernetes 社区每周聚会笔记- 2015年4月17日 "
+date: 2015-04-17
+slug: weekly-kubernetes-community-hangout_17
+url: /blog/2015/04/Weekly-Kubernetes-Community-Hangout_17
+---
+
+<!--
+---
+title: " Weekly Kubernetes Community Hangout Notes - April 17 2015 "
+date: 2015-04-17
+slug: weekly-kubernetes-community-hangout_17
+url: /blog/2015/04/Weekly-Kubernetes-Community-Hangout_17
+---
+-->
+
+<!--
+Every week the Kubernetes contributing community meet virtually over Google Hangouts. We want anyone who's interested to know what's discussed in this forum.  
+-->
+每个星期，Kubernetes 贡献者社区几乎都会在谷歌 Hangouts 上聚会。我们希望任何对此感兴趣的人都能了解这个论坛的讨论内容。
+
+<!--
+Agenda  
+
+* Mesos Integration
+* High Availability (HA)
+* Adding performance and profiling details to e2e to track regressions
+* Versioned clients
+
+-->
+议程  
+
+* Mesos 集成
+* 高可用性（HA）
+* 向 e2e 添加性能和分析详细信息以跟踪回归
+* 客户端版本化
+
+<!--
+Notes  
+-->
+笔记
+
+<!--
+
+* Mesos integration
+
+    * Mesos integration proposal:
+
+    * No blockers to integration.
+
+    * Documentation needs to be updated.
+
+-->
+
+* Mesos 集成
+
+    * Mesos 集成提案：
+
+    * 没有阻塞集成的因素。
+
+    * 文档需要更新。
+
+<!--
+
+* HA
+
+    * Proposal should land today.
+
+    * Etcd cluster.
+
+    * Load-balance apiserver.
+
+    * Cold standby for controller manager and other master components.
+    
+-->
+
+* HA
+
+    * 提案今天应该会提交。
+
+    * Etcd 集群。
+
+    * apiserver 负载均衡。
+
+    * 控制器管理器和其他主组件的冷备用。
+
+<!--
+
+* Adding performance and profiling details to e2e to track regression
+
+    * Want red light for performance regression
+
+    * Need a public DB to post the data
+
+        * See
+
+    * Justin working on multi-platform e2e dashboard
+    
+-->
+
+* 向 e2e 添加性能和分析详细信息以跟踪回归
+
+    * 希望红色为性能回归
+
+    * 需要公共数据库才能发布数据
+
+        * 查看
+
+    * Justin 致力于多平台 e2e 仪表盘
+
+<!--
+
+* Versioned clients
+
+    *
+
+    *
+
+    * Client library currently uses internal API objects.
+
+    * Nobody reported that frequent changes to types.go have been painful, but we are worried about it.
+
+    * Structured types are useful in the client. Versioned structs would be ok.
+
+    * If start with json/yaml (kubectl), shouldn’t convert to structured types. Use swagger.
+    
+-->
+
+* 客户端版本化
+
+    *
+
+    *
+
+    * 客户端库当前使用内部 API 对象。
+
+    * 尽管没有人反映频繁修改 `types.go` 有多痛苦，但我们很为此担心。
+
+    * 结构化类型在客户端中很有用。版本化的结构就可以了。
+
+    * 如果从 json/yaml (kubectl) 开始，则不应转换为结构化类型。使用 swagger。
+
+<!--
+
+* Security context
+
+    *
+
+    * Administrators can restrict who can run privileged containers or require specific unix uids
+
+    * Kubelet will be able to get pull credentials from apiserver
+
+    * Policy proposal coming in the next week or so
+-->
+
+* Security context
+
+    *
+
+    * 管理员可以限制谁可以运行特权容器或需要特定的 unix uid
+
+    * kubelet 将能够从 apiserver 获取证书
+
+    * 政策提案将于下周左右出台
+
+<!--
+
+* Discussing upstreaming of users, etc. into Kubernetes, at least as optional
+* 1.0 Roadmap
+
+    * Focus is performance, stability, cluster upgrades
+
+    * TJ has been making some edits to [roadmap.md][4] but hasn’t sent out a PR yet
+* Kubernetes UI
+
+    * Dependencies broken out into third-party
+
+    * @lavalamp is reviewer
+
+-->
+
+* 讨论用户的上游，等等进入Kubernetes，至少是可选的
+* 1.0 路线图
+
+    * 重点是性能，稳定性，集群升级
+
+    * TJ 一直在对[roadmap.md][4]进行一些编辑，但尚未发布PR
+* Kubernetes UI
+
+    * 依赖关系分解为第三方
+
+    * @lavalamp 是评论家
+
+
+[1]: http://kubernetes.io/images/nav_logo.svg
+[2]: http://kubernetes.io/docs/
+[3]: https://kubernetes.io/blog/
+[4]: https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/roadmap.md
+[5]: https://kubernetes.io/blog/2015/04/weekly-kubernetes-community-hangout_17 "permanent link"
+[6]: https://resources.blogblog.com/img/icon18_edit_allbkg.gif
+[7]: https://www.blogger.com/post-edit.g?blogID=112706738355446097&postID=630924463010638300&from=pencil "Edit Post"
+[8]: https://www.blogger.com/share-post.g?blogID=112706738355446097&postID=630924463010638300&target=email "Email This"
+[9]: https://www.blogger.com/share-post.g?blogID=112706738355446097&postID=630924463010638300&target=blog "BlogThis!"
+[10]: https://www.blogger.com/share-post.g?blogID=112706738355446097&postID=630924463010638300&target=twitter "Share to Twitter"
+[11]: https://www.blogger.com/share-post.g?blogID=112706738355446097&postID=630924463010638300&target=facebook "Share to Facebook"
+[12]: https://www.blogger.com/share-post.g?blogID=112706738355446097&postID=630924463010638300&target=pinterest "Share to Pinterest"
+[13]: https://kubernetes.io/blog/search/label/community%20meetings
+[14]: https://kubernetes.io/blog/search/label/containers
+[15]: https://kubernetes.io/blog/search/label/docker
+[16]: https://kubernetes.io/blog/search/label/k8s
+[17]: https://kubernetes.io/blog/search/label/kubernetes
+[18]: https://kubernetes.io/blog/search/label/open%20source
+[19]: https://kubernetes.io/blog/2015/04/kubernetes-and-mesosphere-dcos "Newer Post"
+[20]: https://kubernetes.io/blog/2015/04/introducing-kubernetes-v1beta3 "Older Post"
+[21]: https://kubernetes.io/blog/feeds/630924463010638300/comments/default
+[22]: https://img2.blogblog.com/img/widgets/arrow_dropdown.gif
+[23]: https://img1.blogblog.com/img/icon_feed12.png
+[24]: https://img1.blogblog.com/img/widgets/subscribe-netvibes.png
+[25]: https://www.netvibes.com/subscribe.php?url=http%3A%2F%2Fblog.kubernetes.io%2Ffeeds%2Fposts%2Fdefault
+[26]: https://img1.blogblog.com/img/widgets/subscribe-yahoo.png
+[27]: https://add.my.yahoo.com/content?url=http%3A%2F%2Fblog.kubernetes.io%2Ffeeds%2Fposts%2Fdefault
+[28]: https://kubernetes.io/blog/feeds/posts/default
+[29]: https://www.netvibes.com/subscribe.php?url=http%3A%2F%2Fblog.kubernetes.io%2Ffeeds%2F630924463010638300%2Fcomments%2Fdefault
+[30]: https://add.my.yahoo.com/content?url=http%3A%2F%2Fblog.kubernetes.io%2Ffeeds%2F630924463010638300%2Fcomments%2Fdefault
+[31]: https://resources.blogblog.com/img/icon18_wrench_allbkg.png
+[32]: //www.blogger.com/rearrange?blogID=112706738355446097&widgetType=Subscribe&widgetId=Subscribe1&action=editWidget§ionId=sidebar-right-1 "Edit"
+[33]: https://twitter.com/kubernetesio
+[34]: https://github.com/kubernetes/kubernetes
+[35]: http://slack.k8s.io/
+[36]: http://stackoverflow.com/questions/tagged/kubernetes
+[37]: http://get.k8s.io/
+[38]: //www.blogger.com/rearrange?blogID=112706738355446097&widgetType=HTML&widgetId=HTML2&action=editWidget§ionId=sidebar-right-1 "Edit"
+[39]: javascript:void(0)
+[40]: https://kubernetes.io/blog/2018/
+[41]: https://kubernetes.io/blog/2018/01/
+[42]: https://kubernetes.io/blog/2017/
+[43]: https://kubernetes.io/blog/2017/12/
+[44]: https://kubernetes.io/blog/2017/11/
+[45]: https://kubernetes.io/blog/2017/10/
+[46]: https://kubernetes.io/blog/2017/09/
+[47]: https://kubernetes.io/blog/2017/08/
+[48]: https://kubernetes.io/blog/2017/07/
+[49]: https://kubernetes.io/blog/2017/06/
+[50]: https://kubernetes.io/blog/2017/05/
+[51]: https://kubernetes.io/blog/2017/04/
+[52]: https://kubernetes.io/blog/2017/03/
+[53]: https://kubernetes.io/blog/2017/02/
+[54]: https://kubernetes.io/blog/2017/01/
+[55]: https://kubernetes.io/blog/2016/
+[56]: https://kubernetes.io/blog/2016/12/
+[57]: https://kubernetes.io/blog/2016/11/
+[58]: https://kubernetes.io/blog/2016/10/
+[59]: https://kubernetes.io/blog/2016/09/
+[60]: https://kubernetes.io/blog/2016/08/
+[61]: https://kubernetes.io/blog/2016/07/
+[62]: https://kubernetes.io/blog/2016/06/
+[63]: https://kubernetes.io/blog/2016/05/
+[64]: https://kubernetes.io/blog/2016/04/
+[65]: https://kubernetes.io/blog/2016/03/
+[66]: https://kubernetes.io/blog/2016/02/
+[67]: https://kubernetes.io/blog/2016/01/
+[68]: https://kubernetes.io/blog/2015/
+[69]: https://kubernetes.io/blog/2015/12/
+[70]: https://kubernetes.io/blog/2015/11/
+[71]: https://kubernetes.io/blog/2015/10/
+[72]: https://kubernetes.io/blog/2015/09/
+[73]: https://kubernetes.io/blog/2015/08/
+[74]: https://kubernetes.io/blog/2015/07/
+[75]: https://kubernetes.io/blog/2015/06/
+[76]: https://kubernetes.io/blog/2015/05/
+[77]: https://kubernetes.io/blog/2015/04/
+[78]: https://kubernetes.io/blog/2015/04/weekly-kubernetes-community-hangout_29
+[79]: https://kubernetes.io/blog/2015/04/borg-predecessor-to-kubernetes
+[80]: https://kubernetes.io/blog/2015/04/kubernetes-and-mesosphere-dcos
+[81]: https://kubernetes.io/blog/2015/04/weekly-kubernetes-community-hangout_17
+[82]: https://kubernetes.io/blog/2015/04/introducing-kubernetes-v1beta3
+[83]: https://kubernetes.io/blog/2015/04/kubernetes-release-0150
+[84]: https://kubernetes.io/blog/2015/04/weekly-kubernetes-community-hangout_11
+[85]: https://kubernetes.io/blog/2015/04/faster-than-speeding-latte
+[86]: https://kubernetes.io/blog/2015/04/weekly-kubernetes-community-hangout
+[87]: https://kubernetes.io/blog/2015/03/
+[88]: //www.blogger.com/rearrange?blogID=112706738355446097&widgetType=BlogArchive&widgetId=BlogArchive1&action=editWidget§ionId=sidebar-right-1 "Edit"
+[89]: //www.blogger.com/rearrange?blogID=112706738355446097&widgetType=HTML&widgetId=HTML1&action=editWidget§ionId=sidebar-right-1 "Edit"
+[90]: https://www.blogger.com
+[91]: //www.blogger.com/rearrange?blogID=112706738355446097&widgetType=Attribution&widgetId=Attribution1&action=editWidget§ionId=footer-3 "Edit"
+
+  [*[3:27 PM]: 2015-04-17T15:27:00-07:00

content/zh/blog/_posts/2015-04-00-Weekly-Kubernetes-Community-Hangout_29.md

@@ -0,0 +1,143 @@
+---
+title: " Kubernetes 社区每周聚会笔记- 2015年4月24日 "
+date: 2015-04-30
+slug: weekly-kubernetes-community-hangout_29
+url: /blog/2015/04/Weekly-Kubernetes-Community-Hangout_29
+---
+
+<!--
+---
+title: " Weekly Kubernetes Community Hangout Notes - April 24 2015 "
+date: 2015-04-30
+slug: weekly-kubernetes-community-hangout_29
+url: /blog/2015/04/Weekly-Kubernetes-Community-Hangout_29
+---
+
+-->
+
+<!--
+Every week the Kubernetes contributing community meet virtually over Google Hangouts. We want anyone who's interested to know what's discussed in this forum.  
+-->
+每个星期，Kubernetes 贡献者社区几乎都会在谷歌 Hangouts 上聚会。我们希望任何对此感兴趣的人都能了解这个论坛的讨论内容。
+
+<!--
+Agenda:
+
+* Flocker and Kubernetes integration demo
+
+-->
+日程安排：
+
+* Flocker 和 Kubernetes 集成演示
+
+<!--
+Notes:
+
+* flocker and kubernetes integration demo
+* * Flocker Q/A
+
+    * Does the file still exists on node1 after migration?
+
+    * Brendan: Any plan this to make it a volume? So we don't need powerstrip?
+
+        * Luke:  Need to figure out interest to decide if we want to make it a first-class persistent disk provider in kube.
+
+        * Brendan: Removing need for powerstrip would make it simple to use. Totally go for it.
+
+        * Tim: Should take no more than 45 minutes to add it to kubernetes:)
+
+-->
+笔记：
+
+* flocker 和 kubernetes 集成演示
+* * Flocker Q/A
+
+    * 迁移后文件是否仍存在于node1上？
+
+    * Brendan: 有没有计划把它做成一本书？我们不需要 powerstrip？
+
+        * Luke:  需要找出感兴趣的来决定我们是否想让它成为 kube 中的一个一流的持久性磁盘提供商。
+
+        * Brendan: 删除对 powerstrip 的需求会使其易于使用。完全去做。
+
+        * Tim: 将它添加到 kubernetes 应该不超过45分钟:)
+
+<!--
+
+    * Derek: Contrast this with persistent volumes and claims?
+
+        * Luke: Not much difference, except for the novel ZFS based backend. Makes workloads really portable.
+
+        * Tim: very different than network-based volumes. Its interesting that it is the only offering that allows upgrading media.
+
+        * Brendan: claims, how does it look for replicated claims? eg Cassandra wants to have replicated data underneath. It would be efficient to scale up and down. Create storage on the fly based on load dynamically. Its step beyond taking snapshots - programmatically creating replicas with preallocation.
+
+        * Tim: helps with auto-provisioning.
+
+-->
+
+    * Derek: 持久卷和请求相比呢?
+
+        * Luke: 除了基于 ZFS 的新后端之外，差别不大。使工作负载真正可移植。
+
+        * Tim: 与基于网络的卷非常不同。有趣的是，它是唯一允许升级媒体的产品。
+
+        * Brendan: 请求，它如何查找重复请求？Cassandra 希望在底层复制数据。向上和向下扩缩是有效的。根据负载动态地创建存储。它的步骤不仅仅是快照——通过编程使用预分配创建副本。
+
+        * Tim: 帮助自动配置。
+        
+<!--
+
+    * Brian: Does flocker requires any other component?
+
+        * Kai: Flocker control service co-located with the master.  (dia on blog post). Powerstrip + Powerstrip Flocker. Very interested in mpersisting state in etcd. It keeps metadata about each volume.
+
+        * Brendan: In future, flocker can be a plugin and we'll take care of persistence. Post v1.0.
+
+        * Brian: Interested in adding generic plugin for services like flocker.
+
+        * Luke: Zfs can become really valuable when scaling to lot of containers on a single node.
+
+-->
+
+    * Brian: flocker 是否需要其他组件？
+
+        * Kai: Flocker 控制服务与主服务器位于同一位置。(dia 在博客上)。Powerstrip + Powerstrip Flocker。对在 etcd 中持久化状态非常有趣。它保存关于每个卷的元数据。
+
+        * Brendan: 在未来，flocker 可以是一个插件，我们将负责持久性。发布 v1.0。
+
+        * Brian: 有兴趣为 flocker 等服务添加通用插件。
+
+        * Luke: 当扩展到单个节点上的许多容器时，Zfs 会变得非常有价值。
+
+<!--
+
+    * Alex: Can flocker service can be run as a pod?
+
+        * Kai: Yes, only requirement is the flocker control service should be able to talk to zfs agent. zfs agent needs to be installed on the host and zfs binaries need to be accessible.
+
+        * Brendan: In theory, all zfs bits can be put it into a container with devices.
+
+        * Luke: Yes, still working through cross-container mounting issue.
+
+        * Tim: pmorie is working through it to make kubelet work in a container. Possible re-use.
+
+    * Kai: Cinder support is coming. Few days away.
+* Bob: What's the process of pushing kube to GKE? Need more visibility for confidence.
+
+-->
+
+    * Alex: flocker 服务可以作为 pod 运行吗？
+
+        * Kai: 是的，唯一的要求是 flocker 控制服务应该能够与 zfs 代理对话。需要在主机上安装 zfs 代理，并且需要访问 zfs 二进制文件。
+
+        * Brendan: 从理论上讲，所有 zfs 位都可以与设备一起放入容器中。
+
+        * Luke: 是的，仍然在处理跨容器安装问题。
+
+        * Tim: pmorie 正在通过它使 kubelet 在容器中工作。可能重复使用。
+
+    * Kai: Cinder 支持即将到来。几天之后。
+* Bob: 向 GKE 推送 kube 的过程是怎样的？需要更多的可见度。
+
+

content/zh/blog/_posts/2015-05-00-Kubernetes-On-Openstack.md

@@ -0,0 +1,112 @@
+---
+title: " OpenStack 上的 Kubernetes "
+date: 2015-05-19
+slug: kubernetes-on-openstack
+url: /blog/2015/05/Kubernetes-On-Openstack
+---
+
+<!--
+---
+title: " Kubernetes on OpenStack "
+date: 2015-05-19
+slug: kubernetes-on-openstack
+url: /blog/2015/05/Kubernetes-On-Openstack
+---
+-->
+
+[![](https://3.bp.blogspot.com/-EOrCHChZJZE/VVZzq43g6CI/AAAAAAAAF-E/JUilRHk369E/s400/Untitled%2Bdrawing.jpg)](https://3.bp.blogspot.com/-EOrCHChZJZE/VVZzq43g6CI/AAAAAAAAF-E/JUilRHk369E/s1600/Untitled%2Bdrawing.jpg)
+
+
+<!--
+Today, the [OpenStack foundation](https://www.openstack.org/foundation/) made it even easier for you deploy and manage clusters of Docker containers on OpenStack clouds by including Kubernetes in its [Community App Catalog](http://apps.openstack.org/). &nbsp;At a keynote today at the OpenStack Summit in Vancouver, Mark Collier, COO of the OpenStack Foundation, and Craig Peters, &nbsp;[Mirantis](https://www.mirantis.com/) product line manager, demonstrated the Community App Catalog workflow by launching a Kubernetes cluster in a matter of seconds by leveraging the compute, storage, networking and identity systems already present in an OpenStack cloud.
+-->
+今天，[OpenStack 基金会](https://www.openstack.org/foundation/)通过在其[社区应用程序目录](http://apps.openstack.org/)中包含 Kubernetes，使您更容易在 OpenStack 云上部署和管理 Docker 容器集群。
+今天在温哥华 OpenStack 峰会上的主题演讲中，OpenStack 基金会的首席运营官：Mark Collier 和 [Mirantis](https://www.mirantis.com/) 产品线经理 Craig Peters 通过利用 OpenStack 云中已经存在的计算、存储、网络和标识系统，在几秒钟内启动了 Kubernetes 集群，展示了社区应用程序目录的工作流。
+
+<!--
+The entries in the catalog include not just the ability to [start a Kubernetes cluster](http://apps.openstack.org/#tab=murano-apps&asset=Kubernetes%20Cluster), but also a range of applications deployed in Docker containers managed by Kubernetes. These applications include:
+-->
+目录中的条目不仅包括[启动 Kubernetes 集群](http://apps.openstack.org/#tab=murano-apps&asset=Kubernetes%20Cluster)的功能，还包括部署在 Kubernetes 管理的 Docker 容器中的一系列应用程序。这些应用包括：
+
+<!--
+
+-
+Apache web server
+-
+Nginx web server
+-
+Crate - The Distributed Database for Docker
+-
+GlassFish - Java EE 7 Application Server
+-
+Tomcat - An open-source web server and servlet container
+-
+InfluxDB - An open-source, distributed, time series database
+-
+Grafana - Metrics dashboard for InfluxDB
+-
+Jenkins - An extensible open source continuous integration server
+-
+MariaDB database
+-
+MySql database
+-
+Redis - Key-value cache and store
+-
+PostgreSQL database
+-
+MongoDB NoSQL database
+-
+Zend Server - The Complete PHP Application Platform
+
+-->
+
+
+-
+Apache web 服务器
+-
+Nginx web 服务器
+-
+Crate - Docker的分布式数据库
+-
+GlassFish - Java EE 7 应用服务器
+-
+Tomcat - 一个开源的 web 服务器和 servlet 容器
+-
+InfluxDB - 一个开源的、分布式的、时间序列数据库
+-
+Grafana -   InfluxDB 的度量仪表板
+-
+Jenkins - 一个可扩展的开放源码持续集成服务器
+-
+MariaDB 数据库
+-
+MySql 数据库
+-
+Redis - 键-值缓存和存储
+-
+PostgreSQL 数据库
+-
+MongoDB NoSQL 数据库
+-
+Zend 服务器 - 完整的 PHP 应用程序平台
+
+<!--
+This list will grow, and is curated [here](https://github.com/openstack/murano-apps/tree/master/Docker/Kubernetes). You can examine (and contribute to) the YAML file that tells Murano how to install and start the Kubernetes cluster [here](https://github.com/openstack/murano-apps/blob/master/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml).
+-->
+此列表将会增长，并在[此处](https://github.com/openstack/murano-apps/tree/master/Docker/Kubernetes)进行策划。您可以检查（并参与）YAML 文件，该文件告诉 Murano 如何根据[此处](https://github.com/openstack/murano-apps/blob/master/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml)定义来安装和启动 ...apps/blob/master/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml)安装和启动 Kubernetes 集群。
+
+<!--
+[The Kubernetes open source project](https://github.com/GoogleCloudPlatform/kubernetes) has continued to see fantastic community adoption and increasing momentum, with over 11,000 commits and 7,648 stars on GitHub. With supporters ranging from Red Hat and Intel to CoreOS and Box.net, it has come to represent a range of customer interests ranging from enterprise IT to cutting edge startups. We encourage you to give it a try, give us your feedback, and get involved in our growing community.
+-->
+[Kubernetes 开源项目](https://github.com/GoogleCloudPlatform/kubernetes)继续受到社区的欢迎，并且势头越来越好，GitHub 上有超过 11000 个提交和 7648 颗星。从 Red Hat 和 Intel 到 CoreOS 和 Box.net，它已经代表了从企业 IT 到前沿创业企业的一系列客户。我们鼓励您尝试一下，给我们您的反馈，并参与到我们不断增长的社区中来。
+
+
+<!--
+
+- Martin Buhr, Product Manager, Kubernetes Open Source Project
+
+-->
+
+- Martin Buhr, Kubernetes 开源项目产品经理
+

content/zh/blog/_posts/2015-05-00-Weekly-Kubernetes-Community-Hangout.md

@@ -0,0 +1,121 @@
+---
+title: " Kubernetes 社区每周聚会笔记- 2015年5月1日 "
+date: 2015-05-11
+slug: weekly-kubernetes-community-hangout
+url: /blog/2015/05/Weekly-Kubernetes-Community-Hangout
+---
+
+<!--
+---
+title: " Weekly Kubernetes Community Hangout Notes - May 1 2015 "
+date: 2015-05-11
+slug: weekly-kubernetes-community-hangout
+url: /blog/2015/05/Weekly-Kubernetes-Community-Hangout
+---
+-->
+
+<!--
+Every week the Kubernetes contributing community meet virtually over Google Hangouts. We want anyone who's interested to know what's discussed in this forum.
+-->
+每个星期，Kubernetes 贡献者社区几乎都会在谷歌 Hangouts 上聚会。我们希望任何对此感兴趣的人都能了解这个论坛的讨论内容。
+
+<!--
+
+* Simple rolling update - Brendan
+
+    * Rolling update = nice example of why RCs and Pods are good.
+
+    * ...pause… (Brendan needs demo recovery tips from Kelsey)
+
+    * Rolling update has recovery: Cancel update and restart, update continues from where it stopped.
+
+    * New controller  gets name of old controller, so appearance is pure update.
+
+    * Can also name versions in update (won't do rename at the end).
+
+-->  
+
+* 简单的滚动更新 - Brendan
+
+    * 滚动更新 = RCs和Pods很好的例子。
+
+    * ...pause… (Brendan 需要 Kelsey 的演示恢复技巧)
+
+    * 滚动更新具有恢复功能:取消更新并重新启动，更新从停止的地方继续。
+
+    * 新控制器获取旧控制器的名称，因此外观是纯粹的更新。
+
+    * 还可以在 update 中命名版本(最后不会重命名)。
+
+<!--
+
+* Rocket demo - CoreOS folks
+
+    * 2 major differences between rocket & docker: Rocket is daemonless & pod-centric.
+
+    * Rocket has AppContainer format as native, but also supports docker image format.
+
+    * Can run AppContainer and docker containers in same pod.
+
+    * Changes are close to merged.
+    
+-->
+
+* Rocket 演示 - CoreOS 的伙计们
+
+    * Rocket 和 docker 之间的主要区别: Rocket 是无守护进程和以 pod 为中心。。
+
+    * Rocket 具有原生的 AppContainer 格式，但也支持 docker 镜像格式。
+
+    * 可以在同一个 pod 中运行 AppContainer 和 docker 容器。
+
+    * 变更接近于合并。
+
+<!--
+
+* demo service accounts and secrets being added to pods - Jordan
+
+    * Problem: It's hard to get a token to talk to the API.
+
+    * New API object: "ServiceAccount"
+
+    * ServiceAccount is namespaced, controller makes sure that at least 1 default service account exists in a namespace.
+
+    * Typed secret "ServiceAccountToken", controller makes sure there is at least 1 default token.
+
+    * DEMO
+
+    *     * Can create new service account with ServiceAccountToken. Controller will create token for it.
+
+    * Can create a pod with service account, pods will have service account secret mounted at /var/run/secrets/kubernetes.io/…
+    
+-->
+
+* 演示 service accounts 和 secrets 被添加到 pod - Jordan
+
+    * 问题：很难获得与API通信的令牌。
+
+    * 新的API对象："ServiceAccount"
+
+    * ServiceAccount 是命名空间，控制器确保命名空间中至少存在一个个默认 service account。
+
+    * 键入 "ServiceAccountToken"，控制器确保至少有一个默认令牌。
+
+    * 演示
+
+    *     * 可以使用 ServiceAccountToken 创建新的 service account。控制器将为它创建令牌。
+
+    * 可以创建一个带有 service account 的 pod, pod 将在 /var/run/secrets/kubernets.io/…
+    
+<!--    
+    
+* Kubelet running in a container - Paul
+
+    * Kubelet successfully ran pod w/ mounted secret.
+
+-->
+    
+* Kubelet 在容器中运行 - Paul
+
+    * Kubelet 成功地运行了带有 secret 的 pod。
+    

content/zh/blog/_posts/2015-06-00-Slides-Cluster-Management-With.md

@@ -0,0 +1,25 @@
+---
+title: "幻灯片：Kubernetes 集群管理，爱丁堡大学演讲"
+date: 2015-06-26
+slug: slides-cluster-management-with
+url: /blog/2015/06/Slides-Cluster-Management-With
+---
+
+<!--
+---
+title: " Slides: Cluster Management with Kubernetes, talk given at the University of Edinburgh "
+date: 2015-06-26
+slug: slides-cluster-management-with
+url: /blog/2015/06/Slides-Cluster-Management-With
+---
+-->
+
+<!--
+On Friday 5 June 2015 I gave a talk called [Cluster Management with Kubernetes](https://docs.google.com/presentation/d/1H4ywDb4vAJeg8KEjpYfhNqFSig0Q8e_X5I36kM9S6q0/pub?start=false&loop=false&delayms=3000) to a general audience at the University of Edinburgh. The talk includes an example of a music store system with a Kibana front end UI and an Elasticsearch based back end which helps to make concrete concepts like pods, replication controllers and services.
+
+[Cluster Management with Kubernetes](https://docs.google.com/presentation/d/1H4ywDb4vAJeg8KEjpYfhNqFSig0Q8e_X5I36kM9S6q0/pub?start=false&loop=false&delayms=3000).
+-->
+
+2015年6月5日星期五，我在爱丁堡大学给普通听众做了一个演讲，题目是[使用 Kubernetes 进行集群管理](https://docs.google.com/presentation/d/1H4ywDb4vAJeg8KEjpYfhNqFSig0Q8e_X5I36kM9S6q0/pub?start=false&loop=false&delayms=3000)。这次演讲包括一个带有 Kibana 前端 UI 的音乐存储系统的例子，以及一个基于 Elasticsearch 的后端，该后端有助于生成具体的概念，如 pods、复制控制器和服务。
+
+[Kubernetes 集群管理](https://docs.google.com/presentation/d/1H4ywDb4vAJeg8KEjpYfhNqFSig0Q8e_X5I36kM9S6q0/pub?start=false&loop=false&delayms=3000)。

content/zh/blog/_posts/2016-02-00-Kubecon-Eu-2016-Kubernetes-Community-In.md

@@ -0,0 +1,84 @@
+---
+title: " KubeCon EU 2016：伦敦 Kubernetes 社区 "
+date: 2016-02-24
+slug: kubecon-eu-2016-kubernetes-community-in
+url: /blog/2016/02/Kubecon-Eu-2016-Kubernetes-Community-In
+---
+
+<!--
+---
+title: " KubeCon EU 2016: Kubernetes Community in London "
+date: 2016-02-24
+slug: kubecon-eu-2016-kubernetes-community-in
+url: /blog/2016/02/Kubecon-Eu-2016-Kubernetes-Community-In
+---
+-->
+
+<!--
+KubeCon EU 2016 is the inaugural [European Kubernetes](http://kubernetes.io/) community conference that follows on the American launch in November 2015. KubeCon is fully dedicated to education and community engagement for[Kubernetes](http://kubernetes.io/) enthusiasts, production users and the surrounding ecosystem.
+-->
+KubeCon EU 2016 是首届[欧洲 Kubernetes](http://kubernetes.io/) 社区会议，紧随 2015 年 11 月召开的北美会议。KubeCon 致力于为 [Kubernetes](http://kubernetes.io/) 爱好者、产品用户和周围的生态系统提供教育和社区参与。
+
+<!--
+Come join us in London and hang out with hundreds from the Kubernetes community and experience a wide variety of deep technical expert talks and use cases.
+-->
+快来加入我们在伦敦，与 Kubernetes 社区的数百人一起出去，体验各种深入的技术专家讲座和用例。
+
+<!--
+Don’t miss these great speaker sessions at the conference:
+-->
+不要错过这些优质的演讲：
+
+<!--
+* “Kubernetes Hardware Hacks: Exploring the Kubernetes API Through Knobs, Faders, and Sliders” by Ian Lewis and Brian Dorsey, Developer Advocate, Google -* [http://sched.co/6Bl3](http://sched.co/6Bl3)  
+
+* “rktnetes: what's new with container runtimes and Kubernetes” by Jonathan Boulle, Developer and Team Lead at CoreOS -* [http://sched.co/6BY7](http://sched.co/6BY7)
+
+* “Kubernetes Documentation: Contributing, fixing issues, collecting bounties” by John Mulhausen, Lead Technical Writer, Google -* [http://sched.co/6BUP](http://sched.co/6BUP)&nbsp;
+* “[What is OpenStack's role in a Kubernetes world?](https://kubeconeurope2016.sched.org/event/6BYC/what-is-openstacks-role-in-a-kubernetes-world?iframe=yes&w=i:0;&sidebar=yes&bg=no#?iframe=yes&w=i:100;&sidebar=yes&bg=no)” By Thierry Carrez, Director of Engineering, OpenStack Foundation -* http://sched.co/6BYC
+* “A Practical Guide to Container Scheduling” by Mandy Waite, Developer Advocate, Google -* [http://sched.co/6BZa](http://sched.co/6BZa)  
+
+* “[Kubernetes in Production in The New York Times newsroom](https://kubeconeurope2016.sched.org/event/67f2/kubernetes-in-production-in-the-new-york-times-newsroom?iframe=yes&w=i:0;&sidebar=yes&bg=no#?iframe=yes&w=i:100;&sidebar=yes&bg=no)” Eric Lewis, Web Developer, New York Times -* [http://sched.co/67f2](http://sched.co/67f2)
+* “[Creating an Advanced Load Balancing Solution for Kubernetes with NGINX](https://kubeconeurope2016.sched.org/event/6Bc9/creating-an-advanced-load-balancing-solution-for-kubernetes-with-nginx?iframe=yes&w=i:0;&sidebar=yes&bg=no#?iframe=yes&w=i:100;&sidebar=yes&bg=no)” by Andrew Hutchings, Technical Product Manager, NGINX -* http://sched.co/6Bc9
+* And many more http://kubeconeurope2016.sched.org/
+-->
+
+* “Kubernetes 硬件黑客：通过旋钮、推杆和滑块探索 Kubernetes API” 演讲者 Ian Lewis 和 Brian Dorsey，谷歌开发布道师* [http://sched.co/6Bl3](http://sched.co/6Bl3)  
+
+* “rktnetes: 容器运行时和 Kubernetes 的新功能” 演讲者 Jonathan Boulle, CoreOS 的主程 -* [http://sched.co/6BY7](http://sched.co/6BY7)
+
+* “Kubernetes 文档：贡献、修复问题、收集奖金” 作者：John Mulhausen，首席技术作家，谷歌 -* [http://sched.co/6BUP](http://sched.co/6BUP)&nbsp;
+* “[OpenStack 在 Kubernetes 的世界中扮演什么角色？](https://kubeconeurope2016.sched.org/event/6BYC/what-is-openstacks-role-in-a-kubernetes-world?iframe=yes&w=i:0;&sidebar=yes&bg=no#?iframe=yes&w=i:100;&sidebar=yes&bg=no)” 作者：Thierry carez, OpenStack 基金会工程总监 -* http://sched.co/6BYC
+* “容器调度的实用指南” 作者：Mandy Waite，开发者倡导者，谷歌 -* [http://sched.co/6BZa](http://sched.co/6BZa)  
+
+* “[《纽约时报》编辑部正在制作 Kubernetes](https://kubeconeurope2016.sched.org/event/67f2/kubernetes-in-production-in-the-new-york-times-newsroom?iframe=yes&w=i:0;&sidebar=yes&bg=no#?iframe=yes&w=i:100;&sidebar=yes&bg=no)” Eric Lewis，《纽约时报》网站开发人员 -* [http://sched.co/67f2](http://sched.co/67f2)
+* “[使用 NGINX 为 Kubernetes 创建一个高级负载均衡解决方案](https://kubeconeurope2016.sched.org/event/6Bc9/creating-an-advanced-load-balancing-solution-for-kubernetes-with-nginx?iframe=yes&w=i:0;&sidebar=yes&bg=no#?iframe=yes&w=i:100;&sidebar=yes&bg=no)” 作者：Andrew Hutchings, NGINX 技术产品经理 -* http://sched.co/6Bc9
+* 还有更多 http://kubeconeurope2016.sched.org/
+
+<!--
+Get your KubeCon EU [tickets here](https://ti.to/kubecon/kubecon-eu-2016).
+-->
+[在这里](https://ti.to/kubecon/kubecon-eu-2016)获取您的 KubeCon EU 门票。
+
+<!--
+Venue Location: CodeNode * 10 South Pl, London, United Kingdom  
+Accommodations: [hotels](https://skillsmatter.com/contact-us#hotels)   
+Website: [kubecon.io](https://www.kubecon.io/)   
+Twitter: [@KubeConio](https://twitter.com/kubeconio) #KubeCon
+Google is a proud Diamond sponsor of KubeCon EU 2016. Come to London next month, March 10th & 11th, and visit booth #13 to learn all about Kubernetes, Google Container Engine (GKE) and Google Cloud Platform!  
+-->
+会场地址：CodeNode * 英国伦敦南广场 10 号
+酒店住宿：[酒店](https://skillsmatter.com/contact-us)
+网站：[kubecon.io] (https://www.kubecon.io/)
+推特：[@KubeConio] (https://twitter.com/kubeconio)
+谷歌是 KubeCon EU 2016 的钻石赞助商。下个月 3 月 10 - 11 号来伦敦，参观 13 号展位，了解 Kubernetes，Google Container Engine（GKE），Google Cloud Platform 的所有信息!
+
+<!--
+_KubeCon is organized by KubeAcademy, LLC, a community-driven group of developers focused on the education of developers and the promotion of Kubernetes._  
+
+-* Sarah Novotny, Kubernetes Community Manager, Google  
+-->
+
+_KubeCon 是由 KubeAcademy、LLC 组织的，这是一个由社区驱动的开发者团体，专注于开发人员的教育和 kubernet.com 的推广
+-* Sarah Novotny, 谷歌的 Kubernetes 社区经理
+

content/zh/blog/_posts/2016-04-00-Kubernetes-Network-Policy-APIs.md

@@ -1,3 +1,10 @@
+---
+title: " SIG-Networking: Kubernetes Network Policy APIs Coming in 1.3 "
+date: 2016-04-18
+slug: kubernetes-network-policy-apis
+url: /blog/2016/04/Kubernetes-Network-Policy-APIs
+---
+
 <!-- ---
 title: " SIG-Networking: Kubernetes Network Policy APIs Coming in 1.3 "
 date: 2016-04-18
@@ -5,13 +12,6 @@ slug: kubernetes-network-policy-apis
 url: /blog/2016/04/Kubernetes-Network-Policy-APIs
 --- -->
 
----
-title: "SIG-Networking: Kubernetes Network Policy APIs Coming in 1.3 "
-date: 2016-04-18
-slug: kubernetes-network-policy-apis
-url: /blog/2016/04/Kubernetes-Network-Policy-APIs
----
-
 <!-- _Editor’s note: This week we’re featuring [Kubernetes Special Interest Groups](https://github.com/kubernetes/kubernetes/wiki/Special-Interest-Groups-(SIGs)); Today’s post is by the Network-SIG team describing network policy APIs coming in 1.3 - policies for security, isolation and multi-tenancy._ -->
 
 编者按：这一周，我们的封面主题是 [Kubernetes 特别兴趣小组](https://github.com/kubernetes/kubernetes/wiki/Special-Interest-Groups-(SIGs))；今天的文章由网络兴趣小组撰写，来谈谈 1.3 版本中即将出现的网络策略 API - 针对安全，隔离和多租户的策略。

content/zh/blog/_posts/2016-04-00-Kubernetes-On-Aws_15.md

@@ -1,10 +1,3 @@
-<!-- ---
-title: " How to deploy secure, auditable, and reproducible Kubernetes clusters on AWS "
-date: 2016-04-15
-slug: kubernetes-on-aws_15
-url: /blog/2016/04/Kubernetes-On-Aws_15
---- -->
-
 ---
 title: " 如何在AWS上部署安全，可审计，可复现的k8s集群 "
 date: 2016-04-15
@@ -12,6 +5,13 @@ slug: kubernetes-on-aws_15
 url: /blog/2016/04/Kubernetes-On-Aws_15
 ---
 
+<!-- ---
+title: " How to deploy secure, auditable, and reproducible Kubernetes clusters on AWS "
+date: 2016-04-15
+slug: kubernetes-on-aws_15
+url: /blog/2016/04/Kubernetes-On-Aws_15
+--- -->
+
 <!-- _Today’s guest post is written by Colin Hom, infrastructure engineer at [CoreOS](https://coreos.com/), the company delivering Google’s Infrastructure for Everyone Else (#GIFEE) and running the world's containers securely on CoreOS Linux, Tectonic and Quay._
 
 _Join us at [CoreOS Fest Berlin](https://coreos.com/fest/), the Open Source Distributed Systems Conference, and learn more about CoreOS and Kubernetes._ -->

content/zh/blog/_posts/2016-07-00-Citrix-Netscaler-And-Kubernetes.md

@@ -0,0 +1,72 @@
+---
+title: " Citrix + Kubernetes = 全垒打 "
+date: 2016-07-14
+slug: citrix-netscaler-and-kubernetes
+url: /blog/2016/07/Citrix-Netscaler-And-Kubernetes
+---
+
+<!--
+---
+title: " Citrix + Kubernetes = A Home Run "
+date: 2016-07-14
+slug: citrix-netscaler-and-kubernetes
+url: /blog/2016/07/Citrix-Netscaler-And-Kubernetes
+---
+-->
+
+<!--
+_Editor’s note: today’s guest post is by Mikko Disini, a Director of Product Management at Citrix Systems, sharing their collaboration experience on a Kubernetes integration.&nbsp;_  
+-->
+编者按：今天的客座文章来自 Citrix Systems 的产品管理总监 Mikko Disini，他分享了他们在 Kubernetes 集成上的合作经验。&nbsp;_ 
+
+<!--
+Technical collaboration is like sports. If you work together as a team, you can go down the homestretch and pull through for a win. That’s our experience with the Google Cloud Platform team.  
+-->
+技术合作就像体育运动。如果你能像一个团队一样合作，你就能在最后关头取得胜利。这就是我们对谷歌云平台团队的经验。
+
+<!--
+Recently, we approached Google Cloud Platform (GCP) to collaborate on behalf of Citrix customers and the broader enterprise market looking to migrate workloads.&nbsp;This migration required including the [NetScaler Docker load balancer](https://www.citrix.com/blogs/2016/06/20/the-best-docker-load-balancer-at-dockercon-in-seattle-this-week/), CPX, into Kubernetes nodes and resolving any issues with getting traffic into the CPX proxies. &nbsp;  
+-->
+最近，我们与 Google 云平台（GCP）联系，代表 Citrix 客户以及更广泛的企业市场，希望就工作负载的迁移进行协作。此迁移需要将 [NetScaler Docker 负载均衡器]https://www.citrix.com/blogs/2016/06/20/the-best-docker-load-balancer-at-dockercon-in-seattle-this-week/) CPX 包含到 Kubernetes 节点中，并解决将流量引入 CPX 代理的任何问题。  
+
+<!--
+**Why NetScaler and Kubernetes?**  
+-->
+
+**为什么是 NetScaler 和 Kubernetes**
+
+<!--
+1. Citrix customers want the same Layer 4 to Layer 7 capabilities from NetScaler that they have on-prem as they move to the cloud as they begin deploying their container and microservices architecture with Kubernetes&nbsp;
+2. Kubernetes provides a proven infrastructure for running containers and VMs with automated workload delivery
+3. NetScaler CPX provides Layer 4 to Layer 7 services and highly efficient telemetry data to a logging and analytics platform, [NetScaler Management and Analytics System](https://www.citrix.com/blogs/2016/05/24/introducing-the-next-generation-netscaler-management-and-analytics-system/)
+-->
+
+1. Citrix 的客户希望他们开始使用 Kubernetes 部署他们的容器和微服务体系结构时，能够像当初迁移到云计算时一样，享有 NetScaler 所提供的第 4 层到第 7 层能力&nbsp;
+2. Kubernetes 提供了一套经过验证的基础设施，可用来运行容器和虚拟机，并自动交付工作负载；  
+3. NetScaler CPX 提供第 4 层到第 7 层的服务，并为日志和分析平台 [NetScaler 管理和分析系统](https://www.citrix.com/blogs/2016/05/24/introducing-the-next-generation-netscaler-management-and-analytics-system/) 提供高效的度量数据。
+
+<!--
+I wish all our experiences working together with a technical partner were as good as working with GCP. We had a list of issues to enable our use cases and were able to collaborate swiftly on a solution. To resolve these, GCP team offered in depth technical assistance, working with Citrix such that NetScaler CPX can spin up and take over as a client-side proxy running on each host.&nbsp;  
+-->
+我希望我们所有与技术合作伙伴一起工作的经验都能像与 GCP 一起工作一样好。我们有一个列表，包含支持我们的用例所需要解决的问题。我们能够快速协作形成解决方案。为了解决这些问题，GCP 团队提供了深入的技术支持，与 Citrix 合作，从而使得 NetScaler CPX 能够在每台主机上作为客户端代理启动运行。
+
+<!--
+Next, NetScaler CPX needed to be inserted in the data path of GCP ingress load balancer so that NetScaler CPX can spread traffic to front end web servers. The NetScaler team made modifications so that NetScaler CPX listens to API server events and configures itself to create a VIP, IP table rules and server rules to take ingress traffic and load balance across front end applications. Google Cloud Platform team provided feedback and assistance to verify modifications made to overcome the technical hurdles. Done!  
+-->
+接下来，需要在 GCP 入口负载均衡器的数据路径中插入 NetScaler CPX，使 NetScaler CPX 能够将流量分散到前端 web 服务器。NetScaler 团队进行了修改，以便 NetScaler CPX 监听 API 服务器事件，并配置自己来创建 VIP、IP 表规则和服务器规则，以便跨前端应用程序接收流量和负载均衡。谷歌云平台团队提供反馈和帮助，验证为克服技术障碍所做的修改。完成了!
+
+<!--
+NetScaler CPX use case is supported in [Kubernetes 1.3](https://kubernetes.io/blog/2016/07/kubernetes-1.3-bridging-cloud-native-and-enterprise-workloads). Citrix customers and the broader enterprise market will have the opportunity to leverage NetScaler with Kubernetes, thereby lowering the friction to move workloads to the cloud.&nbsp;  
+-->
+NetScaler CPX 用例在 [Kubernetes 1.3](https://kubernetes.io/blog/2016/07/kubernets-1.3 - bridge -cloud-native-and-enterprise-workload) 中提供支持。Citrix 的客户和更广泛的企业市场将有机会基于 Kubernetes 享用 NetScaler 服务，从而降低将工作负载转移到云平台的阻力。&nbsp;
+
+<!--
+You can learn more about&nbsp;NetScaler CPX [here](https://www.citrix.com/networking/microservices.html).  
+-->
+您可以在[此处](https://www.citrix.com/networking/microservices.html)了解有关 NetScaler CPX 的更多信息。
+
+<!--
+_&nbsp;-- Mikko Disini, Director of Product Management - NetScaler, Citrix Systems_
+-->
+_&nbsp;-- Mikko Disini，Citrix Systems NetScaler 产品管理总监
+

content/zh/blog/_posts/2017-10-00-Five-Days-Of-Kubernetes-18.md

@@ -0,0 +1,72 @@
+---
+title: " Kubernetes 1.8 的五天 "
+date: 2017-10-24
+slug: five-days-of-kubernetes-18
+url: /blog/2017/10/Five-Days-Of-Kubernetes-18
+---
+
+<!--
+---
+title: " Five Days of Kubernetes 1.8 "
+date: 2017-10-24
+slug: five-days-of-kubernetes-18
+url: /blog/2017/10/Five-Days-Of-Kubernetes-18
+---
+-->
+
+<!--
+Kubernetes 1.8 is live, made possible by hundreds of contributors pushing thousands of commits in this latest releases.  
+-->
+Kubernetes 1.8 是现场直播，数百名贡献者在这个最新版本中推出了成千上万的提交。
+
+<!--
+The community has tallied more than 66,000 commits in the main repo and continues rapid growth outside of the main repo, which signals growing maturity and stability for the project. The community has logged more than 120,000 commits across all repos and 17,839 commits across all repos for v1.7.0 to v1.8.0 alone.  
+-->
+社区已经有超过 66,000 个提交在主仓库，并在主仓库之外继续快速增长，这标志着该项目日益成熟和稳定。仅 v1.7.0 到 v1.8.0，社区就记录了所有仓库的超过 120,000 次提交和 17839 次提交。
+
+<!--
+With the help of our growing community of 1,400 plus contributors, we issued more than 3,000 PRs and pushed more than 5,000 commits to deliver Kubernetes 1.8 with significant security and workload support updates. This all points to increased stability, a result of our project-wide focus on maturing [process](https://github.com/kubernetes/sig-release), formalizing [architecture](https://github.com/kubernetes/community/tree/master/sig-architecture), and strengthening Kubernetes’ [governance model](https://github.com/kubernetes/community/tree/master/community/elections/2017).  
+-->
+在拥有 1400 多名贡献者，并且不断发展壮大的社区的帮助下，我们合并了 3000 多个 PR，并发布了 5000 多个提交，最后的 Kubernetes 1.8 在安全和工作负载方面添加了很多的更新。
+这一切都表明稳定性的提高，这是我们整个项目关注成熟[流程](https://github.com/kubernetes/sig-release)、形式化[架构](https://github.com/kubernetes/community/tree/master/sig-architecture)和加强 Kubernetes 的[治理模型](https://github.com/kubernetes/community/tree/master/community/elections/2017)的结果。
+
+<!--
+While many improvements have been contributed, we highlight key features in this series of in-depth&nbsp;posts listed below. [Follow along](https://twitter.com/kubernetesio) and see what’s new and improved with storage, security and more.  
+-->
+虽然有很多改进，但我们在下面列出的这一系列深度文章中突出了一些关键特性。[跟随](https://twitter.com/kubernetesio)并了解存储，安全等方面的新功能和改进功能。
+
+<!--
+**Day 1:** [5 Days of Kubernetes 1.8](https://kubernetes.io/blog/2017/10/five-days-of-kubernetes-18)  
+**Day 2:** [kubeadm v1.8 Introduces Easy Upgrades for Kubernetes Clusters](https://kubernetes.io/blog/2017/10/kubeadm-v18-released)  
+**Day 3:** [Kubernetes v1.8 Retrospective: It Takes a Village to Raise a Kubernetes](https://kubernetes.io/blog/2017/10/it-takes-village-to-raise-kubernetes)
+**Day 4:** [Using RBAC, Generally Available in Kubernetes v1.8](https://kubernetes.io/blog/2017/10/using-rbac-generally-available-18)  
+**Day 5:** [Enforcing Network Policies in Kubernetes](https://kubernetes.io/blog/2017/10/enforcing-network-policies-in-kubernetes)  
+-->
+
+**第一天：** [Kubernetes 1.8 的五天](https://kubernetes.io/blog/2017/10/five-days-of-kubernetes-18)  
+**第二天：** [kubeadm v1.8 为 Kubernetes 集群引入了简单的升级](https://kubernetes.io/blog/2017/10/kubeadm-v18-released)  
+**第三天：** [Kubernetes v1.8 回顾：提升一个 Kubernetes 需要一个 Village](https://kubernetes.io/blog/2017/10/it-takes-village-to-raise-kubernetes)
+**第四天：** [使用 RBAC，一般在 Kubernetes v1.8 中提供](https://kubernetes.io/blog/2017/10/using-rbac-generally-available-18)  
+**第五天：** [在 Kubernetes 执行网络策略](https://kubernetes.io/blog/2017/10/enforcing-network-policies-in-kubernetes)  
+
+<!--
+**Connect**  
+-->
+
+**链接**  
+
+<!--
+- Post questions (or answer questions) on [Stack Overflow](http://stackoverflow.com/questions/tagged/kubernetes)
+- Join the community portal for advocates on [K8sPort](http://k8sport.org/)
+- Follow us on Twitter [@Kubernetesio](https://twitter.com/kubernetesio) for latest updates&nbsp;
+- Connect with the community on [Slack](http://slack.k8s.io/)
+- Get involved with the Kubernetes project on [GitHub](https://github.com/kubernetes/kubernetes)
+-->
+
+- 在 [Stack Overflow](http://stackoverflow.com/questions/tagged/kubernetes) 上发布问题（或回答问题）
+- 加入 [K8sPort](http://k8sport.org/) 布道师的社区门户网站
+- 在 Twitter [@Kubernetesio](https://twitter.com/kubernetesio) 关注我们以获取最新更新
+- 与 [Slack](http://slack.k8s.io/) 上的社区联系
+- 参与 [GitHub](https://github.com/kubernetes/kubernetes) 上的 Kubernetes 项目 
+
+

content/zh/blog/_posts/2017-11-00-Autoscaling-In-Kubernetes.md

@@ -0,0 +1,32 @@
+---
+title: " Kubernetes 中自动缩放 "
+date: 2017-11-17
+slug: autoscaling-in-kubernetes
+url: /blog/2017/11/Autoscaling-In-Kubernetes
+---
+
+<!--
+---
+title: " Autoscaling in Kubernetes "
+date: 2017-11-17
+slug: autoscaling-in-kubernetes
+url: /blog/2017/11/Autoscaling-In-Kubernetes
+---
+-->
+
+<!--
+Kubernetes allows developers to automatically adjust cluster sizes and the number of pod replicas based on current traffic and load. These adjustments reduce the amount of unused nodes, saving money and resources. In this talk, Marcin Wielgus of Google walks you through the current state of pod and node autoscaling in Kubernetes: .how it works, and how to use it, including best practices for deployments in production applications.  
+-->
+Kubernetes 允许开发人员根据当前的流量和负载自动调整集群大小和 pod 副本的数量。这些调整减少了未使用节点的数量，节省了资金和资源。
+在这次演讲中，谷歌的 Marcin Wielgus 将带领您了解 Kubernetes 中 pod 和 node 自动调焦的当前状态：它是如何工作的，以及如何使用它，包括在生产应用程序中部署的最佳实践。
+
+<!--
+Enjoyed this talk? Join us for more exciting sessions on scaling and automating your Kubernetes clusters at KubeCon in Austin on December 6-8. [Register Now](https://www.eventbrite.com/e/kubecon-cloudnativecon-north-america-registration-37824050754?_ga=2.9666039.317115486.1510003873-1623727562.1496428006)  
+-->
+喜欢这个演讲吗？ 12 月 6 日至 8 日，在 Austin 参加 KubeCon 关于扩展和自动化您的 Kubernetes 集群的更令人兴奋的会议。[现在注册](https://www.eventbrite.com/e/kubecon-cloudnativecon-north-america-registration-37824050754?_ga=2.9666039.317115486.1510003873-1623727562.1496428006)。
+
+<!--
+Be sure to check out [Automating and Testing Production Ready Kubernetes Clusters in the Public Cloud](http://sched.co/CU64) by Ron Lipke, Senior Developer, Platform as a Service, Gannet/USA Today Network.
+-->
+一定要查看由 Ron Lipke， Gannet/USA Today Network, 平台即服务高级开发人员，在[公共云中自动化和测试产品就绪的 Kubernetes 集群](http://sched.co/CU64)。
+

content/zh/blog/_posts/2018-05-01-developing-on-kubernetes.md

@@ -0,0 +1,728 @@
+---
+title: 在 Kubernetes 上开发
+date: 2018-05-01
+slug: developing-on-kubernetes
+---
+
+<!--
+---
+title: Developing on Kubernetes
+date: 2018-05-01
+slug: developing-on-kubernetes
+---
+-->
+
+<!--**Authors**:-->
+**作者**： [Michael Hausenblas](https://twitter.com/mhausenblas) (Red Hat), [Ilya Dmitrichenko](https://twitter.com/errordeveloper) (Weaveworks)
+
+<!-- 
+How do you develop a Kubernetes app? That is, how do you write and test an app that is supposed to run on Kubernetes? This article focuses on the challenges, tools and methods you might want to be aware of to successfully write Kubernetes apps alone or in a team setting. 
+-->
+
+您将如何开发一个 Kubernates 应用？也就是说，您如何编写并测试一个要在 Kubernates 上运行的应用程序？本文将重点介绍在独自开发或者团队协作中，您可能希望了解到的为了成功编写 Kubernetes 应用程序而需面临的挑战，工具和方法。
+
+<!--
+We’re assuming you are a developer, you have a favorite programming language, editor/IDE, and a testing framework available. The overarching goal is to introduce minimal changes to your current workflow when developing the app for Kubernetes. For example, if you’re a Node.js developer and are used to a hot-reload setup—that is, on save in your editor the running app gets automagically updated—then dealing with containers and container images, with container registries, Kubernetes deployments, triggers, and more can not only be overwhelming but really take all the fun out if it.
+-->
+
+我们假定您是一位开发人员，有您钟爱的编程语言，编辑器/IDE（集成开发环境），以及可用的测试框架。在针对 Kubernates 开发应用时，最重要的目标是减少对当前工作流程的影响，改变越少越好，尽量做到最小。举个例子，如果您是 Node.js 开发人员，习惯于那种热重载的环境 - 也就是说您在编辑器里一做保存，正在运行的程序就会自动更新 - 那么跟容器、容器镜像或者镜像仓库打交道，又或是跟 Kubernetes 部署、triggers 以及更多头疼东西打交道，不仅会让人难以招架也真的会让开发过程完全失去乐趣。
+
+<!--
+In the following, we’ll first discuss the overall development setup, then review tools of the trade, and last but not least do a hands-on walkthrough of three exemplary tools that allow for iterative, local app development against Kubernetes.
+-->
+
+在下文中，我们将首先讨论 Kubernetes 总体开发环境，然后回顾常用工具，最后进行三个示例性工具的实践演练。这些工具允许针对 Kubernetes 进行本地应用程序的开发和迭代。
+
+<!--
+## Where to run your cluster?
+-->
+
+## 您的集群运行在哪里？
+
+<!--
+As a developer you want to think about where the Kubernetes cluster you’re developing against runs as well as where the development environment sits. Conceptually there are four development modes:
+-->
+
+作为开发人员，您既需要考虑所针对开发的 Kubernetes 集群运行在哪里，也需要思考开发环境如何配置。概念上，有四种开发模式：
+
+![Dev Modes](/images/blog/2018-05-01-developing-on-kubernetes/dok-devmodes_preview.png)
+
+<!--
+A number of tools support pure offline development including Minikube, Docker for Mac/Windows, Minishift, and the ones we discuss in detail below. Sometimes, for example, in a microservices setup where certain microservices already run in the cluster, a proxied setup (forwarding traffic into and from the cluster) is preferable and Telepresence is an example tool in this category. The live mode essentially means you’re building and/or deploying against a remote cluster and, finally, the pure online mode means both your development environment and the cluster are remote, as this is the case with, for example, [Eclipse Che](https://www.eclipse.org/che/docs/kubernetes-single-user.html) or [Cloud 9](https://github.com/errordeveloper/k9c). Let’s now have a closer look at the basics of offline development: running Kubernetes locally.
+-->
+
+许多工具支持纯 offline 开发，包括 Minikube、Docker（Mac 版/Windows 版）、Minishift 以及下文中我们将详细讨论的几种。有时，比如说在一个微服务系统中，已经有若干微服务在运行，proxied 模式（通过转发把数据流传进传出集群）就非常合适，Telepresence 就是此类工具的一个实例。live 模式，本质上是您基于一个远程集群进行构建和部署。最后，纯 online 模式意味着您的开发环境和运行集群都是远程的，典型的例子是 [Eclipse Che](https://www.eclipse.org/che/docs/kubernetes-single-user.html) 或者 [Cloud 9](https://github.com/errordeveloper/k9c)。现在让我们仔细看看离线开发的基础：在本地运行 Kubernetes。
+
+<!--
+[Minikube](/docs/getting-started-guides/minikube/) is a popular choice for those who prefer to run Kubernetes in a local VM. More recently Docker for [Mac](https://docs.docker.com/docker-for-mac/kubernetes/) and [Windows](https://docs.docker.com/docker-for-windows/kubernetes/) started shipping Kubernetes as an experimental package (in the “edge” channel). Some reasons why you may want to prefer using Minikube over the Docker desktop option are:
+-->
+
+[Minikube](/docs/getting-started-guides/minikube/) 在更加喜欢于本地 VM 上运行 Kubernetes 的开发人员中，非常受欢迎。不久前，Docker 的 [Mac](https://docs.docker.com/docker-for-mac/kubernetes/) 版和 [Windows](https://docs.docker.com/docker-for-windows/kubernetes/) 版，都试验性地开始自带 Kubernetes（需要下载 “edge” 安装包）。在两者之间，以下原因也许会促使您选择 Minikube 而不是 Docker 桌面版：
+
+<!--
+* You already have Minikube installed and running
+* You prefer to wait until Docker ships a stable package
+* You’re a Linux desktop user
+* You are a Windows user who doesn’t have Windows 10 Pro with Hyper-V
+-->
+
+* 您已经安装了 Minikube 并且它运行良好
+* 您想等到 Docker 出稳定版本
+* 您是 Linux 桌面用户
+* 您是 Windows 用户，但是没有配有 Hyper-V 的 Windows 10 Pro
+
+<!--
+Running a local cluster allows folks to work offline and that you don’t have to pay for using cloud resources. Cloud provider costs are often rather affordable and free tiers exists, however some folks prefer to avoid having to approve those costs with their manager as well as potentially incur unexpected costs, for example, when leaving cluster running over the weekend.
+-->
+
+运行一个本地集群，开发人员可以离线工作，不用支付云服务。云服务收费一般不会太高，并且免费的等级也有，但是一些开发人员不喜欢为了使用云服务而必须得到经理的批准，也不愿意支付意想不到的费用，比如说忘了下线而集群在周末也在运转。
+
+<!--
+Some developers prefer to use a remote Kubernetes cluster, and this is usually to allow for larger compute and storage capacity and also enable collaborative workflows more easily. This means it’s easier for you to pull in a colleague to help with debugging or share access to an app in the team. Additionally, for some developers it can be critical to mirror production environment as closely as possible, especially when it comes down to external cloud services, say,  proprietary databases, object stores, message queues, external load balancer, or mail delivery systems.
+-->
+
+有些开发人员却更喜欢远程的 Kubernetes 集群，这样他们通常可以获得更大的计算能力和存储容量，也简化了协同工作流程。您可以更容易的拉上一个同事来帮您调试，或者在团队内共享一个应用的使用。再者，对某些开发人员来说，尽可能的让开发环境类似生产环境至关重要，尤其是您依赖外部厂商的云服务时，如：专有数据库、云对象存储、消息队列、外商的负载均衡器或者邮件投递系统。
+
+<!--
+In summary, there are good reasons for you to develop against a local cluster as well as a remote one. It very much depends on in which phase you are: from early prototyping and/or developing alone to integrating a set of more stable microservices.
+-->
+
+总之，无论您选择本地或者远程集群，理由都足够多。这很大程度上取决于您所处的阶段：从早期的原型设计/单人开发到后期面对一批稳定微服务的集成。
+
+<!--
+Now that you have a basic idea of the options around the runtime environment, let’s move on to how to iteratively develop and deploy your app.
+-->
+
+既然您已经了解到运行环境的基本选项，那么我们就接着讨论如何迭代式的开发并部署您的应用。
+
+<!--
+## The tools of the trade
+-->
+
+## 常用工具
+
+<!--
+We are now going to review tooling allowing you to develop apps on Kubernetes with the focus on having minimal impact on your existing workflow. We strive to provide an unbiased description including implications of using each of the tools in general terms.
+-->
+
+我们现在回顾既可以允许您可以在 Kubernetes 上开发应用程序又尽可能最小地改变您现有的工作流程的一些工具。我们致力于提供一份不偏不倚的描述，也会提及使用某个工具将会意味着什么。
+
+<!--
+Note that this is a tricky area since even for established technologies such as, for example, JSON vs YAML vs XML or REST vs gRPC vs SOAP a lot depends on your background, your preferences and organizational settings. It’s even harder to compare tooling in the Kubernetes ecosystem as things evolve very rapidly and new tools are announced almost on a weekly basis; during the preparation of this post alone, for example, [Gitkube](https://gitkube.sh/) and [Watchpod](https://github.com/MinikubeAddon/watchpod) came out. To cover these new tools as well as related, existing tooling such as [Weave Flux](https://github.com/weaveworks/flux) and OpenShift’s [S2I](https://docs.openshift.com/container-platform/3.9/creating_images/s2i.html) we are planning a follow-up blog post to the one you’re reading.
+-->
+
+请注意这很棘手，因为即使在成熟定型的技术中做选择，比如说在 JSON、YAML、XML、REST、gRPC 或者 SOAP 之间做选择，很大程度也取决于您的背景、喜好以及公司环境。在 Kubernetes 生态系统内比较各种工具就更加困难，因为技术发展太快，几乎每周都有新工具面市；举个例子，仅在准备这篇博客的期间，[Gitkube](https://gitkube.sh/) 和 [Watchpod](https://github.com/MinikubeAddon/watchpod) 相继出品。为了进一步覆盖到这些新的，以及一些相关的已推出的工具，例如 [Weave Flux](https://github.com/weaveworks/flux) 和 OpenShift 的 [S2I](https://docs.openshift.com/container-platform/3.9/creating_images/s2i.html)，我们计划再写一篇跟进的博客。
+
+### Draft
+
+
+<!--
+[Draft](https://github.com/Azure/draft) aims to help you get started deploying any app to Kubernetes. It is capable of applying heuristics as to what programming language your app is written in and generates a Dockerfile along with a Helm chart. It then runs the build for you and deploys resulting image to the target cluster via the Helm chart. It also allows user to setup port forwarding to localhost very easily.
+-->
+
+[Draft](https://github.com/Azure/draft) 旨在帮助您将任何应用程序部署到 Kubernetes。它能够检测到您的应用所使用的编程语言，并且生成一份 Dockerfile 和 Helm 图表。然后它替您启动构建并且依照 Helm 图表把所生产的镜像部署到目标集群。它也可以让您很容易地设置到 localhost 的端口映射。
+
+<!--
+Implications:
+-->
+
+这意味着：
+
+<!--
+* User can customise the chart and Dockerfile templates however they like, or even create a [custom pack](https://github.com/Azure/draft/blob/master/docs/reference/dep-003.md) (with Dockerfile, the chart and more) for future use
+-->
+* 用户可以任意地自定义 Helm 图表和 Dockerfile 模版，或者甚至创建一个 [custom pack](https://github.com/Azure/draft/blob/master/docs/reference/dep-003.md)（使用 Dockerfile、Helm 图表以及其他）以备后用
+
+<!--
+* It’s not very simple to guess how just any app is supposed to be built, in some cases user may need to tweak Dockerfile and the Helm chart that Draft generates
+-->
+* 要想理解一个应用应该怎么构建并不容易，在某些情况下，用户也许需要修改 Draft 生成的 Dockerfile 和 Heml 图表
+
+<!--
+* With [Draft version 0.12.0](https://github.com/Azure/draft/releases/tag/v0.12.0) or older, every time user wants to test a change, they need to wait for Draft to copy the code to the cluster, then run the build, push the image and release updated chart; this can timely, but it results in an image being for every single change made by the user (whether it was committed to git or not)
+-->
+* 如果使用 [Draft version 0.12.0](https://github.com/Azure/draft/releases/tag/v0.12.0)<sup>1</sup> 或者更老版本，每一次用户想要测试一个改动，他们需要等 Draft 把代码拷贝到集群，运行构建，推送镜像并且发布更新后的图表；这些步骤可能进行得很快，但是每一次用户的改动都会产生一个镜像（无论是否提交到 git ）
+
+<!--
+* As of Draft version 0.12.0, builds are executed locally
+* User doesn’t have an option to choose something other than Helm for deployment
+* It can watch local changes and trigger deployments, but this feature is not enabled by default
+-->
+* 在 Draft 0.12.0版本，构建是本地进行的
+* 用户不能选择 Helm 以外的工具进行部署
+* 它可以监控本地的改动并且触发部署，但是这个功能默认是关闭的
+
+<!--
+* It allows developer to use either local or remote Kubernetes cluster
+* Deploying to production is up to the user, Draft authors recommend their other project – Brigade
+* Can be used instead of Skaffold, and along the side of Squash
+-->
+* 它允许开发人员使用本地或者远程的 Kubernates 集群
+* 如何部署到生产环境取决于用户， Draft 的作者推荐了他们的另一个项目 - Brigade
+* 可以代替 Skaffold， 并且可以和 Squash 一起使用
+
+<!--
+More info:
+-->
+
+更多信息：
+
+* [Draft: Kubernetes container development made easy](https://kubernetes.io/blog/2017/05/draft-kubernetes-container-development)
+* [Getting Started Guide](https://github.com/Azure/draft/blob/master/docs/getting-started.md)
+
+【1】：此处疑为 0.11.0，因为 0.12.0 已经支持本地构建，见下一条
+
+### Skaffold
+
+<!--
+[Skaffold](https://github.com/GoogleCloudPlatform/skaffold) is a tool that aims to provide portability for CI integrations with different build system, image registry and deployment tools. It is different from Draft, yet somewhat comparable. It has a basic capability for generating manifests, but it’s not a prominent feature. Skaffold is extendible and lets user pick tools for use in each of the steps in building and deploying their app.
+-->
+
+[Skaffold](https://github.com/GoogleCloudPlatform/skaffold) 让 CI 集成具有可移植性的，它允许用户采用不同的构建系统，镜像仓库和部署工具。它不同于 Draft，同时也具有一定的可比性。它具有生成系统清单的基本能力，但那不是一个重要功能。Skaffold 易于扩展，允许用户在构建和部署应用的每一步选取相应的工具。
+
+<!--
+Implications:
+-->
+
+这意味着：
+
+<!--
+* Modular by design
+* Works independently of CI vendor, user doesn’t need Docker or Kubernetes plugin
+* Works without CI as such, i.e. from the developer’s laptop
+* It can watch local changes and trigger deployments
+-->
+* 模块化设计
+* 不依赖于 CI，用户不需要 Docker 或者 Kubernetes 插件
+* 没有 CI 也可以工作，也就是说，可以在开发人员的电脑上工作
+* 它可以监控本地的改动并且触发部署
+
+<!--
+* It allows developer to use either local or remote Kubernetes cluster
+* It can be used to deploy to production, user can configure how exactly they prefer to do it and provide different kind of pipeline for each target environment
+* Can be used instead of Draft, and along the side with most other tools
+-->
+* 它允许开发人员使用本地或者远程的 Kubernetes 集群
+* 它可以用于部署生产环境，用户可以精确配置，也可以为每一套目标环境提供不同的生产线
+* 可以代替 Draft，并且和其他工具一起使用
+
+<!--
+More info:
+-->
+
+更多信息：
+
+* [Introducing Skaffold: Easy and repeatable Kubernetes development](https://cloudplatform.googleblog.com/2018/03/introducing-Skaffold-Easy-and-repeatable-Kubernetes-development.html)
+* [Getting Started Guide](https://github.com/GoogleCloudPlatform/skaffold#getting-started-with-local-tooling)
+
+### Squash
+
+<!--
+[Squash](https://github.com/solo-io/squash) consists of a debug server that is fully integrated with Kubernetes, and a IDE plugin. It allows you to insert breakpoints and do all the fun stuff you are used to doing when debugging an application using an IDE. It bridges IDE debugging experience with your Kubernetes cluster by allowing you to attach the debugger to a pod running in your Kubernetes cluster.
+-->
+[Squash](https://github.com/solo-io/squash) 包含一个与 Kubernetes 全面集成的调试服务器，以及一个 IDE 插件。它允许您插入断点和所有的调试操作，就像您所习惯的使用 IDE 调试一个程序一般。它允许您将调试器应用到 Kubernetes 集群中运行的 pod 上，从而让您可以使用 IDE 调试 Kubernetes 集群。
+
+<!--
+Implications:
+-->
+
+这意味着：
+
+<!--
+* Can be used independently of other tools you chose
+* Requires a privileged DaemonSet
+* Integrates with popular IDEs
+* Supports Go, Python, Node.js, Java and gdb
+-->
+* 不依赖您选择的其它工具
+* 需要一组特权 DaemonSet
+* 可以和流行 IDE 集成
+* 支持 Go、Python、Node.js、Java 和 gdb
+
+<!--
+* User must ensure application binaries inside the container image are compiled with debug symbols
+* Can be used in combination with any other tools described here
+* It can be used with either local or remote Kubernetes cluster
+-->
+* 用户必须确保容器中的应用程序使编译时使用了调试符号
+* 可与此处描述的任何其他工具结合使用
+* 它可以与本地或远程 Kubernetes 集群一起使用
+
+<!--
+More info:
+-->
+
+更多信息：
+
+* [Squash: A Debugger for Kubernetes Apps](https://www.youtube.com/watch?v=5TrV3qzXlgI)
+* [Getting Started Guide](https://github.com/solo-io/squash/blob/master/docs/getting-started.md)
+
+### Telepresence
+
+<!--
+[Telepresence](https://www.telepresence.io/) connects containers running on developer’s workstation with a remote Kubernetes cluster using a two-way proxy and emulates in-cluster environment as well as provides access to config maps and secrets. It aims to improve iteration time for container app development by eliminating the need for deploying app to the cluster and leverages local container to abstract network and filesystem interface in order to make it appear as if the app was running in the cluster.
+-->
+[Telepresence](https://www.telepresence.io/) 使用双向代理将开发人员工作站上运行的容器与远程 Kubernetes 集群连接起来，并模拟集群内环境以及提供对配置映射和机密的访问。它消除了将应用部署到集群的需要，并利用本地容器抽象出网络和文件系统接口，以使其看起来应用好像就在集群中运行，从而改进容器应用程序开发的迭代时间。
+
+<!--
+Implications:
+-->
+
+这意味着：
+
+<!--
+* It can be used independently of other tools you chose
+* Using together with Squash is possible, although Squash would have to be used for pods in the cluster, while conventional/local debugger would need to be used for debugging local container that’s connected to the cluster via Telepresence
+* Telepresence imposes some network latency
+-->
+* 它不依赖于其它您选取的工具
+* 可以同 Squash 一起使用，但是 Squash 必须用于调试集群中的 pods，而传统/本地调试器需要用于调试通过 Telepresence 连接到集群的本地容器
+* Telepresence 会产生一些网络延迟
+
+<!--
+* It provides connectivity via a side-car process - sshuttle, which is based on SSH
+* More intrusive dependency injection mode with LD_PRELOAD/DYLD_INSERT_LIBRARIES is also available
+* It is most commonly used with a remote Kubernetes cluster, but can be used with a local one also
+-->
+* 它通过辅助进程提供连接 -  sshuttle，基于SSH的一个工具
+* 还提供了使用 LD_PRELOAD/DYLD_INSERT_LIBRARIES 的更具侵入性的依赖注入模式
+* 它最常用于远程 Kubernetes 集群，但也可以与本地集群一起使用
+
+<!--
+More info:
+-->
+
+更多信息：
+
+* [Telepresence: fast, realistic local development for Kubernetes microservices](https://www.telepresence.io/)
+* [Getting Started Guide](https://www.telepresence.io/tutorials/docker)
+* [How It Works](https://www.telepresence.io/discussion/how-it-works)
+
+### Ksync
+
+<!--
+[Ksync](https://github.com/vapor-ware/ksync) synchronizes application code (and configuration) between your local machine and the container running in Kubernetes, akin to what [oc rsync](https://docs.openshift.com/container-platform/3.9/dev_guide/copy_files_to_container.html) does in OpenShift. It aims to improve iteration time for app development by eliminating build and deployment steps.
+-->
+
+
+[Ksync](https://github.com/vapor-ware/ksync) 在本地计算机和运行在 Kubernetes 中的容器之间同步应用程序代码（和配置），类似于 [oc rsync](https://docs.openshift.com/container-platform/3.9/dev_guide/copy_files_to_container.html) 在 OpenShift 中的角色。它旨在通过消除构建和部署步骤来缩短应用程序开发的迭代时间。
+
+
+<!--
+Implications:
+-->
+
+这意味着：
+
+<!--
+* It bypasses container image build and revision control
+* Compiled language users have to run builds inside the pod (TBC)
+* Two-way sync – remote files are copied to local directory
+* Container is restarted each time remote filesystem is updated
+* No security features – development only
+-->
+* 它绕过容器图像构建和修订控制
+* 使用编译语言的用户必须在 pod（TBC）内运行构建
+* 双向同步 - 远程文件会复制到本地目录
+* 每次更新远程文件系统时都会重启容器
+* 无安全功能 - 仅限开发
+
+<!--
+* Utilizes [Syncthing](https://github.com/syncthing/syncthing), a Go library for peer-to-peer sync
+* Requires a privileged DaemonSet running in the cluster
+* Node has to use Docker with overlayfs2 – no other CRI implementations are supported at the time of writing
+-->
+* 使用 [Syncthing](https://github.com/syncthing/syncthing)，一个用于点对点同步的 Go 语言库
+* 需要一个在集群中运行的特权 DaemonSet
+* Node 必须使用带有 overlayfs2 的 Docker  - 在写作本文时，尚不支持其他 CRI 实现
+
+<!--
+More info:
+-->
+
+更多信息：
+
+* [Getting Started Guide](https://github.com/vapor-ware/ksync#getting-started)
+* [How It Works](https://github.com/vapor-ware/ksync/blob/master/docs/architecture.md)
+* [Katacoda scenario to try out ksync in your browser](https://www.katacoda.com/vaporio/scenarios/ksync)
+* [Syncthing Specification](https://docs.syncthing.net/specs/)
+
+<!--
+## Hands-on walkthroughs
+-->
+
+## 实践演练
+
+
+<!--
+The app we will be using for the hands-on walkthroughs of the tools in the following is a simple [stock market simulator](https://github.com/kubernauts/dok-example-us), consisting of two microservices:
+-->
+
+我们接下来用于练习使用工具的应用是一个简单的[股市模拟器](https://github.com/kubernauts/dok-example-us)，包含两个微服务：
+
+<!--
+* The `stock-gen` microservice is written in Go and generates stock data randomly and exposes it via HTTP endpoint `/stockdata`.
+‎* A second microservice, `stock-con` is a Node.js app that consumes the stream of stock data from `stock-gen` and provides an aggregation in form of a moving average via the HTTP endpoint `/average/$SYMBOL` as well as a health-check endpoint at `/healthz`.
+-->
+
+* `stock-gen`（股市数据生成器）微服务是用 Go 编写的，随机生成股票数据并通过 HTTP 端点 `/ stockdata` 公开
+* 第二个微服务，`stock-con`（股市数据消费者）是一个 Node.js 应用程序，它使用来自 `stock-gen` 的股票数据流，并通过 HTTP 端点 `/average/$SYMBOL` 提供股价移动平均线，也提供一个健康检查端点 `/healthz`。
+
+<!--
+Overall, the default setup of the app looks as follows:
+-->
+
+总体上，此应用的默认配置如下图所示：
+
+![Default Setup](/images/blog/2018-05-01-developing-on-kubernetes/dok-architecture_preview.png)
+
+<!--
+In the following we’ll do a hands-on walkthrough for a representative selection of tools discussed above: ksync, Minikube with local build, as well as Skaffold. For each of the tools we do the following:
+-->
+
+在下文中，我们将选取以上讨论的代表性工具进行实践演练：ksync，具有本地构建的 Minikube 以及 Skaffold。对于每个工具，我们执行以下操作：
+
+<!--
+* Set up the respective tool incl. preparations for the deployment and local consumption of the `stock-con` microservice.
+* Perform a code update, that is, change the source code of the `/healthz` endpoint in the `stock-con` microservice and observe the updates.
+-->
+
+* 设置相应的工具，包括部署准备和 `stock-con` 微服务数据的本地读取
+* 执行代码更新，即更改 `stock-con` 微服务的 `/healthz` 端点的源代码并观察网页刷新
+
+<!--
+Note that for the target Kubernetes cluster we’ve been using Minikube locally, but you can also a remote cluster for ksync and Skaffold if you want to follow along.
+-->
+
+请注意，我们一直使用 Minikube 的本地 Kubernetes 集群，但是您也可以使用 ksync 和 Skaffold 的远程集群跟随练习。
+
+<!--
+### Walkthrough: ksync
+-->
+
+### 实践演练：ksync
+
+<!--
+As a preparation, install [ksync](https://vapor-ware.github.io/ksync/#installation) and then carry out the following steps to prepare the development setup:
+-->
+
+作为准备，安装 [ksync](https://vapor-ware.github.io/ksync/#installation)，然后执行以下步骤配置开发环境：
+
+```
+$ mkdir -p $(pwd)/ksync
+$ kubectl create namespace dok
+$ ksync init -n dok
+```
+<!--
+With the basic setup completed we're ready to tell ksync’s local client to watch a certain Kubernetes namespace and then we create a spec to define what we want to sync (the directory `$(pwd)/ksync` locally with `/app` in the container). Note that target pod is specified via the selector parameter:
+-->
+
+
+完成基本设置后，我们可以告诉 ksync 的本地客户端监控 Kubernetes 的某个命名空间，然后我们创建一个规范来定义我们想要同步的文件夹（本地的 `$(pwd)/ksync` 和容器中的 `/ app` ）。请注意，目标 pod 是用 selector 参数指定：
+
+```
+$ ksync watch -n dok
+$ ksync create -n dok --selector=app=stock-con $(pwd)/ksync /app
+$ ksync get -n dok
+```
+
+<!--
+Now we deploy the stock generator and the stock consumer microservice:
+-->
+
+现在我们部署股价数据生成器和股价数据消费者微服务：
+
+```
+$ kubectl -n=dok apply \
+      -f https://raw.githubusercontent.com/kubernauts/dok-example-us/master/stock-gen/app.yaml
+$ kubectl -n=dok apply \
+      -f https://raw.githubusercontent.com/kubernauts/dok-example-us/master/stock-con/app.yaml
+```
+<!--
+Once both deployments are created and the pods are running, we forward the `stock-con` service for local consumption (in a separate terminal session):
+-->
+
+
+一旦两个部署建好并且 pod 开始运行，我们转发 `stock-con` 服务以供本地读取（另开一个终端窗口）：
+
+```
+$ kubectl get -n dok po --selector=app=stock-con  \
+                     -o=custom-columns=:metadata.name --no-headers |  \
+                     xargs -IPOD kubectl -n dok port-forward POD 9898:9898
+```
+<!--
+With that we should be able to consume the `stock-con` service from our local machine; we do this by regularly checking the response of the `healthz` endpoint like so (in a separate terminal session):
+-->
+
+
+这样，通过定期查询 `healthz` 端点，我们就应该能够从本地机器上读取 `stock-con` 服务，查询命令如下（在一个单独的终端窗口）：
+
+```
+$ watch curl localhost:9898/healthz
+```
+<!--
+Now change the code in the `ksync/stock-con`directory, for example update the [`/healthz` endpoint code in `service.js`](https://github.com/kubernauts/dok-example-us/blob/2334ee8fb11f8813370122bd46285cf45bdd4c48/stock-con/service.js#L52) by adding a field to the JSON response and observe how the pod gets updated and the response of the `curl localhost:9898/healthz` command changes. Overall you should have something like the following in the end:
+-->
+
+
+现在，改动 `ksync/stock-con` 目录中的代码，例如改动 [`service.js` 中定义的 `/healthz` 端点代码](https://github.com/kubernauts/dok-example-us/blob/2334ee8fb11f8813370122bd46285cf45bdd4c48/stock-con/service.js#L52)，在其 JSON 形式的响应中新添一个字段并观察 pod 如何更新以及 `curl localhost：9898/healthz` 命令的输出发生何种变化。总的来说，您最后应该看到类似的内容：
+
+
+![Preview](/images/blog/2018-05-01-developing-on-kubernetes/dok-ksync_preview.png)
+
+
+<!--
+### Walkthrough: Minikube with local build
+-->
+
+### 实践演练：带本地构建的 Minikube
+
+<!--
+For the following you will need to have Minikube up and running and we will leverage the Minikube-internal Docker daemon for building images, locally. As a preparation, do the following
+-->
+
+
+对于以下内容，您需要启动并运行 Minikube，我们将利用 Minikube 自带的 Docker daemon 在本地构建镜像。作为准备，请执行以下操作
+
+```
+$ git clone https://github.com/kubernauts/dok-example-us.git && cd dok-example-us
+$ eval $(minikube docker-env)
+$ kubectl create namespace dok
+```
+
+<!--
+Now we deploy the stock generator and the stock consumer microservice:
+-->
+
+现在我们部署股价数据生成器和股价数据消费者微服务：
+
+
+```
+$ kubectl -n=dok apply -f stock-gen/app.yaml
+$ kubectl -n=dok apply -f stock-con/app.yaml
+```
+<!--
+Once both deployments are created and the pods are running, we forward the `stock-con` service for local consumption (in a separate terminal session):
+-->
+
+
+一旦两个部署建好并且 pod 开始运行，我们转发 `stock-con` 服务以供本地读取（另开一个终端窗口）：
+
+```
+$ kubectl get -n dok po --selector=app=stock-con  \
+                     -o=custom-columns=:metadata.name --no-headers |  \
+                     xargs -IPOD kubectl -n dok port-forward POD 9898:9898 &
+$ watch curl localhost:9898/healthz
+```
+<!--
+Now change the code in the `stock-con`directory, for example, update the [`/healthz` endpoint code in `service.js`](https://github.com/kubernauts/dok-example-us/blob/2334ee8fb11f8813370122bd46285cf45bdd4c48/stock-con/service.js#L52) by adding a field to the JSON response. Once you’re done with your code update, the last step is to build a new container image and kick off a new deployment like shown below:
+-->
+
+现在，改一下 `ksync/stock-con` 目录中的代码，例如修改 [`service.js` 中定义的 `/healthz` 端点代码](https://github.com/kubernauts/dok-example-us/blob/2334ee8fb11f8813370122bd46285cf45bdd4c48/stock-con/service.js#L52)，在其 JSON 形式的响应中添加一个字段。在您更新完代码后，最后一步是构建新的容器镜像并启动新部署，如下所示：
+
+
+```
+$ docker build -t stock-con:dev -f Dockerfile .
+$ kubectl -n dok set image deployment/stock-con *=stock-con:dev
+```
+<!--
+Overall you should have something like the following in the end:
+-->
+
+总的来说，您最后应该看到类似的内容：
+
+![Local Preview](/images/blog/2018-05-01-developing-on-kubernetes/dok-minikube-localdev_preview.png)
+
+<!--
+### Walkthrough: Skaffold
+-->
+
+### 实践演练：Skaffold
+
+<!--
+To perform this walkthrough you first need to install [Skaffold](https://github.com/GoogleContainerTools/skaffold#installation). Once that is done, you can do the following steps to prepare the development setup:
+-->
+
+要进行此演练，首先需要安装 [Skaffold](https://github.com/GoogleContainerTools/skaffold#installation)。完成后，您可以执行以下步骤来配置开发环境：
+
+```
+$ git clone https://github.com/kubernauts/dok-example-us.git && cd dok-example-us
+$ kubectl create namespace dok
+```
+<!--
+Now we deploy the stock generator (but not the stock consumer microservice, that is done via Skaffold):
+-->
+
+现在我们部署股价数据生成器（但是暂不部署股价数据消费者，此服务将使用 Skaffold 完成）：
+
+```
+$ kubectl -n=dok apply -f stock-gen/app.yaml
+```
+
+<!--
+Note that initially we experienced an authentication error when doing `skaffold dev` and needed to apply a fix as described in [Issue 322](https://github.com/GoogleContainerTools/skaffold/issues/322). Essentially it means changing the content of `~/.docker/config.json` to:
+-->
+
+
+请注意，最初我们在执行 `skaffold dev` 时发生身份验证错误，为避免此错误需要安装[问题322](https://github.com/GoogleContainerTools/skaffold/issues/322) 中所述的修复。本质上，需要将 `〜/.docker/config.json` 的内容改为：
+
+
+```
+{
+   "auths": {}
+}
+```
+
+<!--
+Next, we had to patch `stock-con/app.yaml` slightly to make it work with Skaffold:
+-->
+
+接下来，我们需要略微改动 `stock-con/app.yaml`，这样 Skaffold 才能正常使用此文件：
+
+<!--
+Add a `namespace` field to both the `stock-con` deployment and the service with the value of `dok`.
+Change the `image` field of the container spec to `quay.io/mhausenblas/stock-con` since Skaffold manages the container image tag on the fly.
+-->
+
+在 `stock-con` 部署和服务中添加一个 `namespace` 字段，其值为 `dok`
+
+将容器规范的 `image` 字段更改为 `quay.io/mhausenblas/stock-con`，因为 Skaffold 可以即时管理容器镜像标签。
+
+<!--
+ The resulting `app.yaml` file stock-con looks as follows:
+ -->
+最终的 stock-con 的 `app.yaml` 文件看起来如下：
+
+
+```
+apiVersion: apps/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: stock-con
+  name: stock-con
+  namespace: dok
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: stock-con
+    spec:
+      containers:
+      - name: stock-con
+        image: quay.io/mhausenblas/stock-con
+        env:
+        - name: DOK_STOCKGEN_HOSTNAME
+          value: stock-gen
+        - name: DOK_STOCKGEN_PORT
+          value: "9999"
+        ports:
+        - containerPort: 9898
+          protocol: TCP
+        livenessProbe:
+          initialDelaySeconds: 2
+          periodSeconds: 5
+          httpGet:
+            path: /healthz
+            port: 9898
+        readinessProbe:
+          initialDelaySeconds: 2
+          periodSeconds: 5
+          httpGet:
+            path: /healthz
+            port: 9898
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: stock-con
+  name: stock-con
+  namespace: dok
+spec:
+  type: ClusterIP
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
+    targetPort: 9898
+  selector:
+    app: stock-con
+```
+<!--
+The final step before we can start development is to configure Skaffold. So, create a file `skaffold.yaml` in the `stock-con/` directory with the following content:
+ -->
+
+我们能够开始开发之前的最后一步是配置 Skaffold。因此，在 `stock-con/` 目录中创建文件 `skaffold.yaml`，其中包含以下内容：
+
+```
+apiVersion: skaffold/v1alpha2
+kind: Config
+build:
+  artifacts:
+  - imageName: quay.io/mhausenblas/stock-con
+    workspace: .
+    docker: {}
+  local: {}
+deploy:
+  kubectl:
+    manifests:
+      - app.yaml
+```
+<!--
+Now we’re ready to kick off the development. For that execute the following in the `stock-con/` directory:
+ -->
+
+现在我们准备好开始开发了。为此，在 `stock-con/` 目录中执行以下命令：
+
+```
+$ skaffold dev
+```
+<!--
+Above command triggers a build of the `stock-con` image and then a deployment. Once the pod of the `stock-con` deployment is running, we again forward the `stock-con` service for local consumption (in a separate terminal session) and check the response of the `healthz` endpoint:
+ -->
+
+
+上面的命令将触发 `stock-con` 图像的构建和部署。一旦 `stock-con` 部署的 pod 开始运行，我们再次转发 `stock-con` 服务以供本地读取（在单独的终端窗口中）并检查 `healthz` 端点的响应：
+
+```bash
+$ kubectl get -n dok po --selector=app=stock-con  \
+                     -o=custom-columns=:metadata.name --no-headers |  \
+                     xargs -IPOD kubectl -n dok port-forward POD 9898:9898 &
+$ watch curl localhost:9898/healthz
+```
+<!--
+If you now change the code in the `stock-con`directory, for example, by updating the [`/healthz` endpoint code in `service.js`](https://github.com/kubernauts/dok-example-us/blob/2334ee8fb11f8813370122bd46285cf45bdd4c48/stock-con/service.js#L52) by adding a field to the JSON response, you should see Skaffold noticing the change and create a new image as well as deploy it. The resulting screen would look something like this:
+ -->
+ 
+现在，如果您修改一下 `stock-con` 目录中的代码，例如 [`service.js` 中定义的 `/healthz` 端点代码](https://github.com/kubernauts/dok-example-us/blob/2334ee8fb11f8813370122bd46285cf45bdd4c48/stock-con/service.js#L52)，在其 JSON 形式的响应中添加一个字段，您应该看到 Skaffold 可以检测到代码改动并创建新图像以及部署它。您的屏幕看起来应该类似这样：
+ 
+ 
+![Skaffold Preview](/images/blog/2018-05-01-developing-on-kubernetes/dok-skaffold_preview.png)
+<!--
+By now you should have a feeling how different tools enable you to develop apps on Kubernetes and if you’re interested to learn more about tools and or methods, check out the following resources:
+ -->
+
+至此，您应该对不同的工具如何帮您在 Kubernetes 上开发应用程序有了一定的概念，如果您有兴趣了解有关工具和/或方法的更多信息，请查看以下资源：
+
+* Blog post by Shahidh K Muhammed on [Draft vs Gitkube vs Helm vs Ksonnet vs Metaparticle vs Skaffold](https://blog.hasura.io/draft-vs-gitkube-vs-helm-vs-ksonnet-vs-metaparticle-vs-skaffold-f5aa9561f948) (03/2018)
+* Blog post by Gergely Nemeth on [Using Kubernetes for Local Development](https://nemethgergely.com/using-kubernetes-for-local-development/index.html), with a focus on Skaffold (03/2018)
+* Blog post by Richard Li on [Locally developing Kubernetes services (without waiting for a deploy)](https://hackernoon.com/locally-developing-kubernetes-services-without-waiting-for-a-deploy-f63995de7b99), with a focus on Telepresence
+* Blog post by Abhishek Tiwari on [Local Development Environment for Kubernetes using Minikube](https://abhishek-tiwari.com/local-development-environment-for-kubernetes-using-minikube/) (09/2017)
+* Blog post by Aymen El Amri on [Using Kubernetes for Local Development — Minikube](https://medium.com/devopslinks/using-kubernetes-minikube-for-local-development-c37c6e56e3db) (08/2017)
+* Blog post by Alexis Richardson on [​GitOps - Operations by Pull Request](https://www.weave.works/blog/gitops-operations-by-pull-request) (08/2017)
+* Slide deck [GitOps: Drive operations through git](https://docs.google.com/presentation/d/1d3PigRVt_m5rO89Ob2XZ16bW8lRSkHHH5k816-oMzZo/), with a focus on Gitkube by Tirumarai Selvan (03/2018)
+* Slide deck [Developing apps on Kubernetes](https://speakerdeck.com/mhausenblas/developing-apps-on-kubernetes), a talk Michael Hausenblas gave at a CNCF Paris meetup  (04/2018)
+* YouTube videos:
+    * [TGI Kubernetes 029: Developing Apps with Ksync](https://www.youtube.com/watch?v=QW85Y0Ug3KY )
+    * [TGI Kubernetes 030: Exploring Skaffold](https://www.youtube.com/watch?v=McwwWhCXMxc)
+    * [TGI Kubernetes 031: Connecting with Telepresence](https://www.youtube.com/watch?v=zezeBAJ_3w8)
+    * [TGI Kubernetes 033: Developing with Draft](https://www.youtube.com/watch?v=8B1D7cTMPgA)
+* Raw responses to the [Kubernetes Application Survey](https://docs.google.com/spreadsheets/d/12ilRCly2eHKPuicv1P_BD6z__PXAqpiaR-tDYe2eudE/edit) 2018 by SIG Apps
+
+<!--
+With that we wrap up this post on how to go about developing apps on Kubernetes, we hope you learned something and if you have feedback and/or want to point out a tool that you found useful, please let us know via Twitter: [Ilya](https://twitter.com/errordeveloper) and [Michael](https://twitter.com/mhausenblas).
+-->
+
+有了这些，我们这篇关于如何在 Kubernetes 上开发应用程序的博客就可以收尾了，希望您有所收获，如果您有反馈和/或想要指出您认为有用的工具，请通过 Twitter 告诉我们：[Ilya](https://twitter.com/errordeveloper) 和 [Michael](https://twitter.com/mhausenblas)

content/zh/blog/_posts/2018-05-30-say-hello-to-discuss-kubernetes.md

@@ -0,0 +1,67 @@
+---
+title: 'Kubernetes 1 11：向 discuss kubernetes 问好'
+layout: blog
+date: 2018-05-30
+---
+
+<!--
+---
+title: ' Kubernetes 1 11：say-hello-to-discuss-kubernetes '
+cn-approvers:
+- congfairy
+layout: blog
+date: 2018-05-30
+---
+-->
+
+<!--   
+
+Author: Jorge Castro (Heptio)
+
+-->
+
+作者: Jorge Castro (Heptio)
+
+<!-- 
+
+Communication is key when it comes to engaging a community of over 35,000 people in a global and remote environment. Keeping track of everything in the Kubernetes community can be an overwhelming task. On one hand we have our official resources, like Stack Overflow, GitHub, and the mailing lists, and on the other we have more ephemeral resources like Slack, where you can hop in, chat with someone, and then go on your merry way. 
+
+-->
+
+就一个超过 35,000 人的全球性社区而言，参与其中时沟通是非常关键的。 跟踪 Kubernetes 社区中的所有内容可能是一项艰巨的任务。 一方面，我们有官方资源，如 Stack Overflow，GitHub 和邮件列表，另一方面，我们有更多瞬时性的资源，如 Slack，你可以加入进去、与某人聊天然后各走各路。
+
+
+<!--
+
+Slack is great for casual and timely conversations and keeping up with other community members, but communication can't be easily referenced in the future. Plus it can be hard to raise your hand in a room filled with 35,000 participants and find a voice. Mailing lists are useful when trying to reach a specific group of people with a particular ask and want to keep track of responses on the thread, but can be daunting with a large amount of people. Stack Overflow and GitHub are ideal for collaborating on projects or questions that involve code and need to be searchable in the future, but certain topics like "What's your favorite CI/CD tool" or "Kubectl tips and tricks" are offtopic there.
+
+While our current assortment of communication channels are valuable in their own rights, we found that there was still a gap between email and real time chat. Across the rest of the web, many other open source projects like Docker, Mozilla, Swift, Ghost, and Chef have had success building communities on top of Discourse, an open source discussion platform. So what if we could use this tool to bring our discussions together under a modern roof, with an open API, and perhaps not let so much of our information fade into the ether? There's only one way to find out: Welcome to discuss.kubernetes.io
+
+-->
+
+Slack 非常适合随意和及时的对话，并与其他社区成员保持联系，但未来很难轻易引用通信。此外，在35,000名参与者中提问并得到回答很难。邮件列表在有问题尝试联系特定人群并且想要跟踪大家的回应时非常有用，但是对于大量人员来说可能是麻烦的。 Stack Overflow 和 GitHub 非常适合在涉及代码的项目或问题上进行协作，并且如果在将来要进行搜索也很有用，但某些主题如“你最喜欢的 CI/CD 工具是什么”或“[Kubectl提示和技巧](http://discuss.kubernetes.io/t/kubectl-tips-and-tricks/192)“在那里是没有意义的。
+
+虽然我们目前的各种沟通渠道对他们自己来说都很有价值，但我们发现电子邮件和实时聊天之间仍然存在差距。在网络的其他部分，许多其他开源项目，如 Docker、Mozilla、Swift、Ghost 和 Chef，已经成功地在[Discourse](http://www.discourse.org/features)之上构建社区，一个开放的讨论平台。那么，如果我们可以使用这个工具将我们的讨论结合在一个平台下，使用开放的API，或许也不会让我们的大部分信息消失在网络中呢？只有一种方法可以找到：欢迎来到[discuss.kubernetes.io](http://discuss.kubernetes.io)
+
+<!--
+
+Right off the bat we have categories that users can browse. Checking and posting in these categories allow users to participate in things they might be interested in without having to commit to subscribing to a list. Granular notification controls allow the users to subscribe to just the category or tag they want, and allow for responding to topics via email. 
+
+Ecosystem partners and developers now have a place where they can [announce projects](https://discuss.kubernetes.io/c/announcements) that they're working on to users without wondering if it would be offtopic on an official list. We can make this place be not just about core Kubernetes, but about the hundreds of wonderful tools our community is building. 
+
+
+This new community forum gives people a place to go where they can discuss Kubernetes, and a sounding board for developers to make announcements of things happening around Kubernetes, all while being searchable and easily accessible to a wider audience. 
+
+Hop in and take a look. We're just getting started, so you might want to begin by [introducing yourself](https://discuss.kubernetes.io/t/introduce-yourself-here/56) and then browsing around. Apps are also available for [Android](https://play.google.com/store/apps/details?id=com.discourse&hl=en_US&rdid=com.discourse&pli=1)and [iOS](https://itunes.apple.com/us/app/discourse-app/id1173672076?mt=8).  
+ 
+
+-->
+
+马上，我们有用户可以浏览的类别。检查和发布这些类别允许用户参与他们可能感兴趣的事情，而无需订阅列表。精细的通知控件允许用户只订阅他们想要的类别或标签，并允许通过电子邮件回复主题。
+
+生态系统合作伙伴和开发人员现在有一个地方可以[宣布项目](http://discuss.kubernetes.io/c/announcements)，他们正在为用户工作，而不会想知道它是否会在官方列表中脱离主题。我们可以让这个地方不仅仅是关于核心 Kubernetes，而是关于我们社区正在建设的数百个精彩工具。
+
+这个新的社区论坛为人们提供了一个可以讨论 Kubernetes 的地方，也是开发人员在 Kubernetes 周围发布事件的声音板，同时可以搜索并且更容易被更广泛的用户访问。
+
+进来看看。我们刚刚开始，所以，您可能希望从[自我介绍](http://discuss.kubernetes.io/t/introduce-yourself-here/56)开始，到处浏览。也有 [Android](http://play.google.com/store/apps/details?id=com.discourse&hl=en_US&rdid=com.discourse&pli=1) 和 [iOS](http://itunes.apple.com/us/app/discourse-app/id1173672076?mt=8) 应用下载。
+

content/zh/blog/_posts/2018-06-06-4-years-of-k8s.md

@@ -0,0 +1,42 @@
+---
+title: Kubernetes 这四年
+approvers:
+cn-approvers:
+- congfairy
+layout: blog
+date: 2018-06-06
+---
+ <!--
+**Author**: Joe Beda (CTO and Founder, Heptio)
+ On June 6, 2014 I checked in the [first commit](https://github.com/kubernetes/kubernetes/commit/2c4b3a562ce34cddc3f8218a2c4d11c7310e6d56) of what would become the public repository for Kubernetes. Many would assume that is where the story starts. It is the beginning of history, right? But that really doesn’t tell the whole story.
+-->
+
+ **作者**：Joe Beda( Heptio 首席技术官兼创始人)
+ 2014 年 6 月 6 日，我检查了 Kubernetes 公共代码库的[第一次 commit](https://github.com/kubernetes/kubernetes/commit/2c4b3a562ce34cddc3f8218a2c4d11c7310e6d56) 。许多人会认为这是故事开始的地方。这难道不是一切开始的地方吗？但这的确不能把整个过程说清楚。
+ 
+ ![k8s_first_commit](/images/blog/2018-06-06-4-years-of-k8s/k8s-first-commit.png)
+ 
+ <!--
+The cast leading up to that commit was large and the success for Kubernetes since then is owed to an ever larger cast.
+ Kubernetes was built on ideas that had been proven out at Google over the previous ten years with Borg. And Borg, itself, owed its existence to even earlier efforts at Google and beyond.
+ Concretely, Kubernetes started as some prototypes from Brendan Burns combined with ongoing work from me and Craig McLuckie to better align the internal Google experience with the Google Cloud experience. Brendan, Craig, and I really wanted people to use this, so we made the case to build out this prototype as an open source project that would bring the best ideas from Borg out into the open.
+ After we got the nod, it was time to actually build the system.  We took Brendan’s prototype (in Java), rewrote it in Go, and built just enough to get the core ideas across.  By this time the team had grown to include Ville Aikas, Tim Hockin, Brian Grant, Dawn Chen and Daniel Smith.  Once we had something working, someone had to sign up to clean things up to get it ready for public launch.  That ended up being me. Not knowing the significance at the time, I created a new repo, moved things over, and checked it in.  So while I have the first public commit to the repo, there was work underway well before that.
+ The version of Kubernetes at that point was really just a shadow of what it was to become.  The core concepts were there but it was very raw.  For example, Pods were called Tasks.  That was changed a day before we went public.  All of this led up to the public announcement of Kubernetes on June 10th, 2014 in a keynote from Eric Brewer at the first DockerCon.  You can watch that video here:
+-->
+
+ 第一次 commit 涉及的人员众多，自那以后 Kubernetes 的成功归功于更大的开发者阵容。
+ Kubernetes 建立在过去十年曾经在 Google 的 Borg 集群管理系统中验证过的思路之上。而 Borg 本身也是 Google 和其他公司早期努力的结果。
+ 具体而言，Kubernetes 最初是从 Brendan Burns 的一些原型开始，结合我和 Craig McLuckie 正在进行的工作，以更好地将 Google 内部实践与 Google Cloud 的经验相结合。 Brendan，Craig 和我真的希望人们使用它，所以我们建议将这个原型构建为一个开源项目，将 Borg 的最佳创意带给大家。
+在我们所有人同意后，就开始着手构建这个系统了。我们采用了 Brendan 的原型（Java 语言），用 Go 语言重写了它，并且以上述核心思想去构建该系统。到这个时候，团队已经成长为包括 Ville Aikas，Tim Hockin，Brian Grant，Dawn Chen 和 Daniel Smith。一旦我们有了一些工作需求，有人必须承担一些脱敏的工作，以便为公开发布做好准备。这个角色最终由我承担。当时，我不知道这件事情的重要性，我创建了一个新的仓库，把代码搬过来，然后进行了检查。所以在我第一次提交 public commit 之前，就有工作已经启动了。
+那时 Kubernetes 的版本只是现在版本的简单雏形。核心概念已经有了，但非常原始。例如，Pods 被称为 Tasks，这在我们推广前一天就被替换。2014年6月10日 Eric Brewe 在第一届 DockerCon 上的演讲中正式发布了 Kubernetes 。您可以在此处观看该视频：
+ 
+
+<center><iframe width="560" height="315" src="https://www.youtube.com/embed/YrxnVKZeqK8" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe></center>  
+
+ <!--
+ But, however raw, that modest start was enough to pique the interest of a community that started strong and has only gotten stronger.  Over the past four years Kubernetes has exceeded the expectations of all of us that were there early on. We owe the Kubernetes community a huge debt.  The success the project has seen  is based not just on code and technology but also the way that an amazing group of people have come together to create something special.  The best expression of this is the [set of Kubernetes values](https://github.com/kubernetes/steering/blob/master/values.md) that Sarah Novotny helped curate.
+ Here is to another 4 years and beyond! 🎉🎉🎉
+-->
+
+ 但是，无论多么原始，这小小的一步足以激起一个开始强大而且变得更强大的社区的兴趣。在过去的四年里，Kubernetes 已经超出了我们所有人的期望。我们对 Kubernetes 社区的所有人员表示感谢。该项目所取得的成功不仅基于代码和技术，还基于一群出色的人聚集在一起所做的有意义的事情。Sarah Novotny 策划的一套 [Kubernetes 价值观](https://github.com/kubernetes/steering/blob/master/values.md)是以上最好的表现形式。
+ 让我们一起期待下一个4年！🎉🎉🎉

content/zh/blog/_posts/2018-06-07-dynamic-ingress-kubernetes.md

@@ -0,0 +1,129 @@
+---
+title: 'Kubernetes 内的动态 Ingress'
+layout: blog
+---
+
+<!--
+title: Dynamic Ingress in Kubernetes
+date:  2018-06-07
+Author: Richard Li (Datawire)
+-->
+
+作者: Richard Li (Datawire)
+
+<!--
+Kubernetes makes it easy to deploy applications that consist of many microservices, but one of the key challenges with this type of architecture is dynamically routing ingress traffic to each of these services.  One approach is Ambassador, a Kubernetes-native open source API Gateway built on the Envoy Proxy. Ambassador is designed for dynamic environment where services may come and go frequently.
+Ambassador is configured using Kubernetes annotations. Annotations are used to configure specific mappings from a given Kubernetes service to a particular URL. A mapping can include a number of annotations for configuring a route. Examples include rate limiting, protocol, cross-origin request sharing, traffic shadowing, and routing rules.
+-->
+
+Kubernetes 可以轻松部署由许多微服务组成的应用程序，但这种架构的关键挑战之一是动态地将流量路由到这些服务中的每一个。
+一种方法是使用 [Ambassador](https://www.getambassador.io)，
+一个基于 [Envoy Proxy](https://www.envoyproxy.io) 构建的 Kubernetes 原生开源 API 网关。
+Ambassador 专为动态环境而设计，这类环境中的服务可能被频繁添加或删除。
+
+Ambassador 使用 Kubernetes 注解进行配置。
+注解用于配置从给定 Kubernetes 服务到特定 URL 的具体映射关系。
+每个映射中可以包括多个注解，用于配置路由。
+注解的例子有速率限制、协议、跨源请求共享（CORS）、流量影射和路由规则等。
+
+<!--
+## A Basic Ambassador Example
+Ambassador is typically installed as a Kubernetes deployment, and is also available as a Helm chart. To configure Ambassador, create a Kubernetes service with the Ambassador annotations. Here is an example that configures Ambassador to route requests to /httpbin/ to the public httpbin.org service:
+-->
+
+## 一个简单的 Ambassador 示例
+
+Ambassador 通常作为 Kubernetes Deployment 来安装，也可以作为 Helm Chart 使用。
+配置 Ambassador 时，请使用 Ambassador 注解创建 Kubernetes 服务。
+下面是一个例子，用来配置 Ambassador，将针对 /httpbin/ 的请求路由到公共的 httpbin.org 服务：
+
+```
+apiVersion: v1
+kind: Service
+metadata:
+  name: httpbin
+  annotations:
+    getambassador.io/config: |
+      ---
+      apiVersion: ambassador/v0
+      kind:  Mapping
+      name:  httpbin_mapping
+      prefix: /httpbin/
+      service: httpbin.org:80
+      host_rewrite: httpbin.org
+spec:
+  type: ClusterIP
+  ports:
+    - port: 80
+```
+
+<!--
+A mapping object is created with a prefix of /httpbin/ and a service name of httpbin.org. The host_rewrite annotation specifies that the HTTP host header should be set to httpbin.org.
+-->
+
+例子中创建了一个 Mapping 对象，其 prefix 设置为 /httpbin/，service 名称为 httpbin.org。
+其中的 host_rewrite 注解指定 HTTP 的 host 头部字段应设置为 httpbin.org。
+
+<!--
+## Kubeflow
+Kubeflow provides a simple way to easily deploy machine learning infrastructure on Kubernetes. The Kubeflow team needed a proxy that provided a central point of authentication and routing to the wide range of services used in Kubeflow, many of which are ephemeral in nature.
+<center><i>Kubeflow architecture, pre-Ambassador</center></i>
+-->
+
+## Kubeflow
+
+[Kubeflow](https://github.com/kubeflow/kubeflow) 提供了一种简单的方法，用于在 Kubernetes 上轻松部署机器学习基础设施。
+Kubeflow 团队需要一个代理，为 Kubeflow 中所使用的各种服务提供集中化的认证和路由能力；Kubeflow 中许多服务本质上都是生命期很短的。
+
+<center><i>Kubeflow architecture, pre-Ambassador</center></i>
+
+<!--
+## Service configuration
+With Ambassador, Kubeflow can use a distributed model for configuration. Instead of a central configuration file, Ambassador allows each service to configure its route in Ambassador via Kubernetes annotations. Here is a simplified example configuration:
+-->
+
+## 服务配置
+
+有了 Ambassador，Kubeflow 可以使用分布式模型进行配置。
+Ambassador 不使用集中的配置文件，而是允许每个服务通过 Kubernetes 注解在 Ambassador 中配置其路由。
+下面是一个简化的配置示例：
+
+```
+---
+apiVersion: ambassador/v0
+kind:  Mapping
+name: tfserving-mapping-test-post
+prefix: /models/test/
+rewrite: /model/test/:predict
+method: POST
+service: test.kubeflow:8000
+```
+
+<!--
+In this example, the “test” service uses Ambassador annotations to dynamically configure a route to the service, triggered only when the HTTP method is a POST, and the annotation also specifies a rewrite rule.
+-->
+
+示例中，“test” 服务使用 Ambassador 注解来为服务动态配置路由。
+所配置的路由仅在 HTTP 方法是 POST 时触发；注解中同时还给出了一条重写规则。
+
+<!--
+With Ambassador, Kubeflow manages routing easily with Kubernetes annotations. Kubeflow configures a single ingress object that directs traffic to Ambassador, then creates services with Ambassador annotations as needed to direct traffic  to specific backends. For example, when deploying TensorFlow services,  Kubeflow creates and and annotates a K8s service so that the model will be served at https://<ingress host>/models/<model name>/. Kubeflow can also use the Envoy Proxy to do the actual L7 routing. Using Ambassador, Kubeflow takes advantage of additional routing configuration like URL rewriting and method-based routing.
+If you’re interested in using Ambassador with Kubeflow, the standard Kubeflow install automatically installs and configures Ambassador.
+If you’re interested in using Ambassador as an API Gateway or Kubernetes ingress solution for your non-Kubeflow services, check out the Getting Started with Ambassador guide.
+## Kubeflow and Ambassador
+-->
+
+## Kubeflow 和 Ambassador
+
+通过 Ambassador，Kubeflow 可以使用 Kubernetes 注解轻松管理路由。
+Kubeflow 配置同一个 Ingress 对象，将流量定向到 Ambassador，然后根据需要创建具有 Ambassador 注解的服务，以将流量定向到特定后端。
+例如，在部署 TensorFlow 服务时，Kubeflow 会创建 Kubernetes 服务并为其添加注解，
+以便用户能够在 `https://<ingress主机>/models/<模型名称>/` 处访问到模型本身。
+Kubeflow 还可以使用 Envoy Proxy 来进行实际的 L7 路由。
+通过 Ambassador，Kubeflow 能够更充分地利用 URL 重写和基于方法的路由等额外的路由配置能力。
+
+如果您对在 Kubeflow 中使用 Ambassador 感兴趣，标准的 Kubeflow 安装会自动安装和配置 Ambassador。
+
+如果您有兴趣将 Ambassador 用作 API 网关或 Kubernetes 的 Ingress 解决方案，
+请参阅 [Ambassador 入门指南](https://www.getambassador.io/user-guide/getting-started)。
+

content/zh/blog/_posts/2018-10-03-kubedirector.md

@@ -0,0 +1,306 @@
+---
+layout: blog
+title: 'KubeDirector：在 Kubernetes 上运行复杂状态应用程序的简单方法'
+date: 2018-10-03
+---
+
+<!--
+layout: blog
+title: 'KubeDirector: The easy way to run complex stateful applications on Kubernetes'
+date: 2018-10-03
+-->
+
+<!--
+**Author**: Thomas Phelan (BlueData)
+-->
+
+**作者**：Thomas Phelan（BlueData）
+
+<!--
+KubeDirector is an open source project designed to make it easy to run complex stateful scale-out application clusters on Kubernetes. KubeDirector is built using the custom resource definition (CRD) framework and leverages the native Kubernetes API extensions and design philosophy. This enables transparent integration with Kubernetes user/resource management as well as existing clients and tools.
+-->
+KubeDirector 是一个开源项目，旨在简化在 Kubernetes 上运行复杂的有状态扩展应用程序集群。KubeDirector 使用自定义资源定义（CRD）
+框架构建，并利用了本地 Kubernetes API 扩展和设计哲学。这支持与 Kubernetes 用户/资源 管理以及现有客户端和工具的透明集成。
+
+<!--
+We recently [introduced the KubeDirector project](https://medium.com/@thomas_phelan/operation-stateful-introducing-bluek8s-and-kubernetes-director-aa204952f619/), as part of a broader open source Kubernetes initiative we call BlueK8s. I’m happy to announce that the pre-alpha
+code for [KubeDirector](https://github.com/bluek8s/kubedirector/) is now available. And in this blog post, I’ll show how it works.
+-->
+我们最近[介绍了 KubeDirector 项目](https://medium.com/@thomas_phelan/operation-stateful-introducing-bluek8s-and-kubernetes-director-aa204952f619/)，作为我们称为 BlueK8s 的更广泛的 Kubernetes 开源项目的一部分。我很高兴地宣布 [KubeDirector](https://github.com/bluek8s/kubedirector/) 的
+pre-alpha 代码现在已经可用。在这篇博客文章中，我将展示它是如何工作的。
+
+<!--
+KubeDirector provides the following capabilities:
+-->
+KubeDirector 提供以下功能：
+
+<!--
+*	The ability to run non-cloud native stateful applications on Kubernetes without modifying the code. In other words, it’s not necessary to decompose these existing applications to fit a microservices design pattern.
+*	Native support for preserving application-specific configuration and state.
+*	An application-agnostic deployment pattern, minimizing the time to onboard new stateful applications to Kubernetes.
+-->
+
+*	无需修改代码即可在 Kubernetes 上运行非云原生有状态应用程序。换句话说，不需要分解这些现有的应用程序来适应微服务设计模式。
+*	本机支持保存特定于应用程序的配置和状态。
+*	与应用程序无关的部署模式，最大限度地减少将新的有状态应用程序装载到 Kubernetes 的时间。
+
+<!--
+KubeDirector enables data scientists familiar with data-intensive distributed applications such as Hadoop, Spark, Cassandra, TensorFlow, Caffe2, etc. to run these applications on Kubernetes -- with a minimal learning curve and no need to write GO code. The applications controlled by KubeDirector are defined by some basic metadata and an associated package of configuration artifacts.  The application metadata is referred to as a KubeDirectorApp resource.
+-->
+KubeDirector 使熟悉数据密集型分布式应用程序（如 Hadoop、Spark、Cassandra、TensorFlow、Caffe2 等）的数据科学家能够在 Kubernetes 上运行这些应用程序 -- 只需极少的学习曲线，无需编写 GO 代码。由 KubeDirector 控制的应用程序由一些基本元数据和相关的配置工件包定义。应用程序元数据称为 KubeDirectorApp 资源。
+
+<!--
+To understand the components of KubeDirector, clone the repository on [GitHub](https://github.com/bluek8s/kubedirector/) using a command similar to:
+-->
+要了解 KubeDirector 的组件，请使用类似于以下的命令在 [GitHub](https://github.com/bluek8s/kubedirector/) 上克隆存储库：
+
+```
+git clone http://<userid>@github.com/bluek8s/kubedirector.
+```
+
+<!--
+The KubeDirectorApp definition for the Spark 2.2.1 application is located
+in the file `kubedirector/deploy/example_catalog/cr-app-spark221e2.json`.
+-->
+Spark 2.2.1 应用程序的 KubeDirectorApp 定义位于文件 `kubedirector/deploy/example_catalog/cr-app-spark221e2.json` 中。
+
+ ```
+ ~> cat kubedirector/deploy/example_catalog/cr-app-spark221e2.json
+ {
+    "apiVersion": "kubedirector.bluedata.io/v1alpha1",
+    "kind": "KubeDirectorApp",
+    "metadata": {
+        "name" : "spark221e2"
+    },
+    "spec" : {
+        "systemctlMounts": true,
+        "config": {
+            "node_services": [
+                {
+                    "service_ids": [
+                        "ssh",
+                        "spark",
+                        "spark_master",
+                        "spark_worker"
+                    ],
+…
+```
+
+<!--
+The configuration of an application cluster is referred to as a KubeDirectorCluster resource. The
+KubeDirectorCluster definition for a sample Spark 2.2.1 cluster is located in the file
+`kubedirector/deploy/example_clusters/cr-cluster-spark221.e1.yaml`.
+-->
+应用程序集群的配置称为 KubeDirectorCluster 资源。示例 Spark 2.2.1 集群的 KubeDirectorCluster 定义位于文件
+`kubedirector/deploy/example_clusters/cr-cluster-spark221.e1.yaml` 中。
+
+```
+~> cat kubedirector/deploy/example_clusters/cr-cluster-spark221.e1.yaml
+apiVersion: "kubedirector.bluedata.io/v1alpha1"
+kind: "KubeDirectorCluster"
+metadata:
+  name: "spark221e2"
+spec:
+  app: spark221e2
+  roles:
+  - name: controller
+    replicas: 1
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "4Gi"
+        cpu: "2"
+  - name: worker
+    replicas: 2
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "4Gi"
+        cpu: "2"
+  - name: jupyter
+…
+```
+
+<!--
+## Running Spark on Kubernetes with KubeDirector
+-->
+
+## 使用 KubeDirector 在 Kubernetes 上运行 Spark
+
+<!--
+With KubeDirector, it’s easy to run Spark clusters on Kubernetes.
+-->
+使用 KubeDirector，可以轻松在 Kubernetes 上运行 Spark 集群。
+
+<!--
+First, verify that Kubernetes (version 1.9 or later) is running, using the command `kubectl version`
+-->
+首先，使用命令 `kubectl version` 验证 Kubernetes（版本 1.9 或更高）是否正在运行
+
+```
+~> kubectl version
+Client Version: version.Info{Major:"1", Minor:"11", GitVersion:"v1.11.3", GitCommit:"a4529464e4629c21224b3d52edfe0ea91b072862", GitTreeState:"clean", BuildDate:"2018-09-09T18:02:47Z", GoVersion:"go1.10.3", Compiler:"gc", Platform:"linux/amd64"}
+Server Version: version.Info{Major:"1", Minor:"11", GitVersion:"v1.11.3", GitCommit:"a4529464e4629c21224b3d52edfe0ea91b072862", GitTreeState:"clean", BuildDate:"2018-09-09T17:53:03Z", GoVersion:"go1.10.3", Compiler:"gc", Platform:"linux/amd64"}                                    
+```
+
+<!--
+Deploy the KubeDirector service and the example KubeDirectorApp resource definitions with the commands:
+-->
+使用以下命令部署 KubeDirector 服务和示例 KubeDirectorApp 资源定义：
+
+```
+cd kubedirector
+make deploy
+```
+
+<!--
+These will start the KubeDirector pod:
+-->
+这些将启动 KubeDirector pod：
+
+```
+~> kubectl get pods
+NAME                           READY     STATUS     RESTARTS     AGE
+kubedirector-58cf59869-qd9hb   1/1       Running    0            1m     
+```
+
+<!--
+List the installed KubeDirector applications with `kubectl get KubeDirectorApp`
+-->
+`kubectl get KubeDirectorApp` 列出中已安装的 KubeDirector 应用程序
+
+```
+~> kubectl get KubeDirectorApp
+NAME           AGE
+cassandra311   30m
+spark211up     30m
+spark221e2     30m
+```
+
+<!--
+Now you can launch a Spark 2.2.1 cluster using the example KubeDirectorCluster file and the
+`kubectl create -f deploy/example_clusters/cr-cluster-spark211up.yaml` command.
+Verify that the Spark cluster has been started:
+-->
+现在，您可以使用示例 KubeDirectorCluster 文件和 `kubectl create -f deploy/example_clusters/cr-cluster-spark211up.yaml` 命令
+启动 Spark 2.2.1 集群。验证 Spark 集群已经启动:
+
+```
+~> kubectl get pods
+NAME                             READY     STATUS    RESTARTS   AGE
+kubedirector-58cf59869-djdwl     1/1       Running   0          19m
+spark221e2-controller-zbg4d-0    1/1       Running   0          23m
+spark221e2-jupyter-2km7q-0       1/1       Running   0          23m
+spark221e2-worker-4gzbz-0        1/1       Running   0          23m
+spark221e2-worker-4gzbz-1        1/1       Running   0          23m
+```
+
+<!--
+The running services now include the Spark services:
+-->
+现在运行的服务包括 Spark 服务：
+
+```
+~> kubectl get service
+NAME                                TYPE         CLUSTER-IP        EXTERNAL-IP    PORT(S)                                                    AGE
+kubedirector                        ClusterIP    10.98.234.194     <none>         60000/TCP                                                  1d
+kubernetes                          ClusterIP    10.96.0.1         <none>         443/TCP                                                    1d
+svc-spark221e2-5tg48                ClusterIP    None              <none>         8888/TCP                                                   21s
+svc-spark221e2-controller-tq8d6-0   NodePort     10.104.181.123    <none>         22:30534/TCP,8080:31533/TCP,7077:32506/TCP,8081:32099/TCP  20s
+svc-spark221e2-jupyter-6989v-0      NodePort     10.105.227.249    <none>         22:30632/TCP,8888:30355/TCP                                20s
+svc-spark221e2-worker-d9892-0       NodePort     10.107.131.165    <none>         22:30358/TCP,8081:32144/TCP                                20s
+svc-spark221e2-worker-d9892-1       NodePort     10.110.88.221     <none>         22:30294/TCP,8081:31436/TCP                                20s
+```
+
+<!--
+Pointing the browser at port 31533 connects to the Spark Master UI:
+-->
+将浏览器指向端口 31533 连接到 Spark 主节点 UI：
+
+![kubedirector](/images/blog/2018-10-03-kubedirector/kubedirector.png)
+
+<!--
+That’s all there is to it!
+In fact, in the example above we also deployed a Jupyter notebook along with the Spark cluster.
+-->
+就是这样!
+事实上，在上面的例子中，我们还部署了一个 Jupyter notebook 和 Spark 集群。
+
+<!--
+To start another application (e.g. Cassandra), just specify another KubeDirectorApp file:
+-->
+要启动另一个应用程序（例如 Cassandra），只需指定另一个 KubeDirectorApp 文件：
+
+```
+kubectl create -f deploy/example_clusters/cr-cluster-cassandra311.yaml
+```
+
+<!--
+See the running Cassandra cluster:
+-->
+查看正在运行的 Cassandra 集群：
+
+```
+~> kubectl get pods
+NAME                              READY     STATUS    RESTARTS   AGE
+cassandra311-seed-v24r6-0         1/1       Running   0          1m
+cassandra311-seed-v24r6-1         1/1       Running   0          1m
+cassandra311-worker-rqrhl-0       1/1       Running   0          1m
+cassandra311-worker-rqrhl-1       1/1       Running   0          1m
+kubedirector-58cf59869-djdwl      1/1       Running   0          1d
+spark221e2-controller-tq8d6-0     1/1       Running   0          22m
+spark221e2-jupyter-6989v-0        1/1       Running   0          22m
+spark221e2-worker-d9892-0         1/1       Running   0          22m
+spark221e2-worker-d9892-1         1/1       Running   0          22m
+```
+
+<!--
+Now you have a Spark cluster (with a Jupyter notebook) and a Cassandra cluster running on Kubernetes.
+Use `kubectl get service` to see the set of services.
+-->
+现在，您有一个 Spark 集群（带有 Jupyter notebook ）和一个运行在 Kubernetes 上的 Cassandra 集群。
+使用 `kubectl get service` 查看服务集。
+
+```
+~> kubectl get service
+NAME                                TYPE         CLUSTER-IP       EXTERNAL-IP   PORT(S)                                                   AGE
+kubedirector                        ClusterIP    10.98.234.194    <none>        60000/TCP                                                 1d
+kubernetes                          ClusterIP    10.96.0.1        <none>        443/TCP                                                   1d
+svc-cassandra311-seed-v24r6-0       NodePort     10.96.94.204     <none>        22:31131/TCP,9042:30739/TCP                               3m
+svc-cassandra311-seed-v24r6-1       NodePort     10.106.144.52    <none>        22:30373/TCP,9042:32662/TCP                               3m
+svc-cassandra311-vhh29              ClusterIP    None             <none>        8888/TCP                                                  3m
+svc-cassandra311-worker-rqrhl-0     NodePort     10.109.61.194    <none>        22:31832/TCP,9042:31962/TCP                               3m
+svc-cassandra311-worker-rqrhl-1     NodePort     10.97.147.131    <none>        22:31454/TCP,9042:31170/TCP                               3m
+svc-spark221e2-5tg48                ClusterIP    None             <none>        8888/TCP                                                  24m
+svc-spark221e2-controller-tq8d6-0   NodePort     10.104.181.123   <none>        22:30534/TCP,8080:31533/TCP,7077:32506/TCP,8081:32099/TCP 24m
+svc-spark221e2-jupyter-6989v-0      NodePort     10.105.227.249   <none>        22:30632/TCP,8888:30355/TCP                               24m
+svc-spark221e2-worker-d9892-0       NodePort     10.107.131.165   <none>        22:30358/TCP,8081:32144/TCP                               24m
+svc-spark221e2-worker-d9892-1       NodePort     10.110.88.221    <none>        22:30294/TCP,8081:31436/TCP                               24m
+```
+
+<!--
+## Get Involved
+-->
+
+## 参与其中
+
+<!--
+KubeDirector is a fully open source, Apache v2 licensed, project – the first of multiple open source projects within a broader initiative we call BlueK8s.
+The pre-alpha code for KubeDirector has just been released and we would love for you to join the growing community of developers, contributors, and adopters.
+Follow [@BlueK8s](https://twitter.com/BlueK8s/) on Twitter and get involved through these channels:
+-->
+KubeDirector 是一个完全开放源码的 Apache v2 授权项目 – 在我们称为 BlueK8s 的更广泛的计划中，它是多个开放源码项目中的第一个。
+KubeDirector 的 pre-alpha 代码刚刚发布，我们希望您加入到不断增长的开发人员、贡献者和使用者社区。
+在 Twitter 上关注 [@BlueK8s](https://twitter.com/BlueK8s/)，并通过以下渠道参与:
+
+<!--
+* KubeDirector [chat room on Slack](https://join.slack.com/t/bluek8s/shared_invite/enQtNDUwMzkwODY5OTM4LTRhYmRmZmE4YzY3OGUzMjA1NDg0MDVhNDQ2MGNkYjRhM2RlMDNjMTI1NDQyMjAzZGVlMDFkNThkNGFjZGZjMGY/)
+*	KubeDirector [GitHub repo](https://github.com/bluek8s/kubedirector/)
+-->
+
+* KubeDirector [Slack 聊天室](https://join.slack.com/t/bluek8s/shared_invite/enQtNDUwMzkwODY5OTM4LTRhYmRmZmE4YzY3OGUzMjA1NDg0MDVhNDQ2MGNkYjRhM2RlMDNjMTI1NDQyMjAzZGVlMDFkNThkNGFjZGZjMGY/)
+*	KubeDirector [GitHub 仓库](https://github.com/bluek8s/kubedirector/)

content/zh/blog/_posts/2018-10-04-non-code-contributors-guide.md

@@ -0,0 +1,127 @@
+---
+layout: blog
+title: 非代码类贡献者指南介绍
+date: 2018-10-04
+---
+
+<!--
+---
+layout: blog
+title: 'Introducing the Non-Code Contributor’s Guide'
+date: 2018-10-04
+---
+ -->
+
+<!--
+**Author**: [Noah Abrahams](https://twitter.com/noah_abrahams) (InfoSiftr), [Jonas Rosland](https://twitter.com/jonasrosland) (VMware), [Ihor Dvoretskyi](https://twitter.com/idvoretskyi) (CNCF)
+ -->
+**作者**: [Noah Abrahams](https://twitter.com/noah_abrahams) (InfoSiftr)，[Jonas Rosland](https://twitter.com/jonasrosland) (VMware), [Ihor Dvoretskyi](https://twitter.com/idvoretskyi) (CNCF)
+
+<!--
+It was May 2018 in Copenhagen, and the Kubernetes community was enjoying the contributor summit at KubeCon/CloudNativeCon, complete with the first run of the New Contributor Workshop. As a time of tremendous collaboration between contributors, the topics covered ranged from signing the CLA to deep technical conversations. Along with the vast exchange of information and ideas, however, came continued scrutiny of the topics at hand to ensure that the community was being as inclusive and accommodating as possible. Over that spring week, some of the pieces under the microscope included the many themes being covered, and how they were being presented, but also the overarching characteristics of the people contributing and the skill sets involved. From the discussions and analysis that followed grew the idea that the community was not benefiting as much as it could from the many people who wanted to contribute, but whose strengths were in areas other than writing code.
+ -->
+2018 年 5 月 Kubernetes 社区在哥本哈根 KubeCon/CloudNativeCon 期间组织了贡献者峰会，并完成了首次新贡献者研讨会。
+在贡献者们大力协作下，讨论的主题既包含如何签署 CLA，也包含深入的技术对话。
+在大家广泛交流信息和思想的同时，也再次出现了对手头的主题的批评，其目的是确保社区尽可能具有接纳性和包容性。
+在那个春天的一周时间里，被详细讨论的既有许多主题以及它们是如何呈现的，也包括人们贡献的总体特征和所涉及的技能。
+基于随后的讨论和分析，大家得到的一个结论是社区并未因为有许多人想要参与并贡献而获益，相反，社区获益最多之处是另外一些人，这些人的优势并不是编写代码。
+
+<!--
+**This all led to an effort called the [Non-Code Contributor’s Guide](https://github.com/kubernetes/community/blob/master/contributors/guide/non-code-contributions.md).**
+ -->
+
+**在上述诸多因素的推动下，[非代码贡献指南](https://github.com/kubernetes/community/blob/master/contributors/guide/non-code-contributions.md)出现了。**
+
+<!--
+Now, it’s important to note that Kubernetes is rare, if not unique, in the open source world, in that it was defined very early on as both a project and a community. While the project itself is focused on the codebase, it is the community of people driving it forward that makes the project successful. The community works together with an explicit set of [community values](https://github.com/kubernetes/steering/blob/master/values.md), guiding the day-to-day behavior of contributors whether on GitHub, Slack, Discourse, or sitting together over tea or coffee.
+ -->
+ 
+现在，重要的是要了解 Kubernetes 在很早就被定义为是既是一个项目也是一个社区，这在开源界即便不是独一无二的，也是不常见的。
+作为一个项目，其自身聚焦于代码库；而作为一个社区，是其中的人们推动着它使它成功。
+社区基于一组明确的[社区价值观](https://github.com/kubernetes/steering/blob/master/values.md)共同协作。
+这些价值观既体现在 GitHub、Slack、演讲形式的交流上, 也体现在坐在一起喝咖啡或喝茶时，它们指导着贡献者们日常的行为。
+
+<!--
+By having a community that values people first, and explicitly values a diversity of people, the Kubernetes project is building a product to serve people with diverse needs. The different backgrounds of the contributors bring different approaches to the problem solving, with different methods of collaboration, and all those different viewpoints ultimately create a better project.
+ -->
+
+通过建造一个以人为本的社区，并重视人群的多元化，Kubernetes 项目正在建造一个服务于需求各异的人群的产品。
+不同背景的贡献者带来了解决问题的不同方法以及进行协作的多种方式，所有这些不同的视角最终共同使这个项目变得更好。
+
+<!-- The Non-Code Contributor’s Guide aims to make it easy for anyone to contribute to the Kubernetes project in a way that makes sense for them. This can be in many forms, technical and non-technical, based on the person's knowledge of the project and their available time. Most individuals are not developers, and most of the world’s developers are not paid to fully work on open source projects. Based on this we have started an ever-growing list of possible ways to contribute to the Kubernetes project in a Non-Code way!
+-->
+
+非代码贡献者指南旨在使任何人都能以合理的方式轻松地为 Kubernetes 项目作出贡献。
+贡献可以有多种形式，可以是技术的也可以是非技术的，完全取决于个人对项目的了解和他们可用的时间。
+大部分人都不是开发者，并且大部分的开发者都不是受雇佣的全职开源项目开发人员。
+基于这种情况，我们已经有了一个不断增长的列表，列出了以非代码形式为 Kubernetes 项目做出贡献的可能途径！
+
+<!--
+## Get Involved
+ -->
+
+## 参与其中
+
+<!--
+Some of the ways that you can contribute to the Kubernetes community without writing a single line of code include:
+ -->
+
+下面是一些可以参与 Kubernetes 社区贡献，而不用写任何一行代码的方法：
+
+<!--
+- Community education, answering questions on [Discuss](https://discuss.kubernetes.io/), [StackOverflow](https://stackoverflow.com/questions/tagged/kubernetes), and [Slack](http://slack.k8s.io/)
+- Outward facing community work such as [hosting meetups](https://www.meetup.com/pro/cncf/) and events
+- Writing [project documentation](https://github.com/kubernetes/community/tree/master/sig-docs)
+- Writing operational manuals, helping users understand how to run Kubernetes
+- Helping deliver Kubernetes, as a part of the [release team](https://github.com/kubernetes/sig-release/blob/master/release-team/README.md)
+- Project, program, and [product management](https://github.com/kubernetes/community/blob/master/sig-pm/README.md)
+- And many more!
+ -->
+
+- 社区教育，在 [Discuss](https://discuss.kubernetes.io/)，[StackOverflow](https://stackoverflow.com/questions/tagged/kubernetes)，和 [Slack](http://slack.k8s.io/) 上回答问题
+- 对外的面对面社区工作，比如 [主持 meetup](https://www.meetup.com/pro/cncf/) 和各类活动
+- 撰写[项目文档](https://github.com/kubernetes/community/tree/master/sig-docs)
+- 撰写操作手册，帮助用户理解如何运行 Kubernetes
+- 帮助交付 Kubernetes，作为[发布团队](https://github.com/kubernetes/sig-release/blob/master/release-team/README.md)的一部分
+- 项目、编码和[产品管理](https://github.com/kubernetes/community/blob/master/sig-pm/README.md)
+- 还有更多！
+
+<!--
+The guide to get started with Kubernetes project contribution is [documented on Github](https://github.com/kubernetes/community/tree/master/contributors/guide), and as the Non-Code Contributors Guide is a part of that Kubernetes Contributors Guide, it can be found [here](https://github.com/kubernetes/community/blob/master/contributors/guide/non-code-contributions.md). As stated earlier, this list is not exhaustive and will continue to be a work in progress.
+ -->
+
+Kubernetes 项目贡献的起步指南在 [Github 上](https://github.com/kubernetes/community/tree/master/contributors/guide)。
+由于非代码贡献指南是贡献者指南的一部分，内容同样可以在[这里](https://github.com/kubernetes/community/blob/master/contributors/guide/non-code-contributions.md)找到。
+如前所述，该清单并非详尽无遗，它会是一项持续继续进行的工作。
+
+<!--
+To date, the typical Non-Code contributions fall into the following categories:
+ -->
+
+迄今为止，典型的非代码贡献分为以下几类：
+
+<!--
+- Roles that are based on skill sets other than “software developer”
+- Non-Code contributions in primarily code-based roles
+- “Post-Code” roles, that are not code-based, but require knowledge of either the code base or management of the code base
+ -->
+
+- 基于“软件开发人员”以外的技能组合的角色
+- 主要基于代码的角色中的非代码贡献
+- “代码提交”角色，它不是基于代码的，但需要知道代码库或代码库的管理
+
+<!--
+If you, dear reader, have any additional ideas for a Non-Code way to contribute, whether or not it fits in an existing category, the team will always appreciate if you could help us expand the list.
+ -->
+
+亲爱的读者，如果您对非代码方式的贡献有任何其他想法，无论它是否适合现有类别，团队将始终感谢您如果可以帮助我们扩展列表。
+
+<!--
+If a contribution of the Non-Code nature appeals to you, please read the Non-Code Contributions document, and then check the [Contributor Role Board](https://discuss.kubernetes.io/c/contributors/role-board) to see if there are any open positions where your expertise could be best used! If there are no listed open positions that match your skill set, drop on by the [#sig-contribex](https://kubernetes.slack.com/messages/sig-contribex) channel on Slack, and we’ll point you in the right direction.
+ -->
+如果非代码性质的贡献对您有吸引力，请阅读非代码贡献文档，然后查阅[贡献角色面板](https://discuss.kubernetes.io/c/contributors/role-board)看看是否有任何空缺职位可以最好地利用您的专业知识！如果列表中没有与您的技能组合匹配的职位，请加入 Slack 上的 [#sig-contribex](https://kubernetes.slack.com/messages/sig-contribex) 频道，我们会为您指明正确的方向。
+
+<!--
+We hope to see you contributing to the Kubernetes community soon!
+ -->
+我们希望很快能见到您对 Kubernetes 社区对贡献！

content/zh/blog/_posts/2018-10-11-topology-aware-volume-provisioning.md

@@ -0,0 +1,268 @@
+---
+layout: blog
+title: 'Kubernetes 中的拓扑感知数据卷供应'
+date: 2018-10-11
+---
+<!--
+---
+layout: blog
+title: 'Topology-Aware Volume Provisioning in Kubernetes'
+date: 2018-10-11
+---
+-->
+
+<!--
+**Author**: Michelle Au (Google)
+-->
+**作者**: Michelle Au（谷歌）
+
+<!--
+The multi-zone cluster experience with persistent volumes is improving in Kubernetes 1.12 with the topology-aware dynamic provisioning beta feature. This feature allows Kubernetes to make intelligent decisions when dynamically provisioning volumes by getting scheduler input on the best place to provision a volume for a pod.  In multi-zone clusters, this means that volumes will get provisioned in an appropriate zone that can run your pod, allowing you to easily deploy and scale your stateful workloads across failure domains to provide high availability and fault tolerance.
+-->
+通过提供拓扑感知动态卷供应功能，具有持久卷的多区域集群体验在 Kubernetes 1.12 中得到了改进。此功能使得 Kubernetes 在动态供应卷时能做出明智的决策，方法是从调度器获得为 Pod 提供数据卷的最佳位置。在多区域集群环境，这意味着数据卷能够在满足你的 Pod 运行需要的合适的区域被供应，从而允许您跨故障域轻松部署和扩展有状态工作负载，从而提供高可用性和容错能力。
+
+<!--
+## Previous challenges
+-->
+## 以前的挑战
+
+<!--
+Before this feature, running stateful workloads with zonal persistent disks (such as AWS ElasticBlockStore, Azure Disk, GCE PersistentDisk) in multi-zone clusters had many challenges. Dynamic provisioning was handled independently from pod scheduling, which meant that as soon as you created a PersistentVolumeClaim (PVC), a volume would get provisioned. This meant that the provisioner had no knowledge of what pods were using the volume, and any pod constraints it had that could impact scheduling.
+-->
+在此功能被提供之前，在多区域集群中使用区域化的持久磁盘（例如 AWS ElasticBlockStore，Azure Disk，GCE PersistentDisk）运行有状态工作负载存在许多挑战。动态供应独立于 Pod 调度处理，这意味着只要您创建了一个 PersistentVolumeClaim（PVC），一个卷就会被供应。这也意味着供应者不知道哪些 Pod 正在使用该卷，也不清楚任何可能影响调度的 Pod 约束。
+
+<!--
+This resulted in unschedulable pods because volumes were provisioned in zones that:
+-->
+这导致了不可调度的 Pod，因为在以下区域中配置了卷：
+
+<!--
+* did not have enough CPU or memory resources to run the pod
+* conflicted with node selectors, pod affinity or anti-affinity policies
+* could not run the pod due to taints
+-->
+* 没有足够的 CPU 或内存资源来运行 Pod
+* 与节点选择器、Pod 亲和或反亲和策略冲突
+* 由于污点（taint）不能运行 Pod
+
+<!--
+Another common issue was that a non-StatefulSet pod using multiple persistent volumes could have each volume provisioned in a different zone, again resulting in an unschedulable pod.
+-->
+另一个常见问题是，使用多个持久卷的非有状态 Pod 可能会在不同的区域中配置每个卷，从而导致一个不可调度的 Pod。
+
+<!--
+Suboptimal workarounds included overprovisioning of nodes, or manual creation of volumes in the correct zones, making it difficult to dynamically deploy and scale stateful workloads.
+-->
+次优的解决方法包括节点超配，或在正确的区域中手动创建卷，但这会造成难以动态部署和扩展有状态工作负载的问题。
+
+<!--
+The topology-aware dynamic provisioning feature addresses all of the above issues.
+-->
+拓扑感知动态供应功能解决了上述所有问题。
+
+<!--
+## Supported Volume Types
+-->
+## 支持的卷类型
+
+<!--
+In 1.12, the following drivers support topology-aware dynamic provisioning:
+-->
+在 1.12 中，以下驱动程序支持拓扑感知动态供应：
+
+<!--
+* AWS EBS
+* Azure Disk
+* GCE PD (including Regional PD)
+* CSI (alpha) - currently only the GCE PD CSI driver has implemented topology support
+-->
+* AWS EBS
+* Azure Disk
+* GCE PD （包括 Regional PD）
+* CSI（alpha） - 目前只有 GCE PD CSI 驱动实现了拓扑支持
+
+<!--
+## Design Principles
+-->
+## 设计原则
+
+<!--
+While the initial set of supported plugins are all zonal-based, we designed this feature to adhere to the Kubernetes principle of portability across environments. Topology specification is generalized and uses a similar label-based specification like in Pod nodeSelectors and nodeAffinity. This mechanism allows you to define your own topology boundaries, such as racks in on-premise clusters, without requiring modifications to the scheduler to understand these custom topologies.
+-->
+虽然最初支持的插件集都是基于区域的，但我们设计此功能时遵循 Kubernetes 跨环境可移植性的原则。
+拓扑规范是通用的，并使用类似于基于标签的规范，如 Pod nodeSelectors 和 nodeAffinity。
+该机制允许您定义自己的拓扑边界，例如内部部署集群中的机架，而无需修改调度程序以了解这些自定义拓扑。
+
+<!--
+In addition, the topology information is abstracted away from the pod specification, so a pod does not need knowledge of the underlying storage system’s topology characteristics. This means that you can use the same pod specification across multiple clusters, environments, and storage systems.
+-->
+此外，拓扑信息是从 Pod 规范中抽象出来的，因此 Pod 不需要了解底层存储系统的拓扑特征。
+这意味着您可以在多个集群、环境和存储系统中使用相同的 Pod 规范。
+
+<!--
+## Getting Started
+-->
+## 入门
+
+<!--
+To enable this feature, all you need to do is to create a StorageClass with `volumeBindingMode` set to `WaitForFirstConsumer`:
+-->
+要启用此功能，您需要做的就是创建一个将 `volumeBindingMode` 设置为 `WaitForFirstConsumer` 的 StorageClass：
+
+```
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  name: topology-aware-standard
+provisioner: kubernetes.io/gce-pd
+volumeBindingMode: WaitForFirstConsumer
+parameters:
+  type: pd-standard
+```
+
+<!--
+This new setting instructs the volume provisioner to not create a volume immediately, and instead, wait for a pod using an associated PVC to run through scheduling. Note that previous StorageClass `zone` and `zones` parameters do not need to be specified anymore, as pod policies now drive the decision of which zone to provision a volume in.
+-->
+这个新设置表明卷配置器不立即创建卷，而是等待使用关联的 PVC 的 Pod 通过调度运行。
+请注意，不再需要指定以前的 StorageClass `zone` 和 `zones` 参数，因为现在在哪个区域中配置卷由 Pod 策略决定。
+
+<!--
+Next, create a pod and PVC with this StorageClass. This sequence is the same as before, but with a different StorageClass specified in the PVC. The following is a hypothetical example, demonstrating the capabilities of the new feature by specifying many pod constraints and scheduling policies:
+-->
+接下来，使用此 StorageClass 创建一个 Pod 和 PVC。
+此过程与之前相同，但在 PVC 中指定了不同的 StorageClass。
+以下是一个假设示例，通过指定许多 Pod 约束和调度策略来演示新功能特性：
+
+<!--
+* multiple PVCs in a pod
+* nodeAffinity across a subset of zones
+* pod anti-affinity on zones
+-->
+* 一个 Pod 多个 PVC
+* 跨子区域的节点亲和
+* 同一区域 Pod 反亲和
+
+```
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: web
+spec:   
+  serviceName: "nginx"
+  replicas: 2
+  selector:
+    matchLabels:
+      app: nginx
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: failure-domain.beta.kubernetes.io/zone
+                operator: In
+                values:
+                - us-central1-a
+                - us-central1-f
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: app
+                operator: In
+                values:
+                - nginx
+            topologyKey: failure-domain.beta.kubernetes.io/zone
+      containers:
+      - name: nginx
+        image: gcr.io/google_containers/nginx-slim:0.8
+        ports:
+        - containerPort: 80
+          name: web
+        volumeMounts:
+        - name: www
+          mountPath: /usr/share/nginx/html
+        - name: logs
+          mountPath: /logs
+ volumeClaimTemplates:
+  - metadata:
+      name: www
+    spec:
+      accessModes: [ "ReadWriteOnce" ]
+      storageClassName: topology-aware-standard
+      resources:
+        requests:
+          storage: 10Gi
+  - metadata:
+      name: logs
+    spec:
+      accessModes: [ "ReadWriteOnce" ]
+      storageClassName: topology-aware-standard
+      resources:
+        requests:
+          storage: 1Gi
+```
+
+<!--
+Afterwards, you can see that the volumes were provisioned in zones according to the policies set by the pod:
+-->
+之后，您可以看到根据 Pod 设置的策略在区域中配置卷：
+
+```
+$ kubectl get pv -o=jsonpath='{range .items[*]}{.spec.claimRef.name}{"\t"}{.metadata.labels.failure\-domain\.beta\.kubernetes\.io/zone}{"\n"}{end}'
+www-web-0       us-central1-f
+logs-web-0      us-central1-f
+www-web-1       us-central1-a
+logs-web-1      us-central1-a
+```
+
+<!--
+## How can I learn more?
+-->
+## 我怎样才能了解更多？
+
+<!--
+Official documentation on the topology-aware dynamic provisioning feature is available here:https://kubernetes.io/docs/concepts/storage/storage-classes/#volume-binding-mode
+-->
+有关拓扑感知动态供应功能的官方文档可在此处获取：https://kubernetes.io/docs/concepts/storage/storage-classes/#volume-binding-mode
+
+<!--
+Documentation for CSI drivers is available at https://kubernetes-csi.github.io/docs/
+-->
+有关 CSI 驱动程序的文档，请访问：https://kubernetes-csi.github.io/docs/
+
+<!--
+## What’s next?
+-->
+## 下一步是什么？
+
+<!--
+We are actively working on improving this feature to support:
+-->
+我们正积极致力于改进此功能以支持：
+
+<!--
+* more volume types, including dynamic provisioning for local volumes
+* dynamic volume attachable count and capacity limits per node
+-->
+* 更多卷类型，包括本地卷的动态供应
+* 动态容量可附加计数和每个节点的容量限制
+
+<!--
+## How do I get involved?
+-->
+## 我如何参与？
+
+<!--
+If you have feedback for this feature or are interested in getting involved with the design and development, join the [Kubernetes Storage Special-Interest-Group](https://github.com/kubernetes/community/tree/master/sig-storage) (SIG). We’re rapidly growing and always welcome new contributors.
+-->
+如果您对此功能有反馈意见或有兴趣参与设计和开发，请加入 [Kubernetes 存储特别兴趣小组](https://github.com/kubernetes/community/tree/master/sig-storage)（SIG）。我们正在快速成长，并始终欢迎新的贡献者。
+
+<!--
+Special thanks to all the contributors that helped bring this feature to beta, including Cheng Xing ([verult](https://github.com/verult)), Chuqiang Li ([lichuqiang](https://github.com/lichuqiang)), David Zhu ([davidz627](https://github.com/davidz627)), Deep Debroy ([ddebroy](https://github.com/ddebroy)), Jan Šafránek ([jsafrane](https://github.com/jsafrane)), Jordan Liggitt ([liggitt](https://github.com/liggitt)), Michelle Au ([msau42](https://github.com/msau42)), Pengfei Ni ([feiskyer](https://github.com/feiskyer)), Saad Ali ([saad-ali](https://github.com/saad-ali)), Tim Hockin ([thockin](https://github.com/thockin)), and Yecheng Fu ([cofyc](https://github.com/cofyc)).
+-->
+特别感谢帮助推出此功能的所有贡献者，包括 Cheng Xing ([verult](https://github.com/verult))、Chuqiang Li ([lichuqiang](https://github.com/lichuqiang))、David Zhu ([davidz627](https://github.com/davidz627))、Deep Debroy ([ddebroy](https://github.com/ddebroy))、Jan Šafránek ([jsafrane](https://github.com/jsafrane))、Jordan Liggitt ([liggitt](https://github.com/liggitt))、Michelle Au ([msau42](https://github.com/msau42))、Pengfei Ni ([feiskyer](https://github.com/feiskyer))、Saad Ali ([saad-ali](https://github.com/saad-ali))、Tim Hockin ([thockin](https://github.com/thockin))，以及 Yecheng Fu ([cofyc](https://github.com/cofyc))。

content/zh/blog/_posts/2018-10-15-steering-election-results.md

@@ -0,0 +1,73 @@
+---
+layout: blog
+title: '2018 年督导委员会选举结果'
+date: 2018-10-15
+---
+<!--
+---
+layout: blog
+title: '2018 Steering Committee Election Results'
+date: 2018-10-15
+---
+-->
+
+<!-- **Authors**: Jorge Castro (Heptio), Ihor Dvoretskyi (CNCF), Paris Pittman (Google) -->
+**作者**: Jorge Castro (Heptio), Ihor Dvoretskyi (CNCF), Paris Pittman (Google)
+
+<!--
+## Results
+-->
+## 结果
+<!--
+The [Kubernetes Steering Committee Election](https://kubernetes.io/blog/2018/09/06/2018-steering-committee-election-cycle-kicks-off/) is now complete and the following candidates came ahead to secure two year terms that start immediately:
+-->
+[Kubernetes 督导委员会选举](https://kubernetes.io/blog/2018/09/06/2018-steering-committee-election-cycle-kicks-off/)现已完成，以下候选人获得了立即开始的两年任期：
+
+* Aaron Crickenberger, Google, [@spiffxp](https://github.com/spiffxp)
+* Davanum Srinivas, Huawei, [@dims](https://github.com/dims)
+* Tim St. Clair, Heptio, [@timothysc](https://github.com/timothysc)
+
+<!--
+## Big Thanks!
+-->
+## 十分感谢！
+
+<!-- 
+* Steering Committee Member Emeritus [Quinton Hoole](https://github.com/quinton-hoole) for his service to the community over the past year. We look forward to
+* The candidates that came forward to run for election. May we always have a strong set of people who want to push community forward like yours in every election.
+* All 307 voters who cast a ballot.
+* And last but not least...Cornell University for hosting [CIVS](https://civs.cs.cornell.edu/)! 
+-->
+* 督导委员会荣誉退休成员 [Quinton Hoole](https://github.com/quinton-hoole)，表扬他在过去一年为社区所作的贡献。我们期待着
+* 参加竞选的候选人。愿我们永远拥有一群强大的人，他们希望在每一次选举中都能像你们一样推动社区向前发展。
+* 共计 307 名选民参与投票。
+* 本次选举由康奈尔大学主办 [CIVS](https://civs.cs.cornell.edu/)！
+
+<!--
+## Get Involved with the Steering Committee
+-->
+## 加入督导委员会
+<!--
+You can follow along to Steering Committee [backlog items](https://git.k8s.io/steering/backlog.md) and weigh in by filing an issue or creating a PR against their [repo](https://github.com/kubernetes/steering). They meet bi-weekly on [Wednesdays at 8pm UTC](https://github.com/kubernetes/steering) and regularly attend Meet Our Contributors.
+-->
+你可以关注督导委员会的[任务清单](https://git.k8s.io/steering/backlog.md)，并通过向他们的[代码仓库](https://github.com/kubernetes/steering)提交 issue 或 PR 的方式来参与。他们也会在[UTC 时间每周三晚 8 点](https://github.com/kubernetes/steering)举行会议，并定期与我们的贡献者见面。
+
+<!--
+Steering Committee Meetings:
+-->
+督导委员会会议：
+
+* [YouTube 播放列表](https://www.youtube.com/playlist?list=PL69nYSiGNLP1yP1B_nd9-drjoxp0Q14qM)
+
+<!--
+Meet Our Contributors Steering AMA’s: 
+-->
+与我们的贡献者会面：
+
+<!--
+* [Oct  3 2018](https://youtu.be/x6Jm8p0K-IQ)
+* [Sept 5 2018](https://youtu.be/UbxWV12Or58)
+-->
+
+* [2018 年 10 月 3 日](https://youtu.be/x6Jm8p0K-IQ)
+* [2018 年 7 月 5 日](https://youtu.be/UbxWV12Or58)

content/zh/blog/_posts/2018-10-16-kubernetes-2018-north-american-contributor-summit.md

@@ -0,0 +1,118 @@
+---
+layout: "Blog"
+title: "Kubernetes 2018 年北美贡献者峰会"
+date: 2018-10-16    
+---
+<!--
+---
+layout: "Blog"
+title: "Kubernetes 2018 North American Contributor Summit"
+date: 2018-10-16    
+---
+-->
+<!--
+**Authors:**
+-->
+**作者：**
+<!--
+[Bob Killen][bob] (University of Michigan)
+[Sahdev Zala][sahdev] (IBM),
+[Ihor Dvoretskyi][ihor] (CNCF) 
+-->
+[Bob Killen][bob]（密歇根大学）
+[Sahdev Zala][sahdev]（IBM），
+[Ihor Dvoretskyi][ihor]（CNCF）
+
+<!--
+The 2018 North American Kubernetes Contributor Summit to be hosted right before
+[KubeCon + CloudNativeCon][kubecon] Seattle is shaping up to be the largest yet.
+-->
+2018 年北美 Kubernetes 贡献者峰会将在西雅图 [KubeCon + CloudNativeCon][kubecon] 会议之前举办，这将是迄今为止规模最大的一次盛会。
+<!--
+It is an event that brings together new and current contributors alike to
+connect and share face-to-face; and serves as an opportunity for existing
+contributors to help shape the future of community development. For new
+community members, it offers a welcoming space to learn, explore and put the
+contributor workflow to practice.
+-->
+这是一个将新老贡献者聚集在一起，面对面交流和分享的活动；并为现有的贡献者提供一个机会，帮助塑造社区发展的未来。它为新的社区成员提供了一个学习、探索和实践贡献工作流程的良好空间。
+
+<!--
+Unlike previous Contributor Summits, the event now spans two-days with a more
+relaxed ‘hallway’ track and general Contributor get-together to be hosted from
+5-8pm on Sunday December 9th at the [Garage Lounge and Gaming Hall][garage], just
+a short walk away from the Convention Center. There, contributors can enjoy
+billiards, bowling, trivia and more; accompanied by a variety of food and drink. 
+-->
+与之前的贡献者峰会不同，本次活动为期两天，有一个更为轻松的行程安排，一般贡献者将于 12 月 9 日（周日）下午 5 点至 8 点在距离会议中心仅几步远的 [Garage Lounge and Gaming Hall][garage] 举办峰会。在那里，贡献者也可以进行台球、保龄球等娱乐活动，而且还有各种食品和饮料。
+
+<!--
+Things pick up the following day, Monday the 10th with three separate tracks: 
+-->
+接下来的一天，也就是 10 号星期一，有三个独立的会议你可以选择参与：
+
+<!--
+### New Contributor Workshop:
+A half day workshop aimed at getting new and first time contributors onboarded
+and comfortable with working within the Kubernetes Community. Staying for the
+duration is required; this is not a workshop you can drop into. 
+-->
+### 新贡献者研讨会：
+
+为期半天的研讨会旨在让新贡献者加入社区，并营造一个良好的 Kubernetes 社区工作环境。
+请在开会期间保持在场，该讨论会不允许随意进出。
+
+<!--
+### Current Contributor Track:
+Reserved for those that are actively engaged with the development of the
+project; the Current Contributor Track includes Talks, Workshops, Birds of a
+Feather, Unconferences, Steering Committee Sessions, and more! Keep an eye on
+the [schedule in GitHub][schedule] as content is frequently being updated.
+-->
+### 当前贡献者追踪：
+
+保留给那些积极参与项目开发的贡献者；目前的贡献者追踪包括讲座、研讨会、聚会、Unconferences 会议、指导委员会会议等等!
+请留意 [GitHub 中的时间表][时间表]，因为内容经常更新。
+
+<!--
+### Docs Sprint:
+SIG-Docs will have a curated list of issues and challenges to be tackled closer
+to the event date.
+-->
+### Docs 冲刺：
+
+SIG-Docs 将在活动日期临近的时候列出一个需要处理的问题和挑战列表。
+
+<!--
+## To Register:
+To register for the Contributor Summit, see the [Registration section of the
+Event Details in GitHub][register]. Please note that registrations are being
+reviewed. If you select the “Current Contributor Track” and are not an active
+contributor, you will be asked to attend the New Contributor Workshop, or asked
+to be put on a waitlist. With thousands of contributors and only 300 spots, we
+need to make sure the right folks are in the room. 
+-->
+## 注册：
+
+要注册贡献者峰会，请参阅 Git Hub 上的[活动详情注册部分][注册]。请注意报名正在审核中。
+如果您选择了 “当前贡献者追踪”，而您却不是一个活跃的贡献者，您将被要求参加新贡献者研讨会，或者被要求进入候补名单。
+成千上万的贡献者只有 300 个位置，我们需要确保正确的人被安排席位。
+
+<!--
+If you have any questions or concerns, please don’t hesitate to reach out to
+the Contributor Summit Events Team at community@kubernetes.io.
+-->
+如果您有任何问题或疑虑，请随时通过 community@kubernetes.io 联系贡献者峰会组织团队。
+
+<!--
+Look forward to seeing everyone there!
+-->
+期待在那里看到每个人！
+
+[bob]: https://twitter.com/mrbobbytables
+[sahdev]: https://twitter.com/sp_zala
+[ihor]: https://twitter.com/idvoretskyi
+[kubecon]: https://events.linuxfoundation.org/events/kubecon-cloudnativecon-north-america-2018/
+[garage]: https://www.garagebilliards.com/
+[时间表]: https://git.k8s.io/community/events/2018/12-contributor-summit#agenda
+[注册]:  https://git.k8s.io/community/events/2018/12-contributor-summit#registration

content/zh/blog/_posts/2018-11-08-kubernetes-docs-update-i18n.md

@@ -0,0 +1,89 @@
+---
+layout: blog
+title: 'Kubernetes 文档更新，国际版'
+date: 2018-11-08
+---
+<!--
+---
+layout: blog
+title: 'Kubernetes Docs Updates, International Edition'
+date: 2018-11-08
+---
+-->
+
+<!-- **Author**: Zach Corleissen (Linux Foundation) -->
+**作者**：Zach Corleissen （Linux 基金会）
+
+<!-- As a co-chair of SIG Docs, I'm excited to share that Kubernetes docs have a fully mature workflow for localization (l10n).  -->
+作为文档特别兴趣小组（SIG Docs）的联合主席，我很高兴能与大家分享 Kubernetes 文档在本地化（l10n）方面所拥有的一个完全成熟的工作流。
+
+<!-- ## Abbreviations galore -->
+## 丰富的缩写
+
+<!-- L10n is an abbreviation for _localization_. -->
+L10n 是 _localization_ 的缩写。
+
+<!-- I18n is an abbreviation for _internationalization_.  -->
+I18n 是 _internationalization_ 的缩写。
+
+<!-- I18n is [what you do](https://www.w3.org/International/questions/qa-i18n) to make l10n easier. L10n is a fuller, more comprehensive process than translation (_t9n_). -->
+I18n 定义了[做什么](https://www.w3.org/International/questions/qa-i18n) 能让 l10n 更容易。而 L10n 更全面，相比翻译（ _t9n_ ）具备更完善的流程。
+
+<!-- ## Why localization matters -->
+## 为什么本地化很重要
+
+<!-- The goal of SIG Docs is to make Kubernetes easier to use for as many people as possible. -->
+SIG Docs 的目标是让 Kubernetes 更容易为尽可能多的人使用。
+
+<!-- One year ago, we looked at whether it was possible to host the output of a Chinese team working independently to translate the Kubernetes docs. After many conversations (including experts on OpenStack l10n), [much transformation](https://kubernetes.io/blog/2018/05/05/hugo-migration/), and [renewed commitment to easier localization](https://github.com/kubernetes/website/pull/10485), we realized that open source documentation is, like open source software, an ongoing exercise at the edges of what's possible. -->
+一年前，我们研究了是否有可能由一个独立翻译 Kubernetes 文档的中国团队来主持文档输出。经过多次交谈（包括 OpenStack l10n 的专家），[多次转变](https://kubernetes.io/blog/2018/05/05/hugo-migration/)，以及[重新致力于更轻松的本地化](https://github.com/kubernetes/website/pull/10485)，我们意识到，开源文档就像开源软件一样，是在可能的边缘不断进行实践。
+
+<!-- Consolidating workflows, language labels, and team-level ownership may seem like simple improvements, but these features make l10n scalable for increasing numbers of l10n teams. While SIG Docs continues to iterate improvements, we've paid off a significant amount of technical debt and streamlined l10n in a single workflow. That's great for the future as well as the present. -->
+整合工作流程、语言标签和团队级所有权可能看起来像是十分简单的改进，但是这些功能使 l10n 可以扩展到规模越来越大的 l10n 团队。随着 SIG Docs 不断改进，我们已经在单一工作流程中偿还了大量技术债务并简化了 l10n。这对未来和现在都很有益。
+
+<!-- ## Consolidated workflow -->
+## 整合的工作流程
+
+<!-- Localization is now consolidated in the [kubernetes/website](https://github.com/kubernetes/website) repository. We've configured the Kubernetes CI/CD system, [Prow](https://github.com/kubernetes/test-infra/tree/master/prow), to handle automatic language label assignment as well as team-level PR review and approval. -->
+现在，本地化已整合到 [kubernetes/website](https://github.com/kubernetes/website) 存储库。我们已经配置了 Kubernetes CI/CD 系统，[Prow](https://github.com/kubernetes/test-infra/tree/master/prow) 来处理自动语言标签分配以及团队级 PR 审查和批准。
+
+<!-- ### Language labels  -->
+### 语言标签
+
+<!-- Prow automatically applies language labels based on file path. Thanks to SIG Docs contributor [June Yi](https://github.com/kubernetes/test-infra/pull/9835), folks can also manually assign language labels in pull request (PR) comments. For example, when left as a comment on an issue or PR, this command assigns the label `language/ko` (Korean). -->
+Prow 根据文件路径自动添加语言标签。感谢 SIG Docs 贡献者 [June Yi](https://github.com/kubernetes/test-infra/pull/9835)，他让人们还可以在 pull request（PR）注释中手动分配语言标签。例如，当为 issue 或 PR 留下下述注释时，将为之分配标签 `language/ko`（Korean）。
+
+```
+/language ko
+```
+
+
+<!-- These repo labels let reviewers filter for PRs and issues by language. For example, you can now filter the k/website dashboard for [PRs with Chinese content](https://github.com/kubernetes/website/pulls?utf8=%E2%9C%93&q=is%3Aopen+is%3Apr+label%3Alanguage%2Fzh).   -->
+这些存储库标签允许审阅者按语言过滤 PR 和 issue。例如，您现在可以过滤 kubernetes/website 面板中[具有中文内容的 PR](https://github.com/kubernetes/website/pulls?utf8=%E2%9C%93&q=is%3Aopen+is%3Apr+label%3Alanguage%2Fzh)。
+
+<!-- ### Team review  -->
+### 团队审核
+
+<!-- L10n teams can now review and approve their own PRs. For example, review and approval permissions for English are [assigned in an OWNERS file](https://github.com/kubernetes/website/blob/master/content/en/OWNERS) in the top subfolder for English content.  -->
+L10n 团队现在可以审查和批准他们自己的 PR。例如，英语的审核和批准权限在位于用于显示英语内容的顶级子文件夹中的 [OWNERS 文件中指定](https://github.com/kubernetes/website/blob/master/content/en/OWNERS)。
+
+<!-- Adding `OWNERS` files to subdirectories lets localization teams review and approve changes without requiring a rubber stamp approval from reviewers who may lack fluency. -->
+将 `OWNERS` 文件添加到子目录可以让本地化团队审查和批准更改，而无需由可能并不擅长该门语言的审阅者进行批准。
+
+<!-- ## What's next -->
+## 下一步是什么
+
+<!-- We're looking forward to the [doc sprint in Shanghai](https://kccncchina2018english.sched.com/event/HVb2/contributor-summit-doc-sprint-additional-registration-required) to serve as a resource for the Chinese l10n team. -->
+我们期待着[上海的 doc sprint](https://kccncchina2018english.sched.com/event/HVb2/contributor-summit-doc-sprint-additional-registration-required) 能作为中国 l10n 团队的资源。
+
+<!-- We're excited to continue supporting the Japanese and Korean l10n teams, who are making excellent progress. -->
+我们很高兴继续支持正在取得良好进展的日本和韩国 l10n 队伍。
+
+<!-- If you're interested in localizing Kubernetes for your own language or region, check out our [guide to localizing Kubernetes docs](https://kubernetes.io/docs/contribute/localization/) and reach out to a [SIG Docs chair](https://github.com/kubernetes/community/tree/master/sig-docs#leadership) for support. -->
+如果您有兴趣将 Kubernetes 本地化为您自己的语言或地区，请查看我们的[本地化 Kubernetes 文档指南](https://kubernetes.io/docs/contribute/localization/)，并联系 [SIG Docs 主席团](https://github.com/kubernetes/community/tree/master/sig-docs#leadership)获取支持。
+
+<!-- ### Get involved with SIG Docs  -->
+### 加入SIG Docs
+
+<!-- If you're interested in Kubernetes documentation, come to a SIG Docs [weekly meeting](https://github.com/kubernetes/community/tree/master/sig-docs#meetings), or join [#sig-docs in Kubernetes Slack](https://kubernetes.slack.com/messages/C1J0BPD2M/details/). -->
+如果您对 Kubernetes 文档感兴趣，请参加 SIG Docs [每周会议](https://github.com/kubernetes/community/tree/master/sig-docs#meetings)，或在 [Kubernetes Slack 加入 #sig-docs](https://kubernetes.slack.com/messages/C1J0BPD2M/details/)。

content/zh/blog/_posts/2018-12-05-new-contributor-shanghai.md

@@ -0,0 +1,119 @@
+---
+layout: blog
+title: '新贡献者工作坊上海站'
+date: 2018-12-05
+---
+ 
+<!-- 
+---
+layout: blog
+title: 'New Contributor Workshop Shanghai'
+date: 2018-12-05
+---
+ -->
+
+<!-- 
+**Authors**: Josh Berkus (Red Hat), Yang Li (The Plant), Puja Abbassi (Giant Swarm), XiangPeng Zhao (ZTE)
+ -->
+
+**作者**: Josh Berkus (红帽), Yang Li (The Plant), Puja Abbassi (Giant Swarm), XiangPeng Zhao (中兴通讯)
+
+<!-- 
+{{< figure src="/images/blog/2018-12-05-new-contributor-shanghai/attendees.png" caption="KubeCon Shanghai New Contributor Summit attendees. Photo by Jerry Zhang" >}}
+ -->
+
+{{< figure src="/images/blog/2018-12-05-new-contributor-shanghai/attendees.png" caption="KubeCon 上海站新贡献者峰会与会者，摄影：Jerry Zhang" >}}
+
+<!-- 
+We recently completed our first New Contributor Summit in China, at the first KubeCon in China. It was very exciting to see all of the Chinese and Asian developers (plus a few folks from around the world) interested in becoming contributors. Over the course of a long day, they learned how, why, and where to contribute to Kubernetes, created pull requests, attended a panel of current contributors, and got their CLAs signed.
+ -->
+
+最近，在中国的首次 KubeCon 上，我们完成了在中国的首次新贡献者峰会。看到所有中国和亚洲的开发者（以及来自世界各地的一些人）有兴趣成为贡献者，这令人非常兴奋。在长达一天的课程中，他们了解了如何、为什么以及在何处为 Kubernetes 作出贡献，创建了 PR，参加了贡献者圆桌讨论，并签署了他们的 CLA。
+
+<!-- 
+This was our second New Contributor Workshop (NCW), building on the one created and led by SIG Contributor Experience members in Copenhagen. Because of the audience, it was held in both Chinese and English, taking advantage of the superb simultaneous interpretation services the CNCF sponsored. Likewise, the NCW team included both English and Chinese-speaking members of the community: Yang Li, XiangPeng Zhao, Puja Abbassi, Noah Abrahams, Tim Pepper, Zach Corleissen, Sen Lu, and Josh Berkus. In addition to presenting and helping students, the bilingual members of the team translated all of the slides into Chinese. Fifty-one students attended.
+ -->
+
+这是我们的第二届新贡献者工作坊（NCW），它由前一次贡献者体验 SIG 成员创建和领导的哥本哈根研讨会延伸而来。根据受众情况，本次活动采用了中英文两种语言，充分利用了 CNCF 赞助的一流的同声传译服务。同样，NCW 团队由社区成员组成，既有说英语的，也有说汉语的：Yang Li、XiangPeng Zhao、Puja Abbassi、Noah Abrahams、Tim Pepper、Zach Corleissen、Sen Lu 和 Josh Berkus。除了演讲和帮助学员外，团队的双语成员还将所有幻灯片翻译成了中文。共有五十一名学员参加。
+
+<!-- 
+{{< figure src="/images/blog/2018-12-05-new-contributor-shanghai/noahabrahams.png" caption="Noah Abrahams explains Kubernetes communications channels. Photo by Jerry Zhang" >}}
+ -->
+
+{{< figure src="/images/blog/2018-12-05-new-contributor-shanghai/noahabrahams.png" caption="Noah Abrahams 讲解 Kubernetes 沟通渠道。摄影：Jerry Zhang" >}}
+
+<!-- 
+The NCW takes participants through the stages of contributing to Kubernetes, starting from deciding where to contribute, followed by an introduction to the SIG system and our repository structure. We also have "guest speakers" from Docs and Test Infrastructure who cover contributing in those areas. We finally wind up with some hands-on exercises in filing issues and creating and approving PRs.
+ -->
+
+NCW 让参与者完成了为 Kubernetes 作出贡献的各个阶段，从决定在哪里作出贡献开始，接着介绍了 SIG 系统和我们的代码仓库结构。我们还有来自文档和测试基础设施领域的「客座讲者」，他们负责讲解有关的贡献。最后，我们在创建 issue、提交并批准 PR 的实践练习后，结束了工作坊。
+
+<!-- 
+Those hands-on exercises use a repository known as [the contributor playground](https://github.com/kubernetes-sigs/contributor-playground), created by SIG Contributor Experience as a place for new contributors to try out performing various actions on a Kubernetes repo. It has modified Prow and Tide automation, uses Owners files like in the real repositories. This lets students learn how the mechanics of contributing to our repositories work without disrupting normal development.
+ -->
+
+这些实践练习使用一个名为[贡献者游乐场](https://github.com/kubernetes-sigs/contributor-playground)的代码仓库，由贡献者体验 SIG 创建，让新贡献者尝试在一个 Kubernetes 仓库中执行各种操作。它修改了 Prow 和 Tide 自动化，使用与真实代码仓库类似的 Owners 文件。这可以让学员了解为我们的仓库做出贡献的有关机制，同时又不妨碍正常的开发流程。
+
+<!-- 
+{{< figure src="/images/blog/2018-12-05-new-contributor-shanghai/yangli.png" caption="Yang Li talks about getting your PRs reviewed. Photo by Josh Berkus" >}}
+ -->
+
+{{< figure src="/images/blog/2018-12-05-new-contributor-shanghai/yangli.png" caption="Yang Li 讲到如何让你的 PR 通过评审。摄影：Josh Berkus" >}}
+
+<!-- 
+Both the "Great Firewall" and the language barrier prevent contributing Kubernetes from China from being straightforward. What's more, because open source business models are not mature in China, the time for employees work on open source projects is limited.
+ -->
+
+「防火长城」和语言障碍都使得在中国为 Kubernetes 作出贡献变得困难。而且，中国的开源商业模式并不成熟，员工在开源项目上工作的时间有限。
+
+<!-- 
+Chinese engineers are eager to participate in the development of Kubernetes, but many of them don't know where to start since Kubernetes is such a large project. With this workshop, we hope to help those who want to contribute, whether they wish to fix some bugs they encountered, improve or localize documentation, or they need to work with Kubernetes at their work. We are glad to see more and more Chinese contributors joining the community in the past few years, and we hope to see more of them in the future.
+ -->
+
+中国工程师渴望参与 Kubernetes 的研发，但他们中的许多人不知道从何处开始，因为 Kubernetes 是一个如此庞大的项目。通过本次工作坊，我们希望帮助那些想要参与贡献的人，不论他们希望修复他们遇到的一些错误、改进或本地化文档，或者他们需要在工作中用到 Kubernetes。我们很高兴看到越来越多的中国贡献者在过去几年里加入社区，我们也希望将来可以看到更多。
+
+<!-- 
+"I have been participating in the Kubernetes community for about three years," said XiangPeng Zhao. "In the community, I notice that more and more Chinese developers are showing their interest in contributing to Kubernetes. However, it's not easy to start contributing to such a project. I tried my best to help those who I met in the community, but I think there might still be some new contributors leaving the community due to not knowing where to get help when in trouble. Fortunately, the community initiated NCW at KubeCon Copenhagen and held a second one at KubeCon Shanghai. I was so excited to be invited by Josh Berkus to help organize this workshop. During the workshop, I met community friends in person, mentored attendees in the exercises, and so on. All of this was a memorable experience for me. I also learned a lot as a contributor who already has years of contributing experience. I wish I had attended such a workshop when I started contributing to Kubernetes years ago."
+ -->
+
+「我已经参与了 Kubernetes 社区大约三年」，XiangPeng Zhao 说，「在社区，我注意到越来越多的中国开发者表现出对 Kubernetes 贡献的兴趣。但是，开始为这样一个项目做贡献并不容易。我尽力帮助那些我在社区遇到的人，但是，我认为可能仍有一些新的贡献者离开社区，因为他们在遇到麻烦时不知道从哪里获得帮助。幸运的是，社区在 KubeCon 哥本哈根站发起了 NCW，并在 KubeCon 上海站举办了第二届。我很高兴受到 Josh Berkus 的邀请，帮助组织这个工作坊。在工作坊期间，我当面见到了社区里的朋友，在练习中指导了与会者，等等。所有这些对我来说都是难忘的经历。作为有着多年贡献者经验的我，也学习到了很多。我希望几年前我开始为 Kubernetes 做贡献时参加过这样的工作坊」。
+
+<!-- 
+{{< figure src="/images/blog/2018-12-05-new-contributor-shanghai/panel.png" caption="Panel of contributors. Photo by Jerry Zhang" >}}
+ -->
+
+{{< figure src="/images/blog/2018-12-05-new-contributor-shanghai/panel.png" caption="贡献者圆桌讨论。摄影：Jerry Zhang" >}}
+
+<!-- 
+The workshop ended with a panel of current contributors, featuring Lucas Käldström, Janet Kuo, Da Ma, Pengfei Ni, Zefeng Wang, and Chao Xu. The panel aimed to give both new and current contributors a look behind the scenes on the day-to-day of some of the most active contributors and maintainers, both from China and around the world. Panelists talked about where to begin your contributor's journey, but also how to interact with reviewers and maintainers. They further touched upon the main issues of contributing from China and gave attendees an outlook into exciting features they can look forward to in upcoming releases of Kubernetes.
+ -->
+
+工作坊以现有贡献者圆桌讨论结束，嘉宾包括 Lucas Käldström、Janet Kuo、Da Ma、Pengfei Ni、Zefeng Wang 和 Chao Xu。这场圆桌讨论旨在让新的和现有的贡献者了解一些最活跃的贡献者和维护者的幕后日常工作，不论他们来自中国还是世界各地。嘉宾们讨论了从哪里开始贡献者的旅程，以及如何与评审者和维护者进行互动。他们进一步探讨了在中国参与贡献的主要问题，并向与会者预告了在 Kubernetes 的未来版本中可以期待的令人兴奋的功能。
+
+<!-- 
+After the workshop, XiangPeng Zhao chatted with some attendees on WeChat and Twitter about their experiences. They were very glad to have attended the NCW and had some suggestions on improving the workshop. One attendee, Mohammad, said, "I had a great time at the workshop and learned a lot about the entire process of k8s for a contributor." Another attendee, Jie Jia, said, "The workshop was wonderful. It systematically explained how to contribute to Kubernetes. The attendee could understand the process even if s/he knew nothing about that before. For those who were already contributors, they could also learn something new. Furthermore, I could make new friends from inside or outside of China in the workshop. It was awesome!"
+ -->
+
+工作坊结束后，XiangPeng Zhao 和一些与会者就他们的经历在微信和 Twitter 上进行了交谈。他们很高兴参加了 NCW，并就改进工作坊提出了一些建议。一位名叫 Mohammad 的与会者说：「我在工作坊上玩得很开心，学习了参与 k8s 贡献的整个过程。」另一位与会者 Jie Jia 说：「工作坊非常精彩。它系统地解释了如何为 Kubernetes 做出贡献。即使参与者之前对此一无所知，他（她）也可以理解这个过程。对于那些已经是贡献者的人，他们也可以学习到新东西。此外，我还可以在工作坊上结识来自国内外的新朋友。真是棒极了！」
+
+<!-- 
+SIG Contributor Experience will continue to run New Contributor Workshops at each upcoming KubeCon, including Seattle, Barcelona, and the return to Shanghai in June 2019. If you failed to get into one this year, register for one at a future KubeCon. And, when you meet an NCW attendee, make sure to welcome them to the community.
+ -->
+
+贡献者体验 SIG 将继续在未来的 KubeCon 上举办新贡献者工作坊，包括西雅图站、巴塞罗那站，然后在 2019 年六月回到上海。如果你今年未能参加，请在未来的 KubeCon 上注册。并且，如果你遇到工作坊的与会者，请务必欢迎他们加入社区。
+
+<!-- 
+Links:
+ -->
+
+链接：
+
+<!-- 
+* English versions of the slides: [PDF](https://gist.github.com/jberkus/889be25c234b01761ce44eccff816380#file-kubernetes-shanghai-english-pdf) or [Google Docs with speaker notes](https://docs.google.com/presentation/d/1l5f_iAFsKg50LFq3N80KbZKUIEL_tyCaUoWPzSxColo/edit?usp=sharing)
+* Chinese version of the slides: [PDF](https://gist.github.com/jberkus/889be25c234b01761ce44eccff816380#file-kubernetes-shanghai-cihinese-pdf)
+* [Contributor playground](https://github.com/kubernetes-sigs/contributor-playground)
+ -->
+
+* 中文版幻灯片：[PDF](https://gist.github.com/jberkus/889be25c234b01761ce44eccff816380#file-kubernetes-shanghai-cihinese-pdf)
+* 英文版幻灯片：[PDF](https://gist.github.com/jberkus/889be25c234b01761ce44eccff816380#file-kubernetes-shanghai-english-pdf) 或 [带有演讲者笔记的 Google Docs](https://docs.google.com/presentation/d/1l5f_iAFsKg50LFq3N80KbZKUIEL_tyCaUoWPzSxColo/edit?usp=sharing)
+* [贡献者游乐场](https://github.com/kubernetes-sigs/contributor-playground)

content/zh/case-studies/_index.html

@@ -1,23 +1,21 @@
----
-title: 案例研究
-linkTitle: 案例研究
-bigheader: Kubernetes 用户案例研究
-abstract: 在生产环境中运行 Kubernetes 的用户集合。
-layout: basic
-class: gridPage
-cid: caseStudies
----
-
-<!--
-
----
-title: Case Studies
-linkTitle: Case Studies
-bigheader: Kubernetes User Case Studies
-abstract: A collection of users running Kubernetes in production.
-layout: basic
-class: gridPage
-cid: caseStudies
----
-
--->
+---
+title: 案例分析
+linkTitle: 案例分析
+bigheader: Kubernetes 用户案例分析
+abstract: 在生产环境下使用 Kubernetes 的案例集
+layout: basic
+class: gridPage
+cid: caseStudies
+---
+
+<!--
+---
+title: Case Studies
+linkTitle: Case Studies
+bigheader: Kubernetes User Case Studies
+abstract: A collection of users running Kubernetes in production.
+layout: basic
+class: gridPage
+cid: caseStudies
+---
+-->

content/zh/case-studies/ccp-games/index.html

@@ -0,0 +1,4 @@
+---
+title: CCP Games
+content_url: https://cloud.google.com/customers/ccp-games/
+---

content/zh/case-studies/goldman-sachs/index.html

@@ -0,0 +1,4 @@
+---
+title: Goldman Sachs
+content_url: http://blogs.wsj.com/cio/2016/02/24/big-changes-in-goldmans-software-emerge-from-small-containers/
+---

content/zh/case-studies/huawei/index.html

@@ -0,0 +1,433 @@
+---
+title: 华为案例分析
+
+case_study_styles: true
+cid: caseStudies
+css: /css/style_huawei.css
+---
+
+<!--
+---
+title: Huawei Case Study
+
+case_study_styles: true
+cid: caseStudies
+css: /css/style_huawei.css
+---
+-->
+
+<div class="banner1">
+  <h1> 案例分析：<img src="/images/huawei_logo.png" class="header_logo"><br> <div class="subhead">以用户和供应商身份拥抱云原生</div></h1>
+  <!--
+  <h1> CASE STUDY:<img src="/images/huawei_logo.png" class="header_logo"><br> <div class="subhead">Embracing Cloud Native as a User – and a Vendor</div></h1>
+  -->
+</div>
+
+<div class="details">
+    公司 &nbsp;<b>华为</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;地点 &nbsp;<b>中国深圳</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;产业 &nbsp;<b>通信设备</b>
+    <!--
+    Company &nbsp;<b>Huawei</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Location &nbsp;<b>Shenzhen, China</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Industry &nbsp;<b>Telecommunications Equipment</b>
+    -->
+</div>
+
+<hr>
+
+<section class="section1">
+
+<div class="cols">
+  <div class="col1">
+    <h2>挑战</h2>
+    <!--
+    <h2>Challenge</h2>
+    -->
+      华为是世界上最大的电信设备制造商，拥有超过 18 万名员工。
+      <!--
+      A multinational company that’s the largest telecommunications equipment manufacturer in the world, 
+      Huawei has more than 180,000 employees. 
+      -->
+
+      为了支持华为在全球的快速业务发展，<a href="http://www.huawei.com/">华为</a>内部 IT 部门有 8 个数据中心，
+      这些数据中心在 100K+ VMs 上运行了 800 多个应用程序，服务于这 18 万用户。
+      <!--
+      In order to support its fast business development around the globe, 
+      <a href="http://www.huawei.com/">Huawei</a> has eight data centers for its internal I.T. department,
+      which have been running 800+ applications in 100K+ VMs to serve these 180,000 users. 
+      -->
+
+      随着新应用程序的快速增长，基于 VM 的应用程序的管理和部署的成本和效率都成为业务敏捷性的关键挑战。
+      <!--
+      With the rapid increase of new applications, the cost and efficiency of management and 
+      deployment of VM-based apps all became critical challenges for business agility.
+      -->
+
+      该公司首席软件架构师、开源社区总监侯培新表示：
+      “这是一个超大的分布式系统，因此我们发现，以更一致的方式管理所有任务始终是一个挑战。
+      我们希望进入一种更敏捷、更得体的实践”。
+      <!--
+      "It’s very much a distributed system so we found that managing all of the tasks 
+      in a more consistent way is always a challenge," says Peixin Hou, 
+      the company’s Chief Software Architect and Community Director for Open Source. 
+      "We wanted to move into a more agile and decent practice."  
+      -->
+
+  </div>
+
+<div class="col2">
+  <h2>解决方案</h2>
+  <!--
+  <h2>Solution</h2>
+  -->
+      在决定使用容器技术后，华为开始将内部 IT 部门的应用程序迁移到<a href="http://kubernetes.io/"> Kubernetes </a>上运行。
+      到目前为止，大约 30% 的应用程序已经转移为云原生程序。
+      <!--
+      After deciding to use container technology, Huawei began moving the internal I.T. department’s applications 
+      to run on <a href="http://kubernetes.io/">Kubernetes</a>.
+      So far, about 30 percent of these applications have been transferred to cloud native.  
+      -->
+<br>
+<br>
+<h2>影响</h2>
+<!--
+<h2>Impact</h2>  
+-->
+      “到 2016 年底，华为的内部 IT 部门使用基于 Kubernetes 的平台即服务（PaaS）解决方案管理了 4000 多个节点和数万个容器。
+      全局部署周期从一周缩短到几分钟，应用程序交付效率提高了 10 倍”。
+      <!--
+       "By the end of 2016, Huawei’s internal I.T. department managed more than 4,000 nodes with tens of thousands containers 
+       using a Kubernetes-based Platform as a Service (PaaS) solution," says Hou.
+       "The global deployment cycles decreased from a week to minutes, and the efficiency of application delivery has been improved 10 fold."
+      -->
+
+      对于底线，侯培新表示，“我们还看到运营开支大幅削减，在某些情况下可削减 20% 到 30%，我们认为这对我们的业务非常有帮助”。
+      <!--
+      For the bottom line, he says, "We also see significant operating expense spending cut, in some circumstances 20-30 percent, 
+      which we think is very helpful for our business."
+      -->
+      
+      这里给出一些华为内部结果资料、外部需求，也是公司的技术包装产品<a href="http://developer.huawei.com/ict/en/site-paas"> FusionStage™ </a>，
+      它被作为一套 PaaS 解决方案提供给其客户。
+      <!--
+      Given the results Huawei has had internally – and the demand it is seeing externally – the company has also built the technologies 
+      into <a href="http://developer.huawei.com/ict/en/site-paas">FusionStage™</a>, the PaaS solution it offers its customers. 
+      -->
+</div>
+
+</div>
+
+</section>
+
+<div class="banner2">
+  <div class="banner2text">
+    “如果你是一个供应商，为了说服你的客户，你应该自己使用它。
+    幸运的是，因为华为有很多员工，我们可以利用这种技术来展示我们所能构建的云的规模。”
+    <!--
+    "If you’re a vendor, in order to convince your customer, you should use it yourself. 
+    Luckily because Huawei has a lot of employees, 
+    we can demonstrate the scale of cloud we can build using this technology."
+    -->
+
+    <br style="height:25px">
+    <span style="font-size:14px;letter-spacing:2px;text-transform:uppercase;margin-top:5% !important;">
+        <br>- 侯培新，首席软件架构师、开源社区总监
+        <!--
+        <br>- Peixin Hou, chief software architect and community director for open source
+        -->
+    </span>  
+  </div>
+</div>
+
+<section class="section2">
+
+<div class="fullcol">
+    华为的 Kubernetes 之旅始于一位开发者。
+    <!--
+    Huawei’s Kubernetes journey began with one developer. 
+    -->
+
+    两年前，这家网络和电信巨头雇佣的一名工程师对<a href="http://kubernetes.io/"> Kubernetes </a>
+    这一跨主机集群的管理应用程序容器的技术产生了兴趣，并开始为其开源社区作出贡献。
+    <!--
+    Over two years ago, one of the engineers employed by the networking and telecommunications giant became interested 
+    in <a href="http://kubernetes.io/">Kubernetes</a>, 
+    the technology for managing application containers across clusters of hosts, 
+    and started contributing to its open source community.
+    -->
+
+    随着技术和社区的发展，他不断地将这门技术告诉他的经理们。<br><br>
+    <!--
+    As the technology developed and the community grew, he kept telling his managers about it.<br><br>  
+    -->
+
+    与此同时，华为也在为其内部的企业 IT 部门寻找更好的编排系统，该系统应该支持每一个业务的流程处理。
+    <!--
+    And as fate would have it, at the same time, 
+    Huawei was looking for a better orchestration system for its internal enterprise I.T. department, 
+    which supports every business flow processing. 
+    -->
+
+    华为首席软件架构师、开源社区总监侯培新表示，
+    “我们在全球拥有逾 18 万名员工，内部流程复杂，所以这个部门可能每周都需要开发一些新的应用程序。
+    <!--
+    "We have more than 180,000 employees worldwide, and a complicated internal procedure, 
+    so probably every week this department needs to develop some new applications," says Peixin Hou, 
+    Huawei’s Chief Software Architect and Community Director for Open Source. 
+    -->
+
+    我们的 IT 部门经常需要启动数万个容器，任务要跨越全球数千个节点。
+    这是一个超大的分布式的系统，所以我们发现以更一致的方式管理所有的任务总是一个挑战”。<br><br>  
+    <!--
+    "Very often our I.T. departments need to launch tens of thousands of containers, 
+    with tasks running across thousands of nodes across the world. 
+    It’s very much a distributed system, so we found that managing all of the tasks 
+    in a more consistent way is always a challenge."<br><br>
+    -->
+
+    过去，华为曾使用虚拟机来封装应用程序，但是，“每次我们启动虚拟机时”，侯培新说，
+    “无论是因为它是一项新服务，还是因为它是一项由于节点功能异常而被关闭的服务，都需要花费大量时间”。
+    <!--
+    In the past, Huawei had used virtual machines to encapsulate applications, 
+    but "every time when we start a VM," Hou says, 
+    "whether because it’s a new service or because it was a service that was shut down 
+    because of some abnormal node functioning, it takes a lot of time." 
+    -->
+
+    华为转向了容器化，所以是时候尝试 Kubernetes 了。
+    采纳了这位工程师的建议花费了一年的时间，这个过程“不是一蹴而就的”，侯说，
+    <!--
+    Huawei turned to containerization, so the timing was right to try Kubernetes. 
+    It took a year to adopt that engineer’s suggestion – the process "is not overnight," says Hou – 
+    -->
+
+    但一旦投入使用，“Kubernetes 基本上解决了我们的大部分问题。
+    以前，部署时间大约需要一周，现在只需几分钟。
+    <!--
+    but once in use, he says, "Kubernetes basically solved most of our problems. 
+    Before, the time of deployment took about a week, now it only takes minutes. 
+    -->
+
+    开发人员非常高兴。使用 Kubernetes 的那个部门也十分高兴”。<br><br>  
+    <!--
+    The developers are happy. That department is also quite happy."<br><br>
+    -->
+
+    侯培新看到了使用这项技术给公司带来的巨大好处，
+    “Kubernetes 为基于云的应用程序带来了敏捷性、扩展能力和 DevOps 实践”，他说，
+    <!--
+    Hou sees great benefits to the company that come with using this technology: 
+    "Kubernetes brings agility, scale-out capability, 
+    and DevOps practice to the cloud-based applications," he says.
+    -->
+    
+    “它为我们提供了自定义调度体系结构的能力，这使得容器任务之间的关联性成为可能，从而提高了效率。
+    它支持多种容器格式，同时广泛支持各种容器网络解决方案和容器存储方案”。
+    <!--
+    "It provides us with the ability to customize the scheduling architecture, 
+    which makes possible the affinity between container tasks that gives greater efficiency. 
+    It supports multiple container formats. It has extensive support for various container 
+    networking solutions and container storage."
+    -->
+</div>
+</section>
+
+<div class="banner3">
+  <div class="banner3text">
+    “Kubernetes 基本上解决了我们的大部分问题。
+    以前，部署时间大约需要一周，现在只需几分钟。
+    开发人员很高兴。使用 Kubernetes 的部门也很高兴。”
+    <!--
+    "Kubernetes basically solved most of our problems. 
+    Before, the time of deployment took about a week, now it only takes minutes. 
+    The developers are happy. That department is also quite happy."  
+    -->
+  </div>
+</div>
+
+<section class="section3">
+<div class="fullcol">
+      最重要的是，这对底线有影响。侯培新说，
+      “我们还看到，在某些情况下，运营开支会大幅削减 20% 到 30%，这对我们的业务非常有帮助”。<br><br>
+      <!--
+      And not least of all, there’s an impact on the bottom line. 
+      Says Hou: "We also see significant operating expense spending cut in some circumstances 20-30 percent, 
+      which is very helpful for our business."<br><br>
+      -->
+
+    华为对这些初步结果感到满意，并看到客户对云原生技术的需求，因此加大了 Kubernetes 的投入。
+    2016 年春，公司不仅成为用户，而且成为了供应商。<br><br>
+    <!--
+    Pleased with those initial results, and seeing a demand for cloud native technologies from its customers, 
+    Huawei doubled down on Kubernetes. 
+    In the spring of 2016, the company became not only a user but also a vendor.<br><br>  
+    -->
+
+    “我们构建了 Kubernetes 技术解决方案”，侯培新说，
+    指的是华为的<a href="http://developer.huawei.com/ict/en/site-paas"> FusionStage™ </a> PaaS 输出。
+    <!--
+    "We built the Kubernetes technologies into our solutions," says Hou, referring to Huawei’s 
+    <a href="http://developer.huawei.com/ict/en/site-paas">FusionStage™</a> PaaS offering. 
+    -->
+
+    “我们的客户，从非常大的电信运营商到银行，都喜欢云原生的想法。他们喜欢 Kubernetes 的技术。
+    但是他们需要花费大量的时间来分解他们的应用程序，将它们转换为微服务体系结构。
+    作为解决方案提供者，我们帮助他们。
+    <!--
+    "Our customers, from very big telecommunications operators to banks, love the idea of cloud native. 
+    They like Kubernetes technology. But they need to spend a lot of time to decompose their applications 
+    to turn them into microservice architecture, and as a solution provider, we help them. 
+    -->
+
+    我们已经开始与一些中国银行合作，我们看到中国移动（China Mobile）和德国电信（Deutsche Telekom）等客户对我们很感兴趣”。<br><br>
+    <!--
+    We’ve started to work with some Chinese banks, and we see a lot of interest from our customers 
+    like <a href="http://www.chinamobileltd.com/">China Mobile</a> and 
+    <a href="https://www.telekom.com/en">Deutsche Telekom</a>."<br><br>
+    -->
+
+    “如果你是一个用户，你就仅仅是个用户”，侯培新补充道，“但如果你是一个供应商，为了说服你的客户，你应该自己使用它。
+    <!--
+    "If you’re just a user, you’re just a user," adds Hou. 
+    "But if you’re a vendor, in order to even convince your customers, you should use it yourself. 
+    -->
+
+    幸运的是，因为华为有很多员工，我们可以利用这种技术来展示我们所能构建的云的规模，向客户提供智慧服务”。
+    <!--
+    Luckily because Huawei has a lot of employees, we can demonstrate the scale of cloud we can build using this technology. 
+    We provide customer wisdom."
+    -->
+
+    尽管华为拥有自己的私有云，但其许多客户使用华为的解决方案运行跨云应用程序。
+    这是一个很大的卖点，大多数公共云提供商现在都支持 Kubernetes。
+    侯培新说，“这使得跨云转换比其他解决方案更容易”。<br><br>
+    <!--
+    While Huawei has its own private cloud, many of its customers run cross-cloud applications using Huawei’s solutions. 
+    It’s a big selling point that most of the public cloud providers now support Kubernetes. 
+    "This makes the cross-cloud transition much easier than with other solutions," says Hou.<br><br>
+    -->
+</div>
+</section>
+
+<div class="banner4">
+  <div class="banner4text">
+    “我们的客户，从非常大的电信运营商到银行，都喜欢云原生的想法。他们喜欢 Kubernetes 的技术。
+    但是他们需要花很多时间来分解他们的应用程序，把它们变成微服务体系结构，作为一个解决方案提供商，我们帮助他们。”
+    <!--
+    "Our customers, from very big telecommunications operators to banks, love the idea of cloud native. 
+    They like Kubernetes technology. But they need to spend a lot of time to decompose their applications 
+    to turn them into microservice architecture, and as a solution provider, we help them."
+    -->
+  </div>
+</div>
+
+<section class="section4">
+<div class="fullcol">
+
+    在华为内部，一旦他的团队完成内部业务流程部门向 Kubernetes 的转型，侯培新希望说服更多部门转向云原生开发和实践。
+    <!--
+    Within Huawei itself, once his team completes the transition of the internal business procedure department to Kubernetes, 
+    Hou is looking to convince more departments to move over to the cloud native development cycle and practice. 
+    -->
+
+    “我们有很多软件开发人员，所以我们将为他们提供我们的平台作为服务解决方案，我们自己的产品”，
+    他说，“我们希望在他们的迭代周期中看到显著的成本削减”。<br><br>
+    <!--
+    "We have a lot of software developers, 
+    so we will provide them with our platform as a service solution, our own product," he says. 
+    "We would like to see significant cuts in their iteration cycle."<br><br>
+    -->
+
+    在见证了华为最开始的向 Kubernetes 的转型之后，侯培新为其他考虑该技术的公司提供了建议，
+    “当你开始设计应用程序的架构时，首先考虑云原生，然后再考虑微服务架构”，他说，“我想你会从中受益”。<br><br>
+    <!--
+    Having overseen the initial move to Kubernetes at Huawei, Hou has advice for other companies considering the technology: 
+    "When you start to design the architecture of your application, think about cloud native, 
+    think about microservice architecture from the beginning," he says. 
+    "I think you will benefit from that."<br><br>
+    -->
+
+    但是如果您已经有了遗留应用程序，“首先从这些应用程序中一些对微服务友好的部分开始，
+    这些部分相对容易分解成更简单的部分，并且相对轻量级”，侯培新说，
+    <!--
+    But if you already have legacy applications, "start from some microservice-friendly part of those applications first, 
+    parts that are relatively easy to be decomposed into simpler pieces and are relatively lightweight," Hou says. 
+    -->
+
+    “不要从一开始就认为我想在几天内将整个架构或所有东西都迁移到微服务中。
+    不要把它当作目标。你应该循序渐进地做这件事。
+    我想说的是，对于遗留应用程序，并不是每个部分都适合微服务架构”。<br><br>
+    <!--
+    "Don’t think from day one that within how many days I want to move the whole architecture, 
+    or move everything into microservices. Don’t put that as a kind of target. 
+    You should do it in a gradual manner. And I would say for legacy applications, 
+    not every piece would be suitable for microservice architecture. No need to force it."<br><br>  
+    -->
+
+  毕竟，尽管侯培新对华为的 Kubernetes 充满热情，但他估计，
+  “未来 10 年，或许 80% 的工作负载可以分布式地在云原生环境中运行，但仍然有 20% 不是，但是没关系。
+  如果我们能够让 80% 的工作负载真正是云原生的、敏捷的，那么最终会有一个更好的世界”。
+  <!--
+  After all, as enthusiastic as Hou is about Kubernetes at Huawei, he estimates that "in the next 10 years, 
+  maybe 80 percent of the workload can be distributed, can be run on the cloud native environments. 
+  There’s still 20 percent that’s not, but it’s fine. 
+  If we can make 80 percent of our workload really be cloud native, to have agility, 
+  it’s a much better world at the end of the day."
+  -->
+</div>
+</section>
+
+<div class="banner5">
+  <div class="banner5text">
+    “未来 10 年，可能 80% 的工作负载可以分布式地在云原生环境中运行，但仍然有 20% 不是，不过没关系。
+    如果我们能够让 80% 的工作负载真正是云原生的、敏捷的，那么最终会有一个更好的世界。”
+    <!--
+    "In the next 10 years, maybe 80 percent of the workload can be distributed, 
+    can be run on the cloud native environments. 
+    There’s still 20 percent that’s not, but it’s fine. 
+    If we can make 80 percent of our workload really be cloud native, to have agility, 
+    it’s a much better world at the end of the day."
+    -->
+  </div>
+</div>
+<section class="section5">
+<div class="fullcol">
+  在不久的将来，侯培新期待着围绕着 Kubernetes 开发的新功能，尤其是华为正在开发的那些功能。
+  <!--
+  In the nearer future, Hou is looking forward to new features that are being developed around Kubernetes, 
+  not least of all the ones that Huawei is contributing to. 
+  -->
+
+  华为的工程师已经在为联邦功能(将多个 Kubernetes 集群放在一个框架中进行无缝管理)、调度、容器网络和存储，以及刚刚发布的一项名为
+  <a href="http://containerops.org/"的> Container Ops </a>的技术工作，这是一个 DevOps 管道引擎。
+  <!--
+  Huawei engineers have worked on the federation feature 
+  (which puts multiple Kubernetes clusters in a single framework to be managed seamlessly), scheduling, 
+  container networking and storage, and a just-announced technology called 
+  <a href="http://containerops.org/">Container Ops</a>, which is a DevOps pipeline engine.
+  -->
+
+  “这将把每个 DevOps 作业放到一个容器中”，他解释说，“这种容器机制使用 Kubernetes 运行，也用于测试 Kubernetes。
+  有了这种机制，我们可以比以前更容易地创建、共享和管理容器化 DevOps 作业”。<br><br>
+  <!--
+  "This will put every DevOps job into a container," he explains. 
+  "And then this container mechanism is running using Kubernetes, but is also used to test Kubernetes. 
+  With that mechanism, we can make the containerized DevOps jobs be created, 
+  shared and managed much more easily than before."<br><br>
+  -->
+
+  尽管如此，侯培新认为这项技术只是实现其全部潜力的一半。
+  首先，也是最重要的，他想要扩大它可以协调的规模，
+  这对于华为这样的超大规模公司以及它的一些客户来说非常重要。<br><br>
+  <!--
+  Still, Hou sees this technology as only halfway to its full potential. 
+  First and foremost, he’d like to expand the scale it can orchestrate, 
+  which is important for supersized companies like Huawei –  as well as some of its customers.<br><br>
+  -->
+
+  侯培新自豪地指出，在华为第一位工程师成为 Kubernetes 的贡献者和传道者两年后，华为现在是这个社区的最大贡献者。
+  他说，“我们发现，你对社区的贡献越大，你得到的回报也就越多”。
+  <!--
+  Hou proudly notes that two years after that first Huawei engineer became a contributor to and evangelist for Kubernetes, 
+  Huawei is now a top contributor to the community. "We’ve learned that the more you contribute to the community," 
+  he says, "the more you get back."
+  -->
+</div>
+</section>

content/zh/case-studies/liveperson/index.html

@@ -0,0 +1,4 @@
+---
+title: LivePerson
+content_url: https://www.openstack.org/videos/video/running-kubernetes-on-openstack-at-liveperson
+---

content/zh/case-studies/monzo/index.html

@@ -0,0 +1,4 @@
+---
+title: Monzo
+content_url: https://youtu.be/YkOY7DgXKyw
+---

content/zh/case-studies/philips/index.html

@@ -0,0 +1,4 @@
+---
+title: Philips
+content_url: https://cloud.google.com/customers/philips/
+---

content/zh/case-studies/pokemon-go/index.html

@@ -0,0 +1,4 @@
+---
+title: Pokemon GO
+content_url: https://cloudplatform.googleblog.com/2016/09/bringing-Pokemon-GO-to-life-on-Google-Cloud.html
+---

content/zh/case-studies/samsung-sds/index.html

@@ -0,0 +1,4 @@
+---
+title: Samsung SDS
+content_url: http://www.nextplatform.com/2016/05/24/samsung-experts-put-kubernetes-paces/
+---

content/zh/case-studies/soundcloud/index.html

@@ -0,0 +1,4 @@
+---
+title: SoundCloud
+content_url: https://www.youtube.com/watch?v=5378N5iLb2Q
+---

content/zh/case-studies/squarespace/index.html

@@ -0,0 +1,224 @@
+---
+title: Squarespace 案例分析
+case_study_styles: true
+cid: caseStudies
+css: /css/style_case_studies.css
+---
+
+<!--
+---
+title: Squarespace Case Study
+case_study_styles: true
+cid: caseStudies
+css: /css/style_case_studies.css
+---
+-->
+
+<!-- <div class="banner1 desktop" style="background-image: url('/images/CaseStudy_squarespace_banner1.jpg')">
+  <h1> CASE STUDY:<img src="/images/squarespace_logo.png" class="header_logo"><br>
+    <div class="subhead">Squarespace: Gaining Productivity and Resilience with Kubernetes</div>
+  </h1>
+</div> -->
+
+<div class="banner1 desktop" style="background-image: url('/images/CaseStudy_squarespace_banner1.jpg')">
+  <h1> 案例分析：<img src="/images/squarespace_logo.png" class="header_logo"><br>
+    <div class="subhead">Squarespace: 借力 Kubernetes 提升效率和可靠性</div>
+  </h1>
+</div>
+
+<!-- <div class="details">
+    Company &nbsp;<b>Squarespace</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Location &nbsp;<b>New York, N.Y.</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Industry &nbsp;<b>Software as a Service, Website-Building Platform</b>
+</div> -->
+
+<div class="details">
+    公司名 &nbsp;<b>Squarespace</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;地址 &nbsp;<b>纽约市，纽约州</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;行业 &nbsp;<b>软件服务，网站构建平台</b>
+</div>
+
+<hr>
+<section class="section1">
+<div class="cols">
+  <div class="col1">
+    <!-- <h2>Challenge</h2>
+    Moving from a monolith to microservices in 2014 "solved a problem on the development side, but it pushed that problem to the infrastructure team," says Kevin Lynch, Staff Engineer on the Site Reliability team at Squarespace. "The infrastructure deployment process on our 5,000 VM hosts was slowing everyone down." -->
+    <h2>挑战</h2>
+    自从 2014 年，我们从 monolith 架构移植到微服务架构，
+    “虽然解决了开发端的问题，但却带来了架构组的问题”，Squarespace 网站可靠性组的主任工程师 Kevin Lynch 说道。
+    “5000 个 VM 主机上的部署过程，让每个人都举步维艰。”
+
+    <br>
+    <!-- <h2>Solution</h2>
+    The team experimented with container orchestration platforms, and found that Kubernetes "answered all the questions that we had," says Lynch. The company began running Kubernetes in its data centers in&nbsp;2016. -->
+    <h2>解决方案</h2>
+      网站可靠性组开始尝试使用不同的容器编排平台，然后发现 Kubernetes “解决了我们所有的既有问题”，Lynch 说道。于是整个公司在 2016 年开始在自己的数据中心中运行 Kubernetes 集群。
+  </div>
+
+  <div class="col2">
+
+<!-- <h2>Impact</h2>
+Since Squarespace moved to Kubernetes, in conjunction with modernizing its networking stack, deployment time has been reduced by almost 85%.
+Before, their VM deployment would take half an hour; now, says Lynch, "someone can generate a templated application, deploy it within five minutes,
+and have actual instances containerized, running in our staging environment at that point." Because of that, "productivity time is the big cost saver,"
+he adds. "When we started the Kubernetes project, we had probably a dozen microservices. Today there are twice that in the pipeline being actively worked on."
+Resilience has also been improved with Kubernetes: "If a node goes down, it’s rescheduled immediately and there’s no performance&nbsp;impact." -->
+
+<h2>影响</h2>
+自从 Squarespace 开始全面使用 Kubernetes，伴随着网络技术栈的革新，部署时间大幅减少85%。
+以前，他们的 VM 部署需要耗费半个小时；现在，Lynch 提到，“一个人可以生成一个模板应用，在五分钟内部署，并将实例容器化，并在模拟环境下运行。”正因为如此，“开发效率节省了大量的成本。”
+他又补充道，“当我们开始用 Kubernetes 时，我们可能只有十几个微服务。而现在的任务栏里面已经有两倍多的微服务正在进行中。”
+Kubernetes 也同样提升了可靠性：“如果一个节点宕掉，马上会重新调度一个新的节点，没有任何性能上的影响。”
+
+</div>
+
+</div>
+</section>
+<div class="banner2">
+  <div class="banner2text">
+    <iframe width="560" height="315" src="https://www.youtube.com/embed/feQkzJkW-SA" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+    <br><br>“一旦你验证了 Kubernetes 可以解决一个问题，每个人都会立即着手解决其它的问题，无需你的布道。”
+<br style="height:25px"><span style="font-size:14px;letter-spacing:2px;text-transform:uppercase;margin-top:5% !important;"><br>— Kevin Lynch，Squarespace 网站可靠性组的主任工程师</span>
+  </div>
+</div>
+<section class="section2">
+<div class="fullcol">
+  <!-- <h2>Since it was started in a dorm room in 2003, Squarespace has made it simple for millions of people to create their own websites.</h2> -->
+  <h2>从 2003 年宿舍起步， Squarespace 已经为数百万人提供了网站构建服务。</h2>
+
+  <!-- Behind the scenes, though, the company’s monolithic Java application was making things not so simple for its developers to keep improving the platform.
+  So in 2014, the company decided to "go down the microservices path," says Kevin Lynch, staff engineer on Squarespace’s Site Reliability team.
+  "But we were always deploying our applications in vCenter VMware VMs [in our own data centers]. Microservices solved a problem on the development side,
+  but it pushed that problem to the Infrastructure team. The infrastructure deployment process on our 5,000 VM hosts was slowing everyone down."<br><br> -->
+
+  但在幕后，公司的单体应用却让开发人员在平台创新上举步维艰。所以在 2014 年，公司决定”走微服务之路”，Kevin Lynch 提到，Squarespace 网站稳定性组的主任工程师。
+  “但是我们还是一直在自己的 vCenter VMware 虚拟机[我们自己的数据中心]上部署应用。微服务解决了开发端的问题，但是让问题转变到了基础架构组这一边。我们在5000个虚拟机主机上的部署流程让每个人的开发效率都提高不起来。”
+
+  <!-- After experimenting with another container orchestration platform and "breaking it in very painful ways," Lynch says,
+  the team began experimenting with Kubernetes in mid-2016 and found that it "answered all the questions that we had."
+  Deploying it in the data center rather than the public cloud was their biggest challenge, and at the time, not a lot of other companies were doing that.
+  "We had to figure out how to deploy this in our infrastructure for ourselves, and we had to integrate it with our other applications," says Lynch.<br><br> -->
+
+  在尝试过另外一个容器编排平台，“非常痛苦地拆解它”，Lynch 说道，我们组开始在 2016 年年中尝试 Kubernetes，发现它“能解决我们所有的问题”。
+  将 Kubernetes 部署在数据中心，而非公有云上是我们最大的挑战，但在当时，并没有很多其它的公司会这么做。
+  “我们必须要自己摸索出如何在自己的基础架构中部署它，我们也必须要将其和我们其它的应用做集成，”Lynch补充道。<br><br>
+
+  <!-- At the same time, Squarespace’s Network Engineering team was modernizing its networking stack, switching from a traditional layer-two network to a layer-three spine-and-leaf network.
+  "It mapped beautifully with what we wanted to do with Kubernetes," says Lynch. "It gives us the ability to have our servers communicate directly with the top-of-rack switches. We use Calico for
+  <a href="https://github.com/containernetworking/cnihttps://github.com/containernetworking/cni">CNI networking for Kubernetes</a>,
+  so we can announce all these individual Kubernetes pod IP addresses and have them integrate seamlessly with our other services that are still provisioned in the VMs." -->
+
+  与此同时，Squarespace 的网络工程组也正在革新它们的网络技术栈，从传统的 L2 网络转变为 L3 脊叶网络架构。
+  “” Lynch 说道，“它给了我们服务器直接通过架顶交换机通信的能力。我们使用 Calico 作为
+  <a href="https://github.com/containernetworking/cnihttps://github.com/containernetworking/cni">Kubernetes 的 CNI 网络插件</a>”，
+  因而，我们可以为每个 Kubernetes pod 分配 IP 地址，并将它们和其它仍在虚拟机中创建的服务无缝衔接。
+
+</div>
+</section>
+
+<div class="banner3" style="background-image: url('/images/CaseStudy_squarespace_banner3.jpg')">
+  <!-- <div class="banner3text">
+    After experimenting with another container orchestration platform and "breaking it in very painful ways,"
+    Lynch says, the team began experimenting with Kubernetes in mid-2016 and found that it "answered all the questions that we had."
+  </div> -->
+  <div class="banner3text">
+    在尝试过另外一个容器编排平台，“非常痛苦地拆解它”，Lynch 说道，我们组开始在 2016 年年中尝试 Kubernetes，发现它“能解决我们所有的问题”。
+  </div>
+</div>
+
+<section class="section3">
+<div class="fullcol">
+  <!-- Within a couple months, they had a stable cluster for their internal use, and began rolling out Kubernetes for production.
+  They also added Zipkin and CNCF projects <a href="https://prometheus.io/">Prometheus</a> and <a href="https://www.fluentd.org/">fluentd</a> to their cloud native stack.
+  "We switched to Kubernetes, a new world, and we revamped all our other tooling as well," says Lynch. "It allowed us to streamline our process,
+  so we can now easily create an entire microservice project from templates, generate the code and deployment pipeline for that, generate the Docker file,
+  and then immediately just ship a workable, deployable project to Kubernetes." Deployments across Dev/QA/Stage/Prod were also "simplified drastically," Lynch adds.
+  "Now there is little configuration variation." -->
+
+  几个月的时间，它们就有了一个稳定的集群供内部使用，并开始在生产环境下使用 Kubernetes。
+  他们同时还在自己的云原生技术栈中用到了 Zipkin 和 CNCF 项目 <a href="https://prometheus.io/">Prometheus</a> and <a href="https://www.fluentd.org/">fluentd</a> 。
+  “我们换到 Kubernetes，就像进入了一个新世界，我们也同时改进了其它的工具，” Lynch 说道。“它让我们简化了流程，因而，我们才能更加方便地从模板中创建整个微服务项目，生成代码和部署管道，生成 Docker 文件，
+  并迅速地将可用的、可部署的项目发布到 Kubernetes 集群上。”在 Dev/QA/Stage/Prod 不同环境间的部署也变得 “异常的简单，” Lynch 补充道。
+  “现在，环境间的配置差异变得很小。”
+
+<br><br>
+  <!-- And the whole process takes only five minutes, an almost 85% reduction in time compared to their VM deployment.
+  "From end to end that probably took half an hour, and that’s not accounting for the fact that an infrastructure engineer would be responsible for doing that,
+  so there’s some business delay in there as well." -->
+
+  而且整个部署过程只需要五分钟，和虚拟机部署相比，几乎节约了 85% 的时间。
+  “从端到端可能要半个小时，这还没有考虑可能需要基础架构工程师来做这方面的工作，因而，也还有一些业务上的延时。”
+<br><br>
+  <!-- With faster deployments, "productivity time is the big cost saver," says Lynch. "We had a team that was implementing a new file storage service,
+  and they just started integrating that with our storage back end without our involvement"—which wouldn’t have been possible before Kubernetes.
+  He adds: "When we started the Kubernetes project, we had probably a dozen microservices. Today there are twice that in the pipeline being actively worked on." -->
+
+  部署变快之后，“开发效率节省了大量的成本，” Lynch 提到，“我们有个组想要实现新的文件存储服务，他们就径直和我们的存储后来做了集成，而不需要我们的参与”，这在采用 Kubernetes 之前是不可想象的。
+  他又补充道：“在我们开始 Kubernetes 项目时，我们可能只有十几个微服务。而现在的任务栏里面已经有两倍多的微服务正在进行中。”
+
+
+
+</div>
+</section>
+<div class="banner4" style="background-image: url('/images/CaseStudy_squarespace_banner4.jpg')">
+  <div class="banner4text">
+  <!-- "We switched to Kubernetes, a new world....It allowed us to streamline our process, so we can now easily create an entire microservice project from templates,"
+  Lynch says. And the whole process takes only five minutes, an almost 85% reduction in time compared to their VM deployment. -->
+
+  “我们换到 Kubernetes，就像进入了一个新世界....它让我们简化了流程，因而，我们才能更加方便地从模板中创建整个微服务项目，”
+  Lynch 说道。整个部署过程只需要五分钟，和虚拟机部署相比，几乎节约了 85% 的时间。
+  </div>
+</div>
+
+<section class="section5" style="padding:0px !important">
+<div class="fullcol">
+  <!-- There’s also been a positive impact on the application’s resilience. "When we’re deploying VMs, we have to build tooling to ensure that a service is
+  spread across racks appropriately and can withstand failure," he says. "Kubernetes just does it. If a node goes down,
+  it’s rescheduled immediately and there’s no performance impact." -->
+
+  同样在应用程序的可靠性方面也有积极的影响。“当我们在部署虚拟机时，我们需要工具来保障服务散布在机架间，可以承受失败，”他说道，“Kubernetes 正好可以做到这一点。如果节点宕掉，可以马上重新调度，没有性能影响。”
+<br><br>
+  <!-- Another big benefit is autoscaling. "It wasn’t really possible with the way we’ve been using VMware," says Lynch, "but now we can just
+  add the appropriate autoscaling features via Kubernetes directly, and boom, it’s scaling up as demand increases. And it worked out of the box." -->
+
+  另一个很大的好处就是扩缩容。“按照我们使用 VMware 的方式，扩缩容好像不可能实现，”Lynch 说道，“但现在，我们可以直接通过 Kubernetes 加入合适的扩缩容功能，然后，随着需求的增加而扩容。开箱即用！”
+<br><br>
+  <!-- For others starting out with Kubernetes, Lynch says his best advice is to "fail fast": "Once you’ve planned things out, just execute.
+  Kubernetes has been really great for trying something out quickly and seeing if it works or not." -->
+
+  针对刚开始使用 Kubernetes 的人，Lynch 说他最后的建议就是“快速失败”：“一旦计划后，马上执行。Kubernetes 真的是非常适合快速实验，看看是否可行。”
+
+</div>
+
+<div class="banner5">
+  <div class="banner5text">
+    <!-- "When we’re deploying VMs, we have to build tooling to ensure that a service is spread across racks appropriately and can withstand failure,"
+    he says. "Kubernetes just does it. If a node goes down, it’s rescheduled immediately and there’s no performance impact." -->
+
+    “当我们在部署虚拟机时，我们需要工具来保障服务散布在机架间，可以承受失败，”他说道，“Kubernetes 正好可以做到这一点。如果节点宕掉，可以马上重新调度，没有性能影响。”
+
+  </div>
+</div>
+
+<div class="fullcol">
+  <!-- Lynch and his team are planning to open source some of the tools they’ve developed to extend Kubernetes and use it as an API itself.
+  The first tool injects dependent applications as containers in a pod.
+  "When you ship an application, usually it comes along with a whole bunch of dependent applications that need to be shipped with that,
+  for example, fluentd for logging," he explains. With this tool, the developer doesn’t need to worry about the configurations. -->
+
+  Lynch 和他的小组正准备开源一些他们的工具，这些工具用来延展 Kubernetes，将其作为 API 使用。
+  第一个工具在 pod 将依赖应用作为容器注入。
+  “当你在发布应用时，常常需要一系列的依赖应用，例如，日志用的 fluentd，” 他解释道。
+  有了这个工具，开发人员就不需要担心配置了。
+
+<br><br>
+  <!-- Going forward, all new services at Squarespace are going into Kubernetes, and the end goal is to convert everything it can. About a quarter of
+  existing services have been migrated. "Our monolithic application is going to be the last one, just because it’s so big and complex," says Lynch.
+  "But now I’m seeing other services get moved over, like the file storage service. Someone just did it and it worked—painlessly. So I believe if we tackle it,
+  it’s probably going to be a lot easier than we fear. Maybe I should just take my own advice and fail fast!" -->
+
+  自此之后，Squarespace 所有新的微服务都将直接部署到 Kubernetes 上，而最终的目标是要扩大到所有的服务上。
+  现在已经有四分之一的服务已经移植完。“我的单体应用将是最后一个被移植的，仅仅是以为它太大、太复杂，”Lynch 说道。
+  “但现在我已经看到其它的服务已经被移植到 Kubernetes 上，例如文件存储服务。有人解决了，而且并不复杂。
+  所以我坚信如果我们着手解决它，很可能回避我们所担心的要轻松许多。也许我应该接受自己的建议，“快速失败”！”
+
+</div>
+
+</section>