- add that a port from Python 2 to 3 means migrating from Gen1 to Gen2 App Engine platforms

- add Cloud Run deploy steps
- update Buildpacks build info & service.yaml format

Author: wescpy

step2-flask-cloudndb-py3/README.md

@@ -15,6 +15,8 @@ Porting from Python 2 to 3 is not within the scope of this tutorial, and our sim
 1. Delete the `lib` folder for the same reason.
 1. Migrate from App Engine NDB to Cloud NDB
 
+In addition to *actually* porting your app from Python 2.x to 3.x, you would also be migrating from the original App Engine runtime ("Gen1") to the next-gen runtime ("Gen2"), and there are some important differences you need to know which are [listed here](https://cloud.google.com/appengine/docs/standard/python3/python-differences).
+
 ### Configuration
 
 The only real change for this sample app is to significantly shorten `app.yaml` down to just these lines for the runtime as well as routing:
@@ -27,7 +29,21 @@ handlers:
   script: auto
 ```
 
-`requirements.txt` and `templates/index.html` remain unchanged while the `appengine_config.py` file and `lib` folder are deleted.
+An additional improvement you can make is to get rid of the `handlers:` section altogether (especially since `script: auto` is the only accepted directive regardless of URL path) and replace it with an `entrypoint:` directive. In Gen1, handlers were necessary to help route requests to your app, but in Gen2, routing is the responsibility of the web framework, not as an App Engine configuration.
+
+
+TODO
+
+If you do that, you're `app.yaml` may look like the following (assuming there is a "main" function in your `main.py` which we not have in ours until Step 4):
+
+```yml
+runtime: python38
+entrypoint: python main.py
+```
+
+Check out [this page in the documentation](https://cloud.google.com/appengine/docs/standard/python3/runtime#application_startup) to find out more about the `entrypoint:` directive for `app.yaml` files.
+
+The `requirements.txt` and `templates/index.html` files remain unchanged while the `appengine_config.py` file and `lib` folder are deleted.
 
 ---
 
@@ -36,4 +52,4 @@ handlers:
 From here, your options are:
 
 - [**Step 4:**](/step4-cloudds-cloudrun-py3) Migrate your app to a container executing serverlessly on Cloud Run
-- [**Step 3:**](/step3-flask-datastore-py3) Further modernize Datastore access from Cloud NDB to the (official) Cloud Datastore library (how users *outside of* App Engine access Cloud Datastore)
+- [**Step 3:**](/step3-flask-datastore-py3) Further modernize Datastore access from Cloud NDB to the (official) Cloud Datastore library (how users *outside of* App Engine access Cloud Datastore)

step4-cloudds-cloudrun-py3/README.md

@@ -75,9 +75,18 @@ Doublecheck there are no files/folders named, `app.yaml`, `appengine_config.py`,
 
 ---
 
+## Deploy
+
+We didn't show you the deploy steps for the App Engine samples, but since some of you will be new to containers and Cloud Run, here is how you build & deploy your container on Cloud Run (fully-managed) once you've got all prior steps completed:
+
+1. Build container: `gcloud builds submit --tag gcr.io/PROJECT_ID/IMG_NAME` (think `docker build` followed by `docker push`)
+2. Deploy service: `gcloud run deploy SVC_NAME --image gcr.io/PROJECT_ID/IMG_NAME --platform managed` (think `docker run`)
+
+---
+
 ## Next
 
 Congratulations... your app is fully modernized now, concluding this tutorial. From here, there is only one more thing you can investigate:
 
 - [**Step 4a:**](/step4a-cloudrun-bldpks-py3) An alternative to app in *this* tutorial, containerizing your app with [Cloud Buildpacks](https://github.com/GoogleCloudPlatform/buildpacks) instead of Docker.
-- [**Step 3a:**](/step3a-flask-firestore-py3) For those who are considering migrating from Cloud Datastore to Firestore (NOTE: that app is not containerized & runs on App Engine)
+- [**Step 3a:**](/step3a-flask-firestore-py3) For those who are considering migrating from Cloud Datastore to Firestore (NOTE: that app is not containerized & runs on App Engine)

step4-cloudndb-cloudrun-py2/README.md

@@ -75,6 +75,15 @@ Doublecheck there are no files/folders named, `app.yaml`, `appengine_config.py`,
 
 ---
 
+## Deploy
+
+We didn't show you the deploy steps for the App Engine samples, but since some of you will be new to containers and Cloud Run, here is how you build & deploy your container on Cloud Run (fully-managed) once you've got all prior steps completed:
+
+1. Build container: `gcloud builds submit --tag gcr.io/PROJECT_ID/IMG_NAME` (think `docker build` followed by `docker push`)
+2. Deploy service: `gcloud run deploy SVC_NAME --image gcr.io/PROJECT_ID/IMG_NAME --platform managed` (think `docker run`)
+
+---
+
 ## Next
 
 Congratulations... your app is fully modernized now, concluding this tutorial. From here, there are only a few more things you can investigate:

step4a-cloudrun-bldpks-py3/README.md

@@ -2,7 +2,7 @@
 
 ## Introduction
 
-This codelab represents an alternative to Step 4 (just the Python 3 version) where you're migrating your App Engine app to Cloud Run, but using Cloud Buildpacks instead of Docker. As Docker is an industry standard for containers, users choosing to follow this path are those who don't want to be dependent on a single company (and its control) or do not wish to become familiar with the Docker product and instead, opting for a more standardized approach to container-building that has multiple supporters in industry (more below).
+This codelab represents an alternative to Step 4 (just the Python 3 version) where you're migrating your App Engine app to Cloud Run, but using Cloud Buildpacks instead of Docker. As Docker is an industry standard for containers, users choosing to follow this path are those who don't want to have to become familiar with working with Docker product or carefully curating their `Dockerfile` and instead, opting for a more standardized approach to container-building that has multiple supporters in industry (more below).
 
 ---
 
@@ -21,7 +21,7 @@ While Docker is an industry standard, some developers may prefer to avoid learni
 ### Configuration
 
 1. Convert your `app.yaml` to a `service.yaml` with [the tool](http://googlecloudplatform.github.io/app-engine-cloud-run-converter).
-1. Update `service.yaml` with your `PROJECT-ID`, `REGION`, and `SERVICE`.
+1. Update `service.yaml` with your `PROJECT_ID`, `REGION`, `CONT_NAME`, and `SVC_NAME`.
 1. Run the appropriate `gcloud` commands to build the container (see below).
 1. Create a [`Procfile`](https://devcenter.heroku.com/articles/procfile) specifying the entrypoint of your app; see [example](https://devcenter.heroku.com/articles/getting-started-with-python#define-a-procfile).
 
@@ -31,7 +31,7 @@ Since this is only for Gen2 runtimes, we have to paste the contents of `step3-fl
 apiVersion: serving.knative.dev/v1
 kind: Service
 metadata:
-  name: SERVICE
+  name: SVC_NAME
   labels:
     migrated-from: app-engine
     cloud.googleapis.com/location: REGION
@@ -41,12 +41,12 @@ spec:
       annotations: {}
     spec:
       containers:
-        - image: gcr.io/PROJECT-ID/SERVICE
-      serviceAccountName: PROJECT-ID@appspot.gserviceaccount.com
+        - image: gcr.io/PROJECT_ID/IMG_NAME
+      serviceAccountName: PROJECT_NUM-compute@developer.gserviceaccount.com
 ```
 
 Update the image and service account name, then run one of these build commands, depending on whether your service is public (or not):
-    - Run `gcloud alpha builds submit --pack image=gcr.io/PROJECT-ID/SERVICE && gcloud beta run services replace service.yaml --region us-central1 --platform managed` (private services)
+    - Run `gcloud alpha builds submit --pack image=gcr.io/PROJECT_ID/IMG_NAME && gcloud beta run services replace service.yaml --region us-central1 --platform managed` (private services)
     - OR `gcloud run services add-iam-policy-binding my-service --member="allUsers" --role="roles/run.invoker" --region us-central1 --platform managed` (public services)
 
 Delete the `app.yaml` (or back it up somewhere) as it is no longer needed. Then create a `Procfile` file specifying the application entry-point. The one for this app:

step4a-cloudrun-bldpks-py3/service.yaml

@@ -15,15 +15,15 @@
 apiVersion: serving.knative.dev/v1
 kind: Service
 metadata:
-  name: default
+  name: SVC_NAME
   labels:
     migrated-from: app-engine
-    cloud.googleapis.com/location: APP_REGION
+    cloud.googleapis.com/location: REGION
 spec:
   template:
     metadata:
       annotations: {}
     spec:
       containers:
-        - image: gcr.io/PROJECT_ID/image
-      serviceAccountName: docker-client1@PROJECT_ID.iam.gserviceaccount.com
+        - image: gcr.io/PROJECT_ID/IMG_NAME
+      serviceAccountName: PROJECT_NUM-compute@developer.gserviceaccount.com