You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2017/12/22 14:39:18 UTC
[GitHub] merlimat closed pull request #931: Refer to Google Kubernetes Engine rather than Google Container Engine
merlimat closed pull request #931: Refer to Google Kubernetes Engine rather than Google Container Engine
URL: https://github.com/apache/incubator-pulsar/pull/931
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/kubernetes/google-container-engine/bookie.yaml b/kubernetes/google-kubernetes-engine/bookie.yaml
similarity index 100%
rename from kubernetes/google-container-engine/bookie.yaml
rename to kubernetes/google-kubernetes-engine/bookie.yaml
diff --git a/kubernetes/google-container-engine/broker.yaml b/kubernetes/google-kubernetes-engine/broker.yaml
similarity index 100%
rename from kubernetes/google-container-engine/broker.yaml
rename to kubernetes/google-kubernetes-engine/broker.yaml
diff --git a/kubernetes/google-container-engine/monitoring.yaml b/kubernetes/google-kubernetes-engine/monitoring.yaml
similarity index 100%
rename from kubernetes/google-container-engine/monitoring.yaml
rename to kubernetes/google-kubernetes-engine/monitoring.yaml
diff --git a/kubernetes/google-container-engine/zookeeper.yaml b/kubernetes/google-kubernetes-engine/zookeeper.yaml
similarity index 100%
rename from kubernetes/google-container-engine/zookeeper.yaml
rename to kubernetes/google-kubernetes-engine/zookeeper.yaml
diff --git a/site/_data/sidebar-ja.yaml b/site/_data/sidebar-ja.yaml
index fccb67659..0e0735d26 100644
--- a/site/_data/sidebar-ja.yaml
+++ b/site/_data/sidebar-ja.yaml
@@ -35,8 +35,8 @@ groups:
endpoint: InstanceSetup
- title: Kubernetes
endpoint: Kubernetes
- - title: Google Container Engine
- endpoint: Kubernetes/#google-container-engine
+ - title: Google Kubernetes Engine
+ endpoint: Kubernetes/#google-kubernetes-engine
- title: AWS
endpoint: Kubernetes/#amazon-web-services
- title: ??
diff --git a/site/_data/sidebar.yaml b/site/_data/sidebar.yaml
index d54e94a1d..74e752991 100644
--- a/site/_data/sidebar.yaml
+++ b/site/_data/sidebar.yaml
@@ -39,8 +39,8 @@ groups:
endpoint: instance
- title: Pulsar on Kubernetes
endpoint: Kubernetes
- - title: Pulsar on Google Container Engine
- endpoint: Kubernetes/#pulsar-on-google-container-engine
+ - title: Pulsar on Google Kubernetes Engine
+ endpoint: Kubernetes/#pulsar-on-google-kubernetes-engine
- title: Pulsar on AWS
endpoint: Kubernetes/#pulsar-on-amazon-web-services
- title: Monitoring
diff --git a/site/docs/latest/deployment/Kubernetes.md b/site/docs/latest/deployment/Kubernetes.md
index 9ea4a8e71..e50d4ca3b 100644
--- a/site/docs/latest/deployment/Kubernetes.md
+++ b/site/docs/latest/deployment/Kubernetes.md
@@ -1,6 +1,6 @@
---
title: Deploying Pulsar on Kubernetes
-tags: [Kubernetes, Google Container Engine]
+tags: [Kubernetes, Google Kubernetes Engine]
---
<!--
@@ -24,7 +24,7 @@ tags: [Kubernetes, Google Container Engine]
-->
-Pulsar can be easily deployed in [Kubernetes](https://kubernetes.io/) clusters, either in managed clusters on [Google Container Engine](#pulsar-on-google-container-engine) or [Amazon Web Services](https://aws.amazon.com/) or in [custom clusters](#pulsar-on-a-custom-kubernetes-cluster).
+Pulsar can be easily deployed in [Kubernetes](https://kubernetes.io/) clusters, either in managed clusters on [Google Kubernetes Engine](#pulsar-on-google-kubernetes-engine) or [Amazon Web Services](https://aws.amazon.com/) or in [custom clusters](#pulsar-on-a-custom-kubernetes-cluster).
The deployment method shown in this guide relies on [YAML](http://yaml.org/) definitions for Kubernetes [resources](https://kubernetes.io/docs/resources-reference/v1.6/). The [`kubernetes`]({{ site.pulsar_repo }}/kubernetes) subdirectory of the [Pulsar package](/download) holds resource definitions for:
@@ -42,9 +42,9 @@ To get started, install a source package from the [downloads page](/download).
If you'd like to change the number of bookies, brokers, or ZooKeeper nodes in your Pulsar cluster, modify the `replicas` parameter in the `spec` section of the appropriate [`Deployment`](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) or [`StatefulSet`](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/) resource.
-## Pulsar on Google Container Engine
+## Pulsar on Google Kubernetes Engine
-[Google Container Engine](https://cloud.google.com/container-engine) (GKE) automates the creation and management of Kubernetes clusters in [Google Compute Engine](https://cloud.google.com/compute/) (GCE).
+[Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine) (GKE) automates the creation and management of Kubernetes clusters in [Google Compute Engine](https://cloud.google.com/compute/) (GCE).
### Prerequisites
@@ -156,9 +156,9 @@ Now you can access the web interface at [localhost:8001/ui](http://localhost:800
## Deploying Pulsar components
-Now that you've set up a Kubernetes cluster, either on [Google Container Engine](#pulsar-on-google-container-engine) or on a [custom cluster](#pulsar-on-a-custom-kubernetes-cluster), you can begin deploying the components that make up Pulsar. The YAML resource definitions for Pulsar components can be found in the `kubernetes` folder of the [Pulsar source package](/download).
+Now that you've set up a Kubernetes cluster, either on [Google Kubernetes Engine](#pulsar-on-google-kubernetes-engine) or on a [custom cluster](#pulsar-on-a-custom-kubernetes-cluster), you can begin deploying the components that make up Pulsar. The YAML resource definitions for Pulsar components can be found in the `kubernetes` folder of the [Pulsar source package](/download).
-In that package, there are two sets of resource definitions, one for Google Container Engine (GKE) in the `kubernetes/google-container-engine` folder and one for a custom Kubernetes cluster in the `kubernetes/generic` folder. To begin, `cd` into the appropriate folder.
+In that package, there are two sets of resource definitions, one for Google Kubernetes Engine (GKE) in the `kubernetes/google-kubernetes-engine` folder and one for a custom Kubernetes cluster in the `kubernetes/generic` folder. To begin, `cd` into the appropriate folder.
### ZooKeeper
diff --git a/site/docs/latest/deployment/instance.md b/site/docs/latest/deployment/instance.md
index d3302d6f0..5030b086e 100644
--- a/site/docs/latest/deployment/instance.md
+++ b/site/docs/latest/deployment/instance.md
@@ -37,7 +37,7 @@ A Pulsar *instance* consists of multiple Pulsar {% popover clusters %} working i
If you're deploying a single Pulsar cluster, see the [Clusters and Brokers](../../getting-started/LocalCluster#starting-the-cluster) guide.
{% include admonition.html type="info" title='Running Pulsar locally or on Kubernetes?' content="
-This guide shows you how to deploy Pulsar in production in a non-Kubernetes. If you'd like to run a standalone Pulsar cluster on a single machine for development purposes, see the [Setting up a local cluster](../../getting-started/LocalCluster) guide. If you're looking to run Pulsar on [Kubernetes](https://kubernetes.io), see the [Pulsar on Kubernetes](../Kubernetes) guide, which includes sections on running Pulsar on Kubernetes on [Google Container Engine](../Kubernetes#pulsar-on-google-container-engine) and on [Amazon Web Services](../Kubernetes#pulsar-on-amazon-web-services).
+This guide shows you how to deploy Pulsar in production in a non-Kubernetes. If you'd like to run a standalone Pulsar cluster on a single machine for development purposes, see the [Setting up a local cluster](../../getting-started/LocalCluster) guide. If you're looking to run Pulsar on [Kubernetes](https://kubernetes.io), see the [Pulsar on Kubernetes](../Kubernetes) guide, which includes sections on running Pulsar on Kubernetes on [Google Kubernetes Engine](../Kubernetes#pulsar-on-google-kubernetes-engine) and on [Amazon Web Services](../Kubernetes#pulsar-on-amazon-web-services).
" %}
{% include explanations/install-package.md %}
diff --git a/site/ja/deployment/InstanceSetup.md b/site/ja/deployment/InstanceSetup.md
index 810f70c49..8c7e0b0a9 100644
--- a/site/ja/deployment/InstanceSetup.md
+++ b/site/ja/deployment/InstanceSetup.md
@@ -35,7 +35,7 @@ Pulsar*??????*????????????Pulsar{% popover_j
?????Pulsar???????????????[?????Broker](../../admin/ClustersBrokers)??????????????
{% include admonition.html type="info" title='Pulsar??????Kubernetes????????' content="
-????????Kubernetes?????????????Pulsar??????????????????????????????????????Pulsar?????????????[???????????????](../../getting-started/LocalCluster)?????????????[Kubernetes](https://kubernetes.io)?Pulsar?????????[Kubernetes??Pulsar](../Kubernetes)?????????????????????[Google Container Engine](../Kubernetes#google-container-engine)?[Amazon Web Services](../Kubernetes#amazon-web-services)?????Kubernetes??Pulsar???????????????????
+????????Kubernetes?????????????Pulsar??????????????????????????????????????Pulsar?????????????[???????????????](../../getting-started/LocalCluster)?????????????[Kubernetes](https://kubernetes.io)?Pulsar?????????[Kubernetes??Pulsar](../Kubernetes)?????????????????????[Google Kubernetes Engine](../Kubernetes#google-kubernetes-engine)?[Amazon Web Services](../Kubernetes#amazon-web-services)?????Kubernetes??Pulsar???????????????????
" %}
{% include explanations/ja/install-package.md %}
diff --git a/site/ja/deployment/Kubernetes.md b/site/ja/deployment/Kubernetes.md
index 873bf73c7..63af839c9 100644
--- a/site/ja/deployment/Kubernetes.md
+++ b/site/ja/deployment/Kubernetes.md
@@ -1,6 +1,6 @@
---
title: Kubernetes???Pulsar?????
-tags_ja: [Kubernetes, Google Container Engine]
+tags_ja: [Kubernetes, Google Kubernetes Engine]
---
<!--
@@ -24,7 +24,7 @@ tags_ja: [Kubernetes, Google Container Engine]
-->
-Pulsar?[Google Container Engine](#google-container-engine), [Amazon Web Services](https://aws.amazon.com/)????????[????????](#????kubernetes????)?[Kubernetes](https://kubernetes.io/)?????????????????
+Pulsar?[Google Kubernetes Engine](#google-kubernetes-engine), [Amazon Web Services](https://aws.amazon.com/)????????[????????](#????kubernetes????)?[Kubernetes](https://kubernetes.io/)?????????????????
?????????????Kubernetes?[????](https://kubernetes.io/docs/resources-reference/v1.6/)?[YAML](http://yaml.org/)???????????[Pulsar?????](/download)?[`kubernetes`]({{ site.pulsar_repo }}/kubernetes)????????????????????????:
@@ -42,9 +42,9 @@ Pulsar?[Google Container Engine](#google-container-engine), [Amazon Web Servic
??Pulsar?????Bookie, Broker, ZooKeeper??????????????????[`Deployment`](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/), [`StatefulSet`](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/)?????`spec`???????`replicas`???????????????
-## Google Container Engine
+## Google Kubernetes Engine
-[Google Container Engine](https://cloud.google.com/container-engine) (GKE) ?[Google Compute Engine](https://cloud.google.com/compute/) (GCE) ??Kubernetes??????????????????
+[Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine) (GKE) ?[Google Compute Engine](https://cloud.google.com/compute/) (GCE) ??Kubernetes??????????????????
### ????
@@ -156,9 +156,9 @@ $ kubectl proxy
## Pulsar????????????
-??????[Google Container Engine](#google-container-engine)????[????????](#????kubernetes????)???????Kubernetes???????????????????Pulsar???????????????????????????Pulsar?????????YAML????????[Pulsar????????](/download)?`kubernetes`????????????
+??????[Google Kubernetes Engine](#google-kubernetes-engine)????[????????](#????kubernetes????)???????Kubernetes???????????????????Pulsar???????????????????????????Pulsar?????????YAML????????[Pulsar????????](/download)?`kubernetes`????????????
-??????????2????????????????1??`kubernetes/google-container-engine`????????????Google Container Engine (GKE) ?????????1??`kubernetes/generic`???????????????Kubernetes????????????????`cd`???????????????????
+??????????2????????????????1??`kubernetes/google-container-engine`????????????Google Kubernetes Engine (GKE) ?????????1??`kubernetes/generic`???????????????Kubernetes????????????????`cd`???????????????????
### ZooKeeper
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services