cleanup: add region tags to yaml and sh

hack/make-release-artifacts.sh

@@ -77,13 +77,19 @@ mk_kubernetes_manifests() {
 
     print_license_header
     print_autogenerated_warning
+
+    echo '# [START gke_release_kubernetes_manifests_microservices_demo]'
+
     echo "${out_manifest}"
+    echo "# [END gke_release_kubernetes_manifests_microservices_demo]"
 }
 
 mk_istio_manifests() {
     print_license_header
     print_autogenerated_warning
+    echo '# [START servicemesh_release_istio_manifests_microservices_demo]'
     read_manifests "${SCRIPTDIR}/../istio-manifests"
+    echo '# [END servicemesh_release_istio_manifests_microservices_demo]'
 }
 
 main() {
@@ -92,14 +98,10 @@ main() {
 
     k8s_manifests_file="${OUT_DIR}/kubernetes-manifests.yaml"
     mk_kubernetes_manifests > "${k8s_manifests_file}"
-    # removes region tags to the release manifests
-    sed -i '' '/[^# \[]]/d' "${k8s_manifests_file}" 
     log "Written ${k8s_manifests_file}"
 
     istio_manifests_file="${OUT_DIR}/istio-manifests.yaml"
     mk_istio_manifests > "${istio_manifests_file}"
-    # removes region tags to the release manifests
-    sed -i '' '/[^# \[]]/d' "${istio_manifests_file}" 
     log "Written ${istio_manifests_file}"
 }
 # "$@"

istio-manifests/allow-egress-googleapis.yaml

@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START servicemesh_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_googleapis]
 apiVersion: networking.istio.io/v1alpha3
 kind: ServiceEntry
 metadata:
@@ -29,9 +28,7 @@ spec:
   - number: 443
     protocol: HTTPS
     name: https
-# [END servicemesh_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_googleapis]
 ---
-# [START servicemesh_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_google_metadata]
 apiVersion: networking.istio.io/v1alpha3
 kind: ServiceEntry
 metadata:
@@ -48,4 +45,3 @@ spec:
   - number: 443
     name: https
     protocol: HTTPS
-# [END servicemesh_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_google_metadata]

istio-manifests/frontend-gateway.yaml

@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START servicemesh_istio_manifests_frontend_gateway_gateway_frontend_gateway]
 apiVersion: networking.istio.io/v1alpha3
 kind: Gateway
 metadata:
@@ -28,9 +27,7 @@ spec:
       protocol: HTTP
     hosts:
     - "*"
-# [END servicemesh_istio_manifests_frontend_gateway_gateway_frontend_gateway]
 ---
-# [START servicemesh_istio_manifests_frontend_gateway_virtualservice_frontend_ingress]
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
@@ -46,4 +43,3 @@ spec:
         host: frontend
         port:
           number: 80
-# [END servicemesh_istio_manifests_frontend_gateway_virtualservice_frontend_ingress]

istio-manifests/frontend.yaml

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START servicemesh_istio_manifests_frontend_virtualservice_frontend]
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
@@ -25,5 +24,4 @@ spec:
     - destination:
         host: frontend
         port:
-          number: 80
-# [END servicemesh_istio_manifests_frontend_virtualservice_frontend]
+          number: 80

kubernetes-manifests/adservice.yaml

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START gke_kubernetes_manifests_adservice_deployment_adservice]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -59,9 +58,7 @@ spec:
           periodSeconds: 15
           exec:
             command: ["/bin/grpc_health_probe", "-addr=:9555"]
-# [END gke_kubernetes_manifests_adservice_deployment_adservice]
 ---
-# [START gke_kubernetes_manifests_adservice_service_adservice]
 apiVersion: v1
 kind: Service
 metadata:
@@ -74,4 +71,3 @@ spec:
   - name: grpc
     port: 9555
     targetPort: 9555
-# [END gke_kubernetes_manifests_adservice_service_adservice]

kubernetes-manifests/cartservice.yaml

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START gke_kubernetes_manifests_cartservice_deployment_cartservice]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -52,9 +51,7 @@ spec:
           periodSeconds: 10
           exec:
             command: ["/bin/grpc_health_probe", "-addr=:7070", "-rpc-timeout=5s"]
-# [END gke_kubernetes_manifests_cartservice_deployment_cartservice]
 ---
-# [START gke_kubernetes_manifests_cartservice_service_cartservice]
 apiVersion: v1
 kind: Service
 metadata:
@@ -67,4 +64,3 @@ spec:
   - name: grpc
     port: 7070
     targetPort: 7070
-# [END gke_kubernetes_manifests_cartservice_service_cartservice]

kubernetes-manifests/checkoutservice.yaml

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START gke_kubernetes_manifests_checkoutservice_deployment_checkoutservice]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -68,9 +67,7 @@ spec:
             limits:
               cpu: 200m
               memory: 128Mi
-# [END gke_kubernetes_manifests_checkoutservice_deployment_checkoutservice]
 ---
-# [START gke_kubernetes_manifests_checkoutservice_service_checkoutservice]
 apiVersion: v1
 kind: Service
 metadata:
@@ -83,4 +80,3 @@ spec:
   - name: grpc
     port: 5050
     targetPort: 5050
-# [END gke_kubernetes_manifests_checkoutservice_service_checkoutservice]

kubernetes-manifests/currencyservice.yaml

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START gke_kubernetes_manifests_currencyservice_deployment_currencyservice]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -56,9 +55,7 @@ spec:
           limits:
             cpu: 200m
             memory: 128Mi
-# [END gke_kubernetes_manifests_currencyservice_deployment_currencyservice]
 ---
-# [START gke_kubernetes_manifests_currencyservice_service_currencyservice]
 apiVersion: v1
 kind: Service
 metadata:
@@ -71,4 +68,3 @@ spec:
   - name: grpc
     port: 7000
     targetPort: 7000
-# [END gke_kubernetes_manifests_currencyservice_service_currencyservice]

kubernetes-manifests/emailservice.yaml

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START gke_kubernetes_manifests_emailservice_deployment_emailservice]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -55,9 +54,7 @@ spec:
           limits:
             cpu: 200m
             memory: 128Mi
-# [END gke_kubernetes_manifests_emailservice_deployment_emailservice]
 ---
-# [START gke_kubernetes_manifests_emailservice_service_emailservice]
 apiVersion: v1
 kind: Service
 metadata:
@@ -70,4 +67,3 @@ spec:
   - name: grpc
     port: 5000
     targetPort: 8080
-# [END gke_kubernetes_manifests_emailservice_service_emailservice]

kubernetes-manifests/frontend.yaml

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START gke_kubernetes_manifests_frontend_deployment_frontend]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -86,9 +85,7 @@ spec:
             limits:
               cpu: 200m
               memory: 128Mi
-# [END gke_kubernetes_manifests_frontend_deployment_frontend]
 ---
-# [START gke_kubernetes_manifests_frontend_service_frontend]
 apiVersion: v1
 kind: Service
 metadata:
@@ -101,9 +98,7 @@ spec:
   - name: http
     port: 80
     targetPort: 8080
-# [END gke_kubernetes_manifests_frontend_service_frontend]
 ---
-# [START gke_kubernetes_manifests_frontend_service_frontend_external]
 apiVersion: v1
 kind: Service
 metadata:
@@ -116,4 +111,3 @@ spec:
   - name: http
     port: 80
     targetPort: 8080
-# [END gke_kubernetes_manifests_frontend_service_frontend_external]

kubernetes-manifests/loadgenerator.yaml

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START gke_kubernetes_manifests_loadgenerator_deployment_loadgenerator]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -63,4 +62,3 @@ spec:
           limits:
             cpu: 500m
             memory: 512Mi
-# [END gke_kubernetes_manifests_loadgenerator_deployment_loadgenerator]

kubernetes-manifests/paymentservice.yaml

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START gke_kubernetes_manifests_paymentservice_deployment_paymentservice]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -55,9 +54,7 @@ spec:
           limits:
             cpu: 200m
             memory: 128Mi
-# [END gke_kubernetes_manifests_paymentservice_deployment_paymentservice]
 ---
-# [START gke_kubernetes_manifests_paymentservice_service_paymentservice]
 apiVersion: v1
 kind: Service
 metadata:
@@ -70,4 +67,3 @@ spec:
   - name: grpc
     port: 50051
     targetPort: 50051
-# [END gke_kubernetes_manifests_paymentservice_service_paymentservice]

kubernetes-manifests/productcatalogservice.yaml

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START gke_kubernetes_manifests_productcatalogservice_deployment_productcatalogservice]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -57,9 +56,7 @@ spec:
           limits:
             cpu: 200m
             memory: 128Mi
-# [END gke_kubernetes_manifests_productcatalogservice_deployment_productcatalogservice]
 ---
-# [START gke_kubernetes_manifests_productcatalogservice_service_productcatalogservice]
 apiVersion: v1
 kind: Service
 metadata:
@@ -72,4 +69,3 @@ spec:
   - name: grpc
     port: 3550
     targetPort: 3550
-# [END gke_kubernetes_manifests_productcatalogservice_service_productcatalogservice]

kubernetes-manifests/recommendationservice.yaml

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START gke_kubernetes_manifests_recommendationservice_deployment_recommendationservice]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -59,9 +58,7 @@ spec:
           limits:
             cpu: 200m
             memory: 450Mi
-# [END gke_kubernetes_manifests_recommendationservice_deployment_recommendationservice]
 ---
-# [START gke_kubernetes_manifests_recommendationservice_service_recommendationservice]
 apiVersion: v1
 kind: Service
 metadata:
@@ -74,4 +71,3 @@ spec:
   - name: grpc
     port: 8080
     targetPort: 8080
-# [END gke_kubernetes_manifests_recommendationservice_service_recommendationservice]

kubernetes-manifests/redis.yaml

@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START gke_kubernetes_manifests_redis_deployment_redis_cart]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -53,9 +52,7 @@ spec:
       volumes:
       - name: redis-data
         emptyDir: {}
-# [END gke_kubernetes_manifests_redis_deployment_redis_cart]
 ---
-# [START gke_kubernetes_manifests_redis_service_redis_cart]
 apiVersion: v1
 kind: Service
 metadata:
@@ -68,4 +65,3 @@ spec:
   - name: redis
     port: 6379
     targetPort: 6379
-# [END gke_kubernetes_manifests_redis_service_redis_cart]

kubernetes-manifests/shippingservice.yaml

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START gke_kubernetes_manifests_shippingservice_deployment_shippingservice]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -57,9 +56,7 @@ spec:
           limits:
             cpu: 200m
             memory: 128Mi
-# [END gke_kubernetes_manifests_shippingservice_deployment_shippingservice]
 ---
-# [START gke_kubernetes_manifests_shippingservice_service_shippingservice]
 apiVersion: v1
 kind: Service
 metadata:
@@ -72,4 +69,3 @@ spec:
   - name: grpc
     port: 50051
     targetPort: 50051
-# [END gke_kubernetes_manifests_shippingservice_service_shippingservice]