chore(docs): update references of GCE to GKE (GoogleCloudPlatform#6670)

dandhlee · web-flow · commit 6ac5624ef3c9 · 2021-09-08T15:18:54.000Z
## Description Updates references to `Google Container Engine` and similar usage to `Google Kubernetes Engine`. Updated some link to Kubernetes docs as well. Fixes GoogleCloudPlatform#6590 ## Checklist - [x] I have followed [Sample Guidelines from AUTHORING_GUIDE.MD](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md) - [x] README is updated to include [all relevant information](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#readme-file) - [x] **Tests** pass: `nox -s py-3.6` (see [Test Environment Setup](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#test-environment-setup)) - [x] **Lint** pass: `nox -s lint` (see [Test Environment Setup](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#test-environment-setup))
diff --git a/auth/api-client/snippets.py b/auth/api-client/snippets.py
@@ -58,7 +58,7 @@ def explicit_compute_engine(project):
     import googleapiclient.discovery
 
     # Explicitly use Compute Engine credentials. These credentials are
-    # available on Compute Engine, App Engine Flexible, and Container Engine.
+    # available on Compute Engine, App Engine Flexible, and Kubernetes Engine.
     credentials = compute_engine.Credentials()
 
     # Explicitly pass the credentials to the client library.
diff --git a/auth/cloud-client/snippets.py b/auth/cloud-client/snippets.py
@@ -53,7 +53,7 @@ def explicit_compute_engine(project):
     from google.cloud import storage
 
     # Explicitly use Compute Engine credentials. These credentials are
-    # available on Compute Engine, App Engine Flexible, and Container Engine.
+    # available on Compute Engine, App Engine Flexible, and Kubernetes Engine.
     credentials = compute_engine.Credentials()
 
     # Create the client using the credentials and specifying a project ID.
diff --git a/iap/README.md b/iap/README.md
@@ -30,7 +30,7 @@ These samples are used on the following documentation pages:
    install the `google-auth` and `requests` libraries into your application.
 2. Copy `make_iap_request.py` into the same folder as app.yaml .
 
-### Google Compute Engine or Google Container Engine
+### Google Compute Engine or Google Kubernetes Engine
 
 1. [Click here](https://console.cloud.google.com/flows/enableapi?apiid=iam.googleapis.com&showconfirmation=true) to visit Google Cloud Platform Console and enable the IAM API on your project.
 2. Create a VM with the IAM scope:
@@ -65,7 +65,7 @@ These samples are used on the following documentation pages:
 
 If you prefer to manage service account credentials manually, this method can
 also be used in the App Engine flexible environment, Compute Engine, and
-Container Engine. Note that this may be less secure, as anyone who obtains the
+Kubernetes Engine. Note that this may be less secure, as anyone who obtains the
 service account private key can impersonate that account!
 
 ## Using validate_jwt
diff --git a/iap/validate_jwt.py b/iap/validate_jwt.py
@@ -16,7 +16,7 @@
 
 This code should be used by applications in Google Compute Engine-based
 environments (such as Google App Engine flexible environment, Google
-Compute Engine, Google Container Engine, Google App Engine) to provide
+Compute Engine, Google Kubernetes Engine, Google App Engine) to provide
 an extra layer of assurance that a request was authorized by IAP.
 """
 # [START iap_validate_jwt]
diff --git a/kubernetes_engine/api-client/README.rst b/kubernetes_engine/api-client/README.rst
@@ -1,18 +1,18 @@
 .. This file is automatically generated. Do not edit this file directly.
 
-Google Container Engine Python Samples
+Google Kubernetes Engine Python Samples
 ===============================================================================
 
 .. image:: https://gstatic.com/cloudssh/images/open-btn.png
-   :target: https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/python-docs-samples&page=editor&open_in_editor=container_engine/api-client/README.rst
+   :target: https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/python-docs-samples&page=editor&open_in_editor=kubernetes_engine/api-client/README.rst
 
 
-This directory contains samples for Google Container Engine. `Google Container Engine`_ runs Docker containers on Google Cloud Platform, powered by Kubernetes.
+This directory contains samples for Google Kubernetes Engine. `Google Kubernetes Engine`_ runs Docker containers on Google Cloud Platform, powered by Kubernetes.
 
 
 
 
-.. _Google Container Engine: https://cloud.google.com/container-engine/docs/
+.. _Google Kubernetes Engine: https://cloud.google.com/kubernetes-engine/docs/
 
 Setup
 -------------------------------------------------------------------------------
@@ -65,7 +65,7 @@ Snippets
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 .. image:: https://gstatic.com/cloudssh/images/open-btn.png
-   :target: https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/python-docs-samples&page=editor&open_in_editor=container_engine/api-client/snippets.py,container_engine/api-client/README.rst
+   :target: https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/python-docs-samples&page=editor&open_in_editor=kubernetes_engine/api-client/snippets.py,kubernetes_engine/api-client/README.rst
 
 
 
@@ -90,4 +90,4 @@ To run this sample:
 
 
 
-.. _Google Cloud SDK: https://cloud.google.com/sdk/
+.. _Google Cloud SDK: https://cloud.google.com/sdk/
diff --git a/kubernetes_engine/api-client/README.rst.in b/kubernetes_engine/api-client/README.rst.in
@@ -1,11 +1,11 @@
 # This file is used to generate README.rst
 
 product:
-  name: Google Container Engine
-  short_name: Container Engine
-  url: https://cloud.google.com/container-engine/docs/
+  name: Google Kubernetes Engine
+  short_name: Kubernetes Engine
+  url: https://cloud.google.com/kubernetes-engine/docs/
   description: > 
-    `Google Container Engine`_ runs Docker containers on Google Cloud Platform,
+    `Google Kubernetes Engine`_ runs Docker containers on Google Cloud Platform,
     powered by Kubernetes.
 
 setup:
@@ -17,4 +17,4 @@ samples:
   file: snippets.py
   show_help: true
 
-folder: container_engine/api-client
+folder: kubernetes_engine/api-client
diff --git a/kubernetes_engine/django_tutorial/README.md b/kubernetes_engine/django_tutorial/README.md
@@ -1,19 +1,19 @@
-# Getting started with Django on Google Container Engine
+# Getting started with Django on Google Kubernetes Engine
 
 [![Open in Cloud Shell][shell_img]][shell_link]
 
 [shell_img]: http://gstatic.com/cloudssh/images/open-btn.png
 [shell_link]: https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/python-docs-samples&page=editor&open_in_editor=kubernetes_engine/django_tutorial/README.md
 
 This repository is an example of how to run a [Django](https://www.djangoproject.com/) 
-app on Google Container Engine. It uses the
+app on Google Kubernetes Engine. It uses the
 [Writing your first Django app](https://docs.djangoproject.com/en/1.11/intro/tutorial01/)
 Polls application (parts 1 and 2) as the example app to deploy. From here on
 out, we refer to this app as the 'polls' application.
 
 
 # Tutorial
-See our [Django on Container Engine](https://cloud.google.com/python/django/kubernetes-engine) tutorial for instructions for setting up and deploying this sample application.
+See our [Django on Kubernetes Engine](https://cloud.google.com/python/django/kubernetes-engine) tutorial for instructions for setting up and deploying this sample application.
 
 
 ## Contributing changes
diff --git a/kubernetes_engine/django_tutorial/polls.yaml b/kubernetes_engine/django_tutorial/polls.yaml
@@ -18,7 +18,7 @@
 # The bookshelf frontend replication controller ensures that at least 3
 # instances of the bookshelf app are running on the cluster.
 # For more info about Pods see:
-#   https://cloud.google.com/container-engine/docs/pods/
+#   https://kubernetes.io/docs/concepts/workloads/pods/
 # For more info about Deployments:
 #   https://kubernetes.io/docs/user-guide/deployments/
 
@@ -100,12 +100,12 @@ spec:
 
 # [START service]
 # The polls service provides a load-balancing proxy over the polls app
-# pods. By specifying the type as a 'LoadBalancer', Container Engine will
+# pods. By specifying the type as a 'LoadBalancer', Kubernetes Engine will
 # create an external HTTP load balancer.
 # For more information about Services see:
-#   https://cloud.google.com/container-engine/docs/services/
+#   https://kubernetes.io/docs/concepts/services-networking/service/
 # For more information about external HTTP load balancing see:
-#   https://cloud.google.com/container-engine/docs/load-balancer
+#   https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/scripts/resources/docs-links.json b/scripts/resources/docs-links.json
@@ -179,9 +179,9 @@
   "/appengine/docs/python/mail/mailgun": [
     "appengine/mailgun/main.py"
   ], 
-  "/python/django/container-engine": [
-    "container_engine/django_tutorial/mysite/settings.py", 
-    "container_engine/django_tutorial/polls.yaml"
+  "/python/django/kubernetes-engine": [
+    "kubernetes_engine/django_tutorial/mysite/settings.py", 
+    "kubernetes_engine/django_tutorial/polls.yaml"
   ], 
   "/bigquery/exporting-data-from-bigquery": [
     "bigquery/api/export_data_to_cloud_storage.py"
