From a3fa2a743fcad60bcb006db9ea4476c3acfe846f Mon Sep 17 00:00:00 2001 From: ckim328 Date: Mon, 10 Jan 2022 16:29:05 -0500 Subject: [PATCH 01/17] Added region tags to yaml and sh --- .github/snippet-bot.yml | 5 +++-- .github/workflows/install-dependencies.sh | 9 +++++++-- hack/make-docker-images.sh | 8 ++++++-- hack/make-release-artifacts.sh | 8 ++++++-- hack/make-release.sh | 8 ++++++-- istio-manifests/allow-egress-googleapis.yaml | 8 +++++++- istio-manifests/frontend-gateway.yaml | 8 +++++++- istio-manifests/frontend.yaml | 3 +++ kubernetes-manifests/adservice.yaml | 5 +++++ kubernetes-manifests/cartservice.yaml | 5 +++++ kubernetes-manifests/checkoutservice.yaml | 5 +++++ kubernetes-manifests/currencyservice.yaml | 5 +++++ kubernetes-manifests/emailservice.yaml | 5 +++++ kubernetes-manifests/frontend.yaml | 7 +++++++ kubernetes-manifests/loadgenerator.yaml | 4 ++++ kubernetes-manifests/paymentservice.yaml | 5 +++++ kubernetes-manifests/productcatalogservice.yaml | 5 +++++ kubernetes-manifests/recommendationservice.yaml | 5 +++++ kubernetes-manifests/redis.yaml | 8 +++++++- kubernetes-manifests/shippingservice.yaml | 5 +++++ skaffold.yaml | 8 ++++++-- src/adservice/genproto.sh | 10 +++++++--- src/checkoutservice/genproto.sh | 10 +++++++--- src/currencyservice/genproto.sh | 10 +++++++--- src/emailservice/genproto.sh | 10 +++++++--- src/frontend/genproto.sh | 11 ++++++++--- src/paymentservice/genproto.sh | 11 ++++++++--- src/productcatalogservice/genproto.sh | 10 +++++++--- src/recommendationservice/genproto.sh | 9 ++++++--- src/shippingservice/genproto.sh | 7 +++++-- 30 files changed, 176 insertions(+), 41 deletions(-) diff --git a/.github/snippet-bot.yml b/.github/snippet-bot.yml index 6f36eeccc91..26d99f1aa29 100644 --- a/.github/snippet-bot.yml +++ b/.github/snippet-bot.yml @@ -1,4 +1,5 @@ -# Copyright 2022 Google LLC + +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -10,4 +11,4 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License. \ No newline at end of file +# limitations under the License. diff --git a/.github/workflows/install-dependencies.sh b/.github/workflows/install-dependencies.sh index 60aa83545bc..99eec4d91e5 100644 --- a/.github/workflows/install-dependencies.sh +++ b/.github/workflows/install-dependencies.sh @@ -1,5 +1,5 @@ -#!/bin/bash -# Copyright 2020 Google LLC + +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,6 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_workflows_install_dependencies] +#!/bin/bash + set -euo pipefail # install wget @@ -72,3 +75,5 @@ echo "✅ docker installed, rebooting..." # reboot for docker setup sudo reboot + +# [END gke_workflows_install_dependencies] \ No newline at end of file diff --git a/hack/make-docker-images.sh b/hack/make-docker-images.sh index 9cff93701a4..948debcd446 100755 --- a/hack/make-docker-images.sh +++ b/hack/make-docker-images.sh @@ -1,6 +1,5 @@ -#!/usr/bin/env bash -# Copyright 2019 Google LLC +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,6 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_hack_make_docker_images] +#!/usr/bin/env bash + # Builds and pushes docker image for each demo microservice. set -euo pipefail @@ -45,3 +47,5 @@ while IFS= read -d $'\0' -r dir; do done < <(find "${SCRIPTDIR}/../src" -mindepth 1 -maxdepth 1 -type d -print0) log "Successfully built and pushed all images." + +# [END gke_hack_make_docker_images] \ No newline at end of file diff --git a/hack/make-release-artifacts.sh b/hack/make-release-artifacts.sh index 10fcb25c8b9..296bcb24ec1 100755 --- a/hack/make-release-artifacts.sh +++ b/hack/make-release-artifacts.sh @@ -1,6 +1,5 @@ -#!/usr/bin/env bash -# Copyright 2019 Google LLC +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,6 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_hack_make_release_artifacts] +#!/usr/bin/env bash + # This script compiles manifest files with the image tags and places them in # /release/... @@ -99,3 +101,5 @@ main() { } main + +# [END gke_hack_make_release_artifacts] \ No newline at end of file diff --git a/hack/make-release.sh b/hack/make-release.sh index 3333e2df485..31cc68ca96f 100755 --- a/hack/make-release.sh +++ b/hack/make-release.sh @@ -1,6 +1,5 @@ -#!/usr/bin/env bash -# Copyright 2019 Google LLC +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,6 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_hack_make_release] +#!/usr/bin/env bash + # This script creates a new release by: # - 1. building/pushing images # - 2. injecting tags into YAML manifests @@ -50,3 +52,5 @@ git push --set-upstream origin "release/${TAG}" git push --tags log "Successfully tagged release $TAG." + +# [END gke_hack_make_release] \ No newline at end of file diff --git a/istio-manifests/allow-egress-googleapis.yaml b/istio-manifests/allow-egress-googleapis.yaml index 50410b2794b..c31a8f5e39c 100644 --- a/istio-manifests/allow-egress-googleapis.yaml +++ b/istio-manifests/allow-egress-googleapis.yaml @@ -1,4 +1,5 @@ -# Copyright 2018 Google LLC + +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_googleapis] apiVersion: networking.istio.io/v1alpha3 kind: ServiceEntry metadata: @@ -27,7 +29,9 @@ spec: - number: 443 protocol: HTTPS name: https +# [END gke_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_googleapis] --- +# [START gke_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_google_metadata] apiVersion: networking.istio.io/v1alpha3 kind: ServiceEntry metadata: @@ -44,3 +48,5 @@ spec: - number: 443 name: https protocol: HTTPS +# [END gke_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_google_metadata] +--- diff --git a/istio-manifests/frontend-gateway.yaml b/istio-manifests/frontend-gateway.yaml index b3a1a647373..a2044889c49 100644 --- a/istio-manifests/frontend-gateway.yaml +++ b/istio-manifests/frontend-gateway.yaml @@ -1,4 +1,5 @@ -# Copyright 2018 Google LLC + +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_istio_manifests_frontend_gateway_gateway_frontend_gateway] apiVersion: networking.istio.io/v1alpha3 kind: Gateway metadata: @@ -26,7 +28,9 @@ spec: protocol: HTTP hosts: - "*" +# [END gke_istio_manifests_frontend_gateway_gateway_frontend_gateway] --- +# [START gke_istio_manifests_frontend_gateway_virtualservice_frontend_ingress] apiVersion: networking.istio.io/v1alpha3 kind: VirtualService metadata: @@ -42,3 +46,5 @@ spec: host: frontend port: number: 80 +# [END gke_istio_manifests_frontend_gateway_virtualservice_frontend_ingress] +--- diff --git a/istio-manifests/frontend.yaml b/istio-manifests/frontend.yaml index 23cd64832c0..84dff282d5e 100644 --- a/istio-manifests/frontend.yaml +++ b/istio-manifests/frontend.yaml @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_istio_manifests_frontend_virtualservice_frontend] apiVersion: networking.istio.io/v1alpha3 kind: VirtualService metadata: @@ -25,3 +26,5 @@ spec: host: frontend port: number: 80 +# [END gke_istio_manifests_frontend_virtualservice_frontend] +--- diff --git a/kubernetes-manifests/adservice.yaml b/kubernetes-manifests/adservice.yaml index 28233e9b84d..b3da1fce848 100644 --- a/kubernetes-manifests/adservice.yaml +++ b/kubernetes-manifests/adservice.yaml @@ -12,6 +12,7 @@ # 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: @@ -58,7 +59,9 @@ 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: @@ -71,3 +74,5 @@ spec: - name: grpc port: 9555 targetPort: 9555 +# [END gke_kubernetes_manifests_adservice_service_adservice] +--- diff --git a/kubernetes-manifests/cartservice.yaml b/kubernetes-manifests/cartservice.yaml index eab184b2829..34824d2e7fe 100644 --- a/kubernetes-manifests/cartservice.yaml +++ b/kubernetes-manifests/cartservice.yaml @@ -12,6 +12,7 @@ # 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: @@ -51,7 +52,9 @@ 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: @@ -64,3 +67,5 @@ spec: - name: grpc port: 7070 targetPort: 7070 +# [END gke_kubernetes_manifests_cartservice_service_cartservice] +--- diff --git a/kubernetes-manifests/checkoutservice.yaml b/kubernetes-manifests/checkoutservice.yaml index 7bb17c5335f..29644dcfcaf 100644 --- a/kubernetes-manifests/checkoutservice.yaml +++ b/kubernetes-manifests/checkoutservice.yaml @@ -12,6 +12,7 @@ # 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: @@ -67,7 +68,9 @@ 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: @@ -80,3 +83,5 @@ spec: - name: grpc port: 5050 targetPort: 5050 +# [END gke_kubernetes_manifests_checkoutservice_service_checkoutservice] +--- diff --git a/kubernetes-manifests/currencyservice.yaml b/kubernetes-manifests/currencyservice.yaml index 79fec6e027a..5a977ab908b 100644 --- a/kubernetes-manifests/currencyservice.yaml +++ b/kubernetes-manifests/currencyservice.yaml @@ -12,6 +12,7 @@ # 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: @@ -55,7 +56,9 @@ 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: @@ -68,3 +71,5 @@ spec: - name: grpc port: 7000 targetPort: 7000 +# [END gke_kubernetes_manifests_currencyservice_service_currencyservice] +--- diff --git a/kubernetes-manifests/emailservice.yaml b/kubernetes-manifests/emailservice.yaml index a95ea454068..bea6f1901d0 100644 --- a/kubernetes-manifests/emailservice.yaml +++ b/kubernetes-manifests/emailservice.yaml @@ -12,6 +12,7 @@ # 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: @@ -54,7 +55,9 @@ 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: @@ -67,3 +70,5 @@ spec: - name: grpc port: 5000 targetPort: 8080 +# [END gke_kubernetes_manifests_emailservice_service_emailservice] +--- diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml index eedd7f56621..4b6c9de4691 100644 --- a/kubernetes-manifests/frontend.yaml +++ b/kubernetes-manifests/frontend.yaml @@ -12,6 +12,7 @@ # 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: @@ -85,7 +86,9 @@ 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: @@ -98,7 +101,9 @@ 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: @@ -111,3 +116,5 @@ spec: - name: http port: 80 targetPort: 8080 +# [END gke_kubernetes_manifests_frontend_service_frontend_external] +--- diff --git a/kubernetes-manifests/loadgenerator.yaml b/kubernetes-manifests/loadgenerator.yaml index 7b53dc0736f..580db3dce1a 100644 --- a/kubernetes-manifests/loadgenerator.yaml +++ b/kubernetes-manifests/loadgenerator.yaml @@ -11,6 +11,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # 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: @@ -61,3 +63,5 @@ spec: limits: cpu: 500m memory: 512Mi +# [END gke_kubernetes_manifests_loadgenerator_deployment_loadgenerator] +--- diff --git a/kubernetes-manifests/paymentservice.yaml b/kubernetes-manifests/paymentservice.yaml index 408b10d2647..983837babc2 100644 --- a/kubernetes-manifests/paymentservice.yaml +++ b/kubernetes-manifests/paymentservice.yaml @@ -12,6 +12,7 @@ # 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: @@ -54,7 +55,9 @@ 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: @@ -67,3 +70,5 @@ spec: - name: grpc port: 50051 targetPort: 50051 +# [END gke_kubernetes_manifests_paymentservice_service_paymentservice] +--- diff --git a/kubernetes-manifests/productcatalogservice.yaml b/kubernetes-manifests/productcatalogservice.yaml index 0c948ee61d1..96038809848 100644 --- a/kubernetes-manifests/productcatalogservice.yaml +++ b/kubernetes-manifests/productcatalogservice.yaml @@ -12,6 +12,7 @@ # 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: @@ -56,7 +57,9 @@ 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: @@ -69,3 +72,5 @@ spec: - name: grpc port: 3550 targetPort: 3550 +# [END gke_kubernetes_manifests_productcatalogservice_service_productcatalogservice] +--- diff --git a/kubernetes-manifests/recommendationservice.yaml b/kubernetes-manifests/recommendationservice.yaml index f9f38f513c4..41bb896abee 100644 --- a/kubernetes-manifests/recommendationservice.yaml +++ b/kubernetes-manifests/recommendationservice.yaml @@ -12,6 +12,7 @@ # 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: @@ -58,7 +59,9 @@ 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: @@ -71,3 +74,5 @@ spec: - name: grpc port: 8080 targetPort: 8080 +# [END gke_kubernetes_manifests_recommendationservice_service_recommendationservice] +--- diff --git a/kubernetes-manifests/redis.yaml b/kubernetes-manifests/redis.yaml index b67649b93b4..3018c7c2c07 100644 --- a/kubernetes-manifests/redis.yaml +++ b/kubernetes-manifests/redis.yaml @@ -1,4 +1,5 @@ -# Copyright 2018 Google LLC + +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,6 +13,7 @@ # 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: @@ -51,7 +53,9 @@ 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: @@ -64,3 +68,5 @@ spec: - name: redis port: 6379 targetPort: 6379 +# [END gke_kubernetes_manifests_redis_service_redis_cart] +--- diff --git a/kubernetes-manifests/shippingservice.yaml b/kubernetes-manifests/shippingservice.yaml index 629504d294c..e5a96e964f5 100644 --- a/kubernetes-manifests/shippingservice.yaml +++ b/kubernetes-manifests/shippingservice.yaml @@ -12,6 +12,7 @@ # 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: @@ -56,7 +57,9 @@ 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: @@ -69,3 +72,5 @@ spec: - name: grpc port: 50051 targetPort: 50051 +# [END gke_kubernetes_manifests_shippingservice_service_shippingservice] +--- diff --git a/skaffold.yaml b/skaffold.yaml index 6f950649635..7b8afd69010 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -1,3 +1,4 @@ + # Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_microservice_demo_skaffold_config_app] apiVersion: skaffold/v2beta18 kind: Config metadata: @@ -88,9 +90,9 @@ profiles: - op: replace path: /build/artifacts/7/docker/dockerfile value: Dockerfile.debug - +# [END gke_skaffold_config_app] --- - +# [START gke_skaffold_config_loadgenerator] apiVersion: skaffold/v2beta18 kind: Config metadata: @@ -105,3 +107,5 @@ deploy: kubectl: manifests: - ./kubernetes-manifests/loadgenerator.yaml +# [END gke_skaffold_config_loadgenerator] +--- diff --git a/src/adservice/genproto.sh b/src/adservice/genproto.sh index 57a060810d6..f5fed2e9e87 100755 --- a/src/adservice/genproto.sh +++ b/src/adservice/genproto.sh @@ -1,6 +1,5 @@ -#!/bin/bash -eu -# -# Copyright 2018 Google LLC + +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_adservice_genproto] +#!/bin/bash -eu + # protos are needed in adservice folder for compiling during Docker build. mkdir -p proto && \ cp ../../pb/demo.proto src/main/proto + +# [END gke_adservice_genproto] \ No newline at end of file diff --git a/src/checkoutservice/genproto.sh b/src/checkoutservice/genproto.sh index 18b0beabae9..aaf7ba083a0 100755 --- a/src/checkoutservice/genproto.sh +++ b/src/checkoutservice/genproto.sh @@ -1,6 +1,5 @@ -#!/bin/bash -eu -# -# Copyright 2018 Google LLC + +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_checkoutservice_genproto] +#!/bin/bash -eu + PATH=$PATH:$GOPATH/bin protodir=../../pb protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto + +# [END gke_checkoutservice_genproto] \ No newline at end of file diff --git a/src/currencyservice/genproto.sh b/src/currencyservice/genproto.sh index a9609fd1534..733dea2e060 100755 --- a/src/currencyservice/genproto.sh +++ b/src/currencyservice/genproto.sh @@ -1,6 +1,5 @@ -#!/bin/bash -eu -# -# Copyright 2018 Google LLC + +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,6 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_currencyservice_genproto] +#!/bin/bash -eu + # protos are loaded dynamically for node, simply copies over the proto. mkdir -p proto cp -r ../../pb/* ./proto + +# [END gke_currencyservice_genproto] \ No newline at end of file diff --git a/src/emailservice/genproto.sh b/src/emailservice/genproto.sh index 7f0f4ff47eb..46deedde8ab 100755 --- a/src/emailservice/genproto.sh +++ b/src/emailservice/genproto.sh @@ -1,6 +1,5 @@ -#!/bin/bash -eu -# -# Copyright 2018 Google LLC + +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,4 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_emailservice_genproto] +#!/bin/bash -eu + python -m grpc_tools.protoc -I../../pb --python_out=. --grpc_python_out=. ../../pb/demo.proto + +# [END gke_emailservice_genproto] \ No newline at end of file diff --git a/src/frontend/genproto.sh b/src/frontend/genproto.sh index 18b0beabae9..05d337620e7 100755 --- a/src/frontend/genproto.sh +++ b/src/frontend/genproto.sh @@ -1,6 +1,5 @@ -#!/bin/bash -eu -# -# Copyright 2018 Google LLC + +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_frontend_genproto] +#!/bin/bash -eu + + PATH=$PATH:$GOPATH/bin protodir=../../pb protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto + +# [END gke_frontend_genproto] \ No newline at end of file diff --git a/src/paymentservice/genproto.sh b/src/paymentservice/genproto.sh index a9609fd1534..71671462dad 100755 --- a/src/paymentservice/genproto.sh +++ b/src/paymentservice/genproto.sh @@ -1,6 +1,5 @@ -#!/bin/bash -eu -# -# Copyright 2018 Google LLC + +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,6 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_paymentservice_genproto] +#!/bin/bash -eu +# + # protos are loaded dynamically for node, simply copies over the proto. mkdir -p proto cp -r ../../pb/* ./proto + +# [END gke_paymentservice_genproto] \ No newline at end of file diff --git a/src/productcatalogservice/genproto.sh b/src/productcatalogservice/genproto.sh index 18b0beabae9..b9dcb8f894b 100755 --- a/src/productcatalogservice/genproto.sh +++ b/src/productcatalogservice/genproto.sh @@ -1,6 +1,5 @@ -#!/bin/bash -eu -# -# Copyright 2018 Google LLC + +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_productcatalogservice_genproto] +#!/bin/bash -eu + PATH=$PATH:$GOPATH/bin protodir=../../pb protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto + +# [END gke_productcatalogservice_genproto] \ No newline at end of file diff --git a/src/recommendationservice/genproto.sh b/src/recommendationservice/genproto.sh index 22ed156a10a..d0684dc9806 100755 --- a/src/recommendationservice/genproto.sh +++ b/src/recommendationservice/genproto.sh @@ -1,6 +1,4 @@ -#!/bin/bash -eu -# -# Copyright 2018 Google LLC +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,9 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_recommendationservice_genproto] +#!/bin/bash -eu + # script to compile python protos # # requires gRPC tools: # pip install -r requirements.txt python -m grpc_tools.protoc -I../../pb --python_out=. --grpc_python_out=. ../../pb/demo.proto + +# [END gke_recommendationservice_genproto] \ No newline at end of file diff --git a/src/shippingservice/genproto.sh b/src/shippingservice/genproto.sh index 18b0beabae9..a6fe00307b0 100755 --- a/src/shippingservice/genproto.sh +++ b/src/shippingservice/genproto.sh @@ -1,5 +1,3 @@ -#!/bin/bash -eu -# # Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,7 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_shippingservice_genproto] +#!/bin/bash -eu + PATH=$PATH:$GOPATH/bin protodir=../../pb protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto + +# [END gke_shippingservice_genproto] \ No newline at end of file From 7770cf985d91c09c5ba068a7a5cf1ef474837446 Mon Sep 17 00:00:00 2001 From: ckim328 Date: Mon, 10 Jan 2022 16:36:08 -0500 Subject: [PATCH 02/17] Added manual tags for the cloudbuild --- cloudbuild.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 72ff1d017a4..82dc4446943 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_cloudbuild_microservice_demo_cloudbuild] + # This configuration file is used to build and deploy the app into a # GKE cluster using Google Cloud Build. # @@ -37,3 +39,5 @@ steps: timeout: '3600s' options: machineType: 'N1_HIGHCPU_8' + +# [ END gke_cloudbuild_microservice_demo_cloudbuild] \ No newline at end of file From 5e7efb2ce204e5a5d18866d2527f2bdf20bb5718 Mon Sep 17 00:00:00 2001 From: ckim328 Date: Mon, 10 Jan 2022 16:43:32 -0500 Subject: [PATCH 03/17] Edited the asm and gke files --- .github/workflows/install-dependencies.sh | 3 --- hack/make-docker-images.sh | 3 --- hack/make-release-artifacts.sh | 3 --- hack/make-release.sh | 3 --- istio-manifests/allow-egress-googleapis.yaml | 8 ++++---- istio-manifests/frontend-gateway.yaml | 8 ++++---- istio-manifests/frontend.yaml | 4 ++-- 7 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.github/workflows/install-dependencies.sh b/.github/workflows/install-dependencies.sh index 99eec4d91e5..a6341221247 100644 --- a/.github/workflows/install-dependencies.sh +++ b/.github/workflows/install-dependencies.sh @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_workflows_install_dependencies] #!/bin/bash set -euo pipefail @@ -75,5 +74,3 @@ echo "✅ docker installed, rebooting..." # reboot for docker setup sudo reboot - -# [END gke_workflows_install_dependencies] \ No newline at end of file diff --git a/hack/make-docker-images.sh b/hack/make-docker-images.sh index 948debcd446..1f6a8e3fd5f 100755 --- a/hack/make-docker-images.sh +++ b/hack/make-docker-images.sh @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_hack_make_docker_images] #!/usr/bin/env bash # Builds and pushes docker image for each demo microservice. @@ -47,5 +46,3 @@ while IFS= read -d $'\0' -r dir; do done < <(find "${SCRIPTDIR}/../src" -mindepth 1 -maxdepth 1 -type d -print0) log "Successfully built and pushed all images." - -# [END gke_hack_make_docker_images] \ No newline at end of file diff --git a/hack/make-release-artifacts.sh b/hack/make-release-artifacts.sh index 296bcb24ec1..19317792ac6 100755 --- a/hack/make-release-artifacts.sh +++ b/hack/make-release-artifacts.sh @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_hack_make_release_artifacts] #!/usr/bin/env bash # This script compiles manifest files with the image tags and places them in @@ -101,5 +100,3 @@ main() { } main - -# [END gke_hack_make_release_artifacts] \ No newline at end of file diff --git a/hack/make-release.sh b/hack/make-release.sh index 31cc68ca96f..975510cfe54 100755 --- a/hack/make-release.sh +++ b/hack/make-release.sh @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_hack_make_release] #!/usr/bin/env bash # This script creates a new release by: @@ -52,5 +51,3 @@ git push --set-upstream origin "release/${TAG}" git push --tags log "Successfully tagged release $TAG." - -# [END gke_hack_make_release] \ No newline at end of file diff --git a/istio-manifests/allow-egress-googleapis.yaml b/istio-manifests/allow-egress-googleapis.yaml index c31a8f5e39c..e49f569c4a6 100644 --- a/istio-manifests/allow-egress-googleapis.yaml +++ b/istio-manifests/allow-egress-googleapis.yaml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_googleapis] +# [START servicemesh_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_googleapis] apiVersion: networking.istio.io/v1alpha3 kind: ServiceEntry metadata: @@ -29,9 +29,9 @@ spec: - number: 443 protocol: HTTPS name: https -# [END gke_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_googleapis] +# [END servicemesh_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_googleapis] --- -# [START gke_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_google_metadata] +# [START servicemesh_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_google_metadata] apiVersion: networking.istio.io/v1alpha3 kind: ServiceEntry metadata: @@ -48,5 +48,5 @@ spec: - number: 443 name: https protocol: HTTPS -# [END gke_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_google_metadata] +# [END servicemesh_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_google_metadata] --- diff --git a/istio-manifests/frontend-gateway.yaml b/istio-manifests/frontend-gateway.yaml index a2044889c49..c1bb27a7724 100644 --- a/istio-manifests/frontend-gateway.yaml +++ b/istio-manifests/frontend-gateway.yaml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_istio_manifests_frontend_gateway_gateway_frontend_gateway] +# [START servicemesh_istio_manifests_frontend_gateway_gateway_frontend_gateway] apiVersion: networking.istio.io/v1alpha3 kind: Gateway metadata: @@ -28,9 +28,9 @@ spec: protocol: HTTP hosts: - "*" -# [END gke_istio_manifests_frontend_gateway_gateway_frontend_gateway] +# [END servicemesh_istio_manifests_frontend_gateway_gateway_frontend_gateway] --- -# [START gke_istio_manifests_frontend_gateway_virtualservice_frontend_ingress] +# [START servicemesh_istio_manifests_frontend_gateway_virtualservice_frontend_ingress] apiVersion: networking.istio.io/v1alpha3 kind: VirtualService metadata: @@ -46,5 +46,5 @@ spec: host: frontend port: number: 80 -# [END gke_istio_manifests_frontend_gateway_virtualservice_frontend_ingress] +# [END servicemesh_istio_manifests_frontend_gateway_virtualservice_frontend_ingress] --- diff --git a/istio-manifests/frontend.yaml b/istio-manifests/frontend.yaml index 84dff282d5e..1899ff08232 100644 --- a/istio-manifests/frontend.yaml +++ b/istio-manifests/frontend.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_istio_manifests_frontend_virtualservice_frontend] +# [START servicemesh_istio_manifests_frontend_virtualservice_frontend] apiVersion: networking.istio.io/v1alpha3 kind: VirtualService metadata: @@ -26,5 +26,5 @@ spec: host: frontend port: number: 80 -# [END gke_istio_manifests_frontend_virtualservice_frontend] +# [END servicemesh_istio_manifests_frontend_virtualservice_frontend] --- From 4d05d81ea6baa0734e7b8e5872a95d07e9cbcadf Mon Sep 17 00:00:00 2001 From: ckim328 Date: Mon, 10 Jan 2022 16:56:43 -0500 Subject: [PATCH 04/17] Skaffold region tags fix --- cloudbuild.yaml | 2 +- skaffold.yaml | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 82dc4446943..8832f9b99ed 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -40,4 +40,4 @@ timeout: '3600s' options: machineType: 'N1_HIGHCPU_8' -# [ END gke_cloudbuild_microservice_demo_cloudbuild] \ No newline at end of file +# [END gke_cloudbuild_microservice_demo_cloudbuild] \ No newline at end of file diff --git a/skaffold.yaml b/skaffold.yaml index 7b8afd69010..d132e65f1e5 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -85,20 +85,21 @@ profiles: # This profile is used by default when running skaffold debug. - name: debug activation: - - command: debug + - command: debug patches: - - op: replace - path: /build/artifacts/7/docker/dockerfile - value: Dockerfile.debug -# [END gke_skaffold_config_app] + - op: replace + path: /build/artifacts/7/docker/dockerfile + value: Dockerfile.debug +# [END gke_microservice_demo_skaffold_config_app] --- -# [START gke_skaffold_config_loadgenerator] +# [START gke_microservice_demo_skaffold_config_loadgenerator] apiVersion: skaffold/v2beta18 kind: Config metadata: name: loadgenerator requires: - - configs: [app] +- configs: + - app build: artifacts: - image: loadgenerator @@ -107,5 +108,5 @@ deploy: kubectl: manifests: - ./kubernetes-manifests/loadgenerator.yaml -# [END gke_skaffold_config_loadgenerator] +# [END gke_microservice_demo_skaffold_config_loadgenerator] --- From 2a17e74a21f215b8eeda77231c56faebbcc6ceb9 Mon Sep 17 00:00:00 2001 From: ckim328 Date: Mon, 10 Jan 2022 17:05:07 -0500 Subject: [PATCH 05/17] Fix skaffold artifacts --- skaffold.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/skaffold.yaml b/skaffold.yaml index d132e65f1e5..5a50f7c41f9 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -98,8 +98,7 @@ kind: Config metadata: name: loadgenerator requires: -- configs: - - app +- configs: [app] build: artifacts: - image: loadgenerator From d26fd6da3bf530ebbb156b6e99ce27529a800b72 Mon Sep 17 00:00:00 2001 From: ckim328 Date: Mon, 10 Jan 2022 17:15:02 -0500 Subject: [PATCH 06/17] Spacing in skaffold yaml --- .github/workflows/ci-pr.yaml | 3 +-- skaffold.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-pr.yaml b/.github/workflows/ci-pr.yaml index 7a21ead0a21..b9f30bc09f9 100644 --- a/.github/workflows/ci-pr.yaml +++ b/.github/workflows/ci-pr.yaml @@ -61,7 +61,6 @@ jobs: run: | NAMESPACE="pr${PR_NUMBER}" echo "::set-env name=NAMESPACE::$NAMESPACE" - gcloud container clusters get-credentials $PR_CLUSTER --zone $ZONE --project $PROJECT_ID cat < Date: Mon, 10 Jan 2022 17:29:23 -0500 Subject: [PATCH 07/17] Fixed for real --- skaffold.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/skaffold.yaml b/skaffold.yaml index b074fc02a9d..c01301831b8 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_microservice_demo_skaffold_config_app] apiVersion: skaffold/v2beta18 kind: Config metadata: @@ -90,9 +89,9 @@ profiles: - op: replace path: /build/artifacts/7/docker/dockerfile value: Dockerfile.debug -# [END gke_microservice_demo_skaffold_config_app] + --- -# [START gke_microservice_demo_skaffold_config_loadgenerator] + apiVersion: skaffold/v2beta18 kind: Config metadata: @@ -106,6 +105,4 @@ build: deploy: kubectl: manifests: - - ./kubernetes-manifests/loadgenerator.yaml -# [END gke_microservice_demo_skaffold_config_loadgenerator] ---- + - ./kubernetes-manifests/loadgenerator.yaml \ No newline at end of file From 5d7a521d2ebf00cc6eaa77984d9c79daee4e1397 Mon Sep 17 00:00:00 2001 From: ckim328 Date: Tue, 11 Jan 2022 09:47:33 -0500 Subject: [PATCH 08/17] shebangs back at the top of the sh files --- .github/workflows/install-dependencies.sh | 2 +- hack/make-docker-images.sh | 2 +- hack/make-release-artifacts.sh | 2 +- hack/make-release.sh | 2 +- src/checkoutservice/genproto.sh | 2 +- src/currencyservice/genproto.sh | 2 +- src/emailservice/genproto.sh | 2 +- src/frontend/genproto.sh | 3 +-- src/paymentservice/genproto.sh | 3 +-- src/productcatalogservice/genproto.sh | 2 +- src/recommendationservice/genproto.sh | 2 +- src/shippingservice/genproto.sh | 3 ++- 12 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/install-dependencies.sh b/.github/workflows/install-dependencies.sh index a6341221247..793556b62c1 100644 --- a/.github/workflows/install-dependencies.sh +++ b/.github/workflows/install-dependencies.sh @@ -1,3 +1,4 @@ +#!/bin/bash # Copyright 2021 Google LLC # @@ -13,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -#!/bin/bash set -euo pipefail diff --git a/hack/make-docker-images.sh b/hack/make-docker-images.sh index 1f6a8e3fd5f..33d95e653d5 100755 --- a/hack/make-docker-images.sh +++ b/hack/make-docker-images.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash # Copyright 2021 Google LLC # @@ -13,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -#!/usr/bin/env bash # Builds and pushes docker image for each demo microservice. diff --git a/hack/make-release-artifacts.sh b/hack/make-release-artifacts.sh index 19317792ac6..3f7449b0420 100755 --- a/hack/make-release-artifacts.sh +++ b/hack/make-release-artifacts.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash # Copyright 2021 Google LLC # @@ -13,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -#!/usr/bin/env bash # This script compiles manifest files with the image tags and places them in # /release/... diff --git a/hack/make-release.sh b/hack/make-release.sh index 975510cfe54..65ccb43151c 100755 --- a/hack/make-release.sh +++ b/hack/make-release.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash # Copyright 2021 Google LLC # @@ -13,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -#!/usr/bin/env bash # This script creates a new release by: # - 1. building/pushing images diff --git a/src/checkoutservice/genproto.sh b/src/checkoutservice/genproto.sh index aaf7ba083a0..145c26e8be6 100755 --- a/src/checkoutservice/genproto.sh +++ b/src/checkoutservice/genproto.sh @@ -1,3 +1,4 @@ +#!/bin/bash -eu # Copyright 2021 Google LLC # @@ -14,7 +15,6 @@ # limitations under the License. # [START gke_checkoutservice_genproto] -#!/bin/bash -eu PATH=$PATH:$GOPATH/bin protodir=../../pb diff --git a/src/currencyservice/genproto.sh b/src/currencyservice/genproto.sh index 733dea2e060..adda87f3052 100755 --- a/src/currencyservice/genproto.sh +++ b/src/currencyservice/genproto.sh @@ -1,3 +1,4 @@ +#!/bin/bash -eu # Copyright 2021 Google LLC # @@ -14,7 +15,6 @@ # limitations under the License. # [START gke_currencyservice_genproto] -#!/bin/bash -eu # protos are loaded dynamically for node, simply copies over the proto. mkdir -p proto diff --git a/src/emailservice/genproto.sh b/src/emailservice/genproto.sh index 46deedde8ab..80ea050385c 100755 --- a/src/emailservice/genproto.sh +++ b/src/emailservice/genproto.sh @@ -1,3 +1,4 @@ +#!/bin/bash -eu # Copyright 2021 Google LLC # @@ -14,7 +15,6 @@ # limitations under the License. # [START gke_emailservice_genproto] -#!/bin/bash -eu python -m grpc_tools.protoc -I../../pb --python_out=. --grpc_python_out=. ../../pb/demo.proto diff --git a/src/frontend/genproto.sh b/src/frontend/genproto.sh index 05d337620e7..9c2c1acca34 100755 --- a/src/frontend/genproto.sh +++ b/src/frontend/genproto.sh @@ -1,3 +1,4 @@ +#!/bin/bash -eu # Copyright 2021 Google LLC # @@ -14,8 +15,6 @@ # limitations under the License. # [START gke_frontend_genproto] -#!/bin/bash -eu - PATH=$PATH:$GOPATH/bin protodir=../../pb diff --git a/src/paymentservice/genproto.sh b/src/paymentservice/genproto.sh index 71671462dad..9600050ef4c 100755 --- a/src/paymentservice/genproto.sh +++ b/src/paymentservice/genproto.sh @@ -1,3 +1,4 @@ +#!/bin/bash -eu # Copyright 2021 Google LLC # @@ -14,8 +15,6 @@ # limitations under the License. # [START gke_paymentservice_genproto] -#!/bin/bash -eu -# # protos are loaded dynamically for node, simply copies over the proto. mkdir -p proto diff --git a/src/productcatalogservice/genproto.sh b/src/productcatalogservice/genproto.sh index b9dcb8f894b..19dbeb79403 100755 --- a/src/productcatalogservice/genproto.sh +++ b/src/productcatalogservice/genproto.sh @@ -1,3 +1,4 @@ +#!/bin/bash -eu # Copyright 2021 Google LLC # @@ -14,7 +15,6 @@ # limitations under the License. # [START gke_productcatalogservice_genproto] -#!/bin/bash -eu PATH=$PATH:$GOPATH/bin protodir=../../pb diff --git a/src/recommendationservice/genproto.sh b/src/recommendationservice/genproto.sh index d0684dc9806..d2458a7d86a 100755 --- a/src/recommendationservice/genproto.sh +++ b/src/recommendationservice/genproto.sh @@ -1,3 +1,4 @@ +#!/bin/bash -eu # Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,7 +14,6 @@ # limitations under the License. # [START gke_recommendationservice_genproto] -#!/bin/bash -eu # script to compile python protos # diff --git a/src/shippingservice/genproto.sh b/src/shippingservice/genproto.sh index a6fe00307b0..2a607fd33c4 100755 --- a/src/shippingservice/genproto.sh +++ b/src/shippingservice/genproto.sh @@ -1,3 +1,5 @@ +#!/bin/bash -eu + # Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,7 +15,6 @@ # limitations under the License. # [START gke_shippingservice_genproto] -#!/bin/bash -eu PATH=$PATH:$GOPATH/bin protodir=../../pb From 49b5b9c66c87943e72e6e1d4f3684b146551ced5 Mon Sep 17 00:00:00 2001 From: ckim328 Date: Tue, 11 Jan 2022 13:28:02 -0500 Subject: [PATCH 09/17] Edit to the make-release-artifacts to remove tags --- hack/make-release-artifacts.sh | 10 +++++++--- istio-manifests/allow-egress-googleapis.yaml | 1 - istio-manifests/frontend-gateway.yaml | 1 - istio-manifests/frontend.yaml | 3 +-- kubernetes-manifests/adservice.yaml | 1 - kubernetes-manifests/cartservice.yaml | 1 - kubernetes-manifests/checkoutservice.yaml | 1 - kubernetes-manifests/currencyservice.yaml | 1 - kubernetes-manifests/emailservice.yaml | 1 - kubernetes-manifests/frontend.yaml | 1 - kubernetes-manifests/loadgenerator.yaml | 1 - kubernetes-manifests/paymentservice.yaml | 1 - kubernetes-manifests/productcatalogservice.yaml | 1 - kubernetes-manifests/recommendationservice.yaml | 1 - kubernetes-manifests/redis.yaml | 1 - kubernetes-manifests/shippingservice.yaml | 1 - 16 files changed, 8 insertions(+), 19 deletions(-) diff --git a/hack/make-release-artifacts.sh b/hack/make-release-artifacts.sh index 3f7449b0420..b1c7c5287a0 100755 --- a/hack/make-release-artifacts.sh +++ b/hack/make-release-artifacts.sh @@ -50,13 +50,13 @@ EOF read_manifests() { local dir dir="$1" - + while IFS= read -d $'\0' -r file; do # strip license headers (pattern "^# ") awk ' /^[^# ]/ { found = 1 } found { print }' "${file}" - + echo "---" done < <(find "${dir}" -name '*.yaml' -type f -print0) } @@ -92,11 +92,15 @@ 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}" } - +# "$@" main diff --git a/istio-manifests/allow-egress-googleapis.yaml b/istio-manifests/allow-egress-googleapis.yaml index e49f569c4a6..f66b7666423 100644 --- a/istio-manifests/allow-egress-googleapis.yaml +++ b/istio-manifests/allow-egress-googleapis.yaml @@ -49,4 +49,3 @@ spec: name: https protocol: HTTPS # [END servicemesh_istio_manifests_allow_egress_googleapis_serviceentry_allow_egress_google_metadata] ---- diff --git a/istio-manifests/frontend-gateway.yaml b/istio-manifests/frontend-gateway.yaml index c1bb27a7724..824a238c5f7 100644 --- a/istio-manifests/frontend-gateway.yaml +++ b/istio-manifests/frontend-gateway.yaml @@ -47,4 +47,3 @@ spec: port: number: 80 # [END servicemesh_istio_manifests_frontend_gateway_virtualservice_frontend_ingress] ---- diff --git a/istio-manifests/frontend.yaml b/istio-manifests/frontend.yaml index 1899ff08232..07d238eb0b0 100644 --- a/istio-manifests/frontend.yaml +++ b/istio-manifests/frontend.yaml @@ -26,5 +26,4 @@ spec: host: frontend port: number: 80 -# [END servicemesh_istio_manifests_frontend_virtualservice_frontend] ---- +# [END servicemesh_istio_manifests_frontend_virtualservice_frontend] \ No newline at end of file diff --git a/kubernetes-manifests/adservice.yaml b/kubernetes-manifests/adservice.yaml index b3da1fce848..16fdc15ad56 100644 --- a/kubernetes-manifests/adservice.yaml +++ b/kubernetes-manifests/adservice.yaml @@ -75,4 +75,3 @@ spec: port: 9555 targetPort: 9555 # [END gke_kubernetes_manifests_adservice_service_adservice] ---- diff --git a/kubernetes-manifests/cartservice.yaml b/kubernetes-manifests/cartservice.yaml index 34824d2e7fe..e4e9e6c2876 100644 --- a/kubernetes-manifests/cartservice.yaml +++ b/kubernetes-manifests/cartservice.yaml @@ -68,4 +68,3 @@ spec: port: 7070 targetPort: 7070 # [END gke_kubernetes_manifests_cartservice_service_cartservice] ---- diff --git a/kubernetes-manifests/checkoutservice.yaml b/kubernetes-manifests/checkoutservice.yaml index 29644dcfcaf..86874230332 100644 --- a/kubernetes-manifests/checkoutservice.yaml +++ b/kubernetes-manifests/checkoutservice.yaml @@ -84,4 +84,3 @@ spec: port: 5050 targetPort: 5050 # [END gke_kubernetes_manifests_checkoutservice_service_checkoutservice] ---- diff --git a/kubernetes-manifests/currencyservice.yaml b/kubernetes-manifests/currencyservice.yaml index 5a977ab908b..ac7d8dd4c44 100644 --- a/kubernetes-manifests/currencyservice.yaml +++ b/kubernetes-manifests/currencyservice.yaml @@ -72,4 +72,3 @@ spec: port: 7000 targetPort: 7000 # [END gke_kubernetes_manifests_currencyservice_service_currencyservice] ---- diff --git a/kubernetes-manifests/emailservice.yaml b/kubernetes-manifests/emailservice.yaml index bea6f1901d0..9129cd53e09 100644 --- a/kubernetes-manifests/emailservice.yaml +++ b/kubernetes-manifests/emailservice.yaml @@ -71,4 +71,3 @@ spec: port: 5000 targetPort: 8080 # [END gke_kubernetes_manifests_emailservice_service_emailservice] ---- diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml index 4b6c9de4691..b3e7d90b4be 100644 --- a/kubernetes-manifests/frontend.yaml +++ b/kubernetes-manifests/frontend.yaml @@ -117,4 +117,3 @@ spec: port: 80 targetPort: 8080 # [END gke_kubernetes_manifests_frontend_service_frontend_external] ---- diff --git a/kubernetes-manifests/loadgenerator.yaml b/kubernetes-manifests/loadgenerator.yaml index 580db3dce1a..9232774ff15 100644 --- a/kubernetes-manifests/loadgenerator.yaml +++ b/kubernetes-manifests/loadgenerator.yaml @@ -64,4 +64,3 @@ spec: cpu: 500m memory: 512Mi # [END gke_kubernetes_manifests_loadgenerator_deployment_loadgenerator] ---- diff --git a/kubernetes-manifests/paymentservice.yaml b/kubernetes-manifests/paymentservice.yaml index 983837babc2..7c966c8e8eb 100644 --- a/kubernetes-manifests/paymentservice.yaml +++ b/kubernetes-manifests/paymentservice.yaml @@ -71,4 +71,3 @@ spec: port: 50051 targetPort: 50051 # [END gke_kubernetes_manifests_paymentservice_service_paymentservice] ---- diff --git a/kubernetes-manifests/productcatalogservice.yaml b/kubernetes-manifests/productcatalogservice.yaml index 96038809848..58766a3ab88 100644 --- a/kubernetes-manifests/productcatalogservice.yaml +++ b/kubernetes-manifests/productcatalogservice.yaml @@ -73,4 +73,3 @@ spec: port: 3550 targetPort: 3550 # [END gke_kubernetes_manifests_productcatalogservice_service_productcatalogservice] ---- diff --git a/kubernetes-manifests/recommendationservice.yaml b/kubernetes-manifests/recommendationservice.yaml index 41bb896abee..12bc382337f 100644 --- a/kubernetes-manifests/recommendationservice.yaml +++ b/kubernetes-manifests/recommendationservice.yaml @@ -75,4 +75,3 @@ spec: port: 8080 targetPort: 8080 # [END gke_kubernetes_manifests_recommendationservice_service_recommendationservice] ---- diff --git a/kubernetes-manifests/redis.yaml b/kubernetes-manifests/redis.yaml index 3018c7c2c07..9f3764f15bf 100644 --- a/kubernetes-manifests/redis.yaml +++ b/kubernetes-manifests/redis.yaml @@ -69,4 +69,3 @@ spec: port: 6379 targetPort: 6379 # [END gke_kubernetes_manifests_redis_service_redis_cart] ---- diff --git a/kubernetes-manifests/shippingservice.yaml b/kubernetes-manifests/shippingservice.yaml index e5a96e964f5..2da917d8352 100644 --- a/kubernetes-manifests/shippingservice.yaml +++ b/kubernetes-manifests/shippingservice.yaml @@ -73,4 +73,3 @@ spec: port: 50051 targetPort: 50051 # [END gke_kubernetes_manifests_shippingservice_service_shippingservice] ---- From 1bab70958ea9b3fdf8a359d94ee08fdd559ff9ac Mon Sep 17 00:00:00 2001 From: ckim328 Date: Thu, 13 Jan 2022 10:15:19 -0500 Subject: [PATCH 10/17] make-release adds region tag to istio and k8 manifest --- hack/make-release-artifacts.sh | 10 ++++++---- istio-manifests/allow-egress-googleapis.yaml | 4 ---- istio-manifests/frontend-gateway.yaml | 4 ---- istio-manifests/frontend.yaml | 4 +--- kubernetes-manifests/adservice.yaml | 4 ---- kubernetes-manifests/cartservice.yaml | 4 ---- kubernetes-manifests/checkoutservice.yaml | 4 ---- kubernetes-manifests/currencyservice.yaml | 4 ---- kubernetes-manifests/emailservice.yaml | 4 ---- kubernetes-manifests/frontend.yaml | 6 ------ kubernetes-manifests/loadgenerator.yaml | 2 -- kubernetes-manifests/paymentservice.yaml | 4 ---- kubernetes-manifests/productcatalogservice.yaml | 4 ---- kubernetes-manifests/recommendationservice.yaml | 4 ---- kubernetes-manifests/redis.yaml | 4 ---- kubernetes-manifests/shippingservice.yaml | 4 ---- 16 files changed, 7 insertions(+), 63 deletions(-) diff --git a/hack/make-release-artifacts.sh b/hack/make-release-artifacts.sh index b1c7c5287a0..b37910e1a82 100755 --- a/hack/make-release-artifacts.sh +++ b/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}" } # "$@" diff --git a/istio-manifests/allow-egress-googleapis.yaml b/istio-manifests/allow-egress-googleapis.yaml index f66b7666423..1f6900e0543 100644 --- a/istio-manifests/allow-egress-googleapis.yaml +++ b/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] diff --git a/istio-manifests/frontend-gateway.yaml b/istio-manifests/frontend-gateway.yaml index 824a238c5f7..8b52e2288e4 100644 --- a/istio-manifests/frontend-gateway.yaml +++ b/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] diff --git a/istio-manifests/frontend.yaml b/istio-manifests/frontend.yaml index 07d238eb0b0..4e14950931d 100644 --- a/istio-manifests/frontend.yaml +++ b/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] \ No newline at end of file + number: 80 \ No newline at end of file diff --git a/kubernetes-manifests/adservice.yaml b/kubernetes-manifests/adservice.yaml index 16fdc15ad56..28233e9b84d 100644 --- a/kubernetes-manifests/adservice.yaml +++ b/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] diff --git a/kubernetes-manifests/cartservice.yaml b/kubernetes-manifests/cartservice.yaml index e4e9e6c2876..eab184b2829 100644 --- a/kubernetes-manifests/cartservice.yaml +++ b/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] diff --git a/kubernetes-manifests/checkoutservice.yaml b/kubernetes-manifests/checkoutservice.yaml index 86874230332..7bb17c5335f 100644 --- a/kubernetes-manifests/checkoutservice.yaml +++ b/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] diff --git a/kubernetes-manifests/currencyservice.yaml b/kubernetes-manifests/currencyservice.yaml index ac7d8dd4c44..79fec6e027a 100644 --- a/kubernetes-manifests/currencyservice.yaml +++ b/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] diff --git a/kubernetes-manifests/emailservice.yaml b/kubernetes-manifests/emailservice.yaml index 9129cd53e09..a95ea454068 100644 --- a/kubernetes-manifests/emailservice.yaml +++ b/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] diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml index b3e7d90b4be..eedd7f56621 100644 --- a/kubernetes-manifests/frontend.yaml +++ b/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] diff --git a/kubernetes-manifests/loadgenerator.yaml b/kubernetes-manifests/loadgenerator.yaml index 9232774ff15..96e4b366084 100644 --- a/kubernetes-manifests/loadgenerator.yaml +++ b/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] diff --git a/kubernetes-manifests/paymentservice.yaml b/kubernetes-manifests/paymentservice.yaml index 7c966c8e8eb..408b10d2647 100644 --- a/kubernetes-manifests/paymentservice.yaml +++ b/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] diff --git a/kubernetes-manifests/productcatalogservice.yaml b/kubernetes-manifests/productcatalogservice.yaml index 58766a3ab88..0c948ee61d1 100644 --- a/kubernetes-manifests/productcatalogservice.yaml +++ b/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] diff --git a/kubernetes-manifests/recommendationservice.yaml b/kubernetes-manifests/recommendationservice.yaml index 12bc382337f..f9f38f513c4 100644 --- a/kubernetes-manifests/recommendationservice.yaml +++ b/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] diff --git a/kubernetes-manifests/redis.yaml b/kubernetes-manifests/redis.yaml index 9f3764f15bf..4b8006ac189 100644 --- a/kubernetes-manifests/redis.yaml +++ b/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] diff --git a/kubernetes-manifests/shippingservice.yaml b/kubernetes-manifests/shippingservice.yaml index 2da917d8352..629504d294c 100644 --- a/kubernetes-manifests/shippingservice.yaml +++ b/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] From 06e8cdffc6e9fa23bc3acac5657d4e40ad30bac7 Mon Sep 17 00:00:00 2001 From: ckim328 Date: Thu, 13 Jan 2022 10:28:09 -0500 Subject: [PATCH 11/17] reverted few changes --- hack/make-docker-images.sh | 3 +-- hack/make-release-artifacts.sh | 9 +++------ hack/make-release.sh | 3 +-- istio-manifests/allow-egress-googleapis.yaml | 3 +-- istio-manifests/frontend-gateway.yaml | 3 +-- istio-manifests/frontend.yaml | 2 +- kubernetes-manifests/loadgenerator.yaml | 1 - kubernetes-manifests/redis.yaml | 3 +-- skaffold.yaml | 3 +-- src/adservice/genproto.sh | 7 +++---- src/checkoutservice/genproto.sh | 4 ++-- src/currencyservice/genproto.sh | 4 ++-- src/emailservice/genproto.sh | 4 ++-- src/frontend/genproto.sh | 4 ++-- src/paymentservice/genproto.sh | 4 ++-- src/productcatalogservice/genproto.sh | 4 ++-- src/recommendationservice/genproto.sh | 3 ++- src/shippingservice/genproto.sh | 2 +- 18 files changed, 28 insertions(+), 38 deletions(-) diff --git a/hack/make-docker-images.sh b/hack/make-docker-images.sh index 33d95e653d5..9cff93701a4 100755 --- a/hack/make-docker-images.sh +++ b/hack/make-docker-images.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2021 Google LLC +# Copyright 2019 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - # Builds and pushes docker image for each demo microservice. set -euo pipefail diff --git a/hack/make-release-artifacts.sh b/hack/make-release-artifacts.sh index b37910e1a82..3629a956251 100755 --- a/hack/make-release-artifacts.sh +++ b/hack/make-release-artifacts.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2021 Google LLC +# Copyright 2019 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - # This script compiles manifest files with the image tags and places them in # /release/... @@ -50,13 +49,13 @@ EOF read_manifests() { local dir dir="$1" - + while IFS= read -d $'\0' -r file; do # strip license headers (pattern "^# ") awk ' /^[^# ]/ { found = 1 } found { print }' "${file}" - + echo "---" done < <(find "${dir}" -name '*.yaml' -type f -print0) } @@ -77,9 +76,7 @@ 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]" } diff --git a/hack/make-release.sh b/hack/make-release.sh index 65ccb43151c..3333e2df485 100755 --- a/hack/make-release.sh +++ b/hack/make-release.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2021 Google LLC +# Copyright 2019 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - # This script creates a new release by: # - 1. building/pushing images # - 2. injecting tags into YAML manifests diff --git a/istio-manifests/allow-egress-googleapis.yaml b/istio-manifests/allow-egress-googleapis.yaml index 1f6900e0543..50410b2794b 100644 --- a/istio-manifests/allow-egress-googleapis.yaml +++ b/istio-manifests/allow-egress-googleapis.yaml @@ -1,5 +1,4 @@ - -# Copyright 2021 Google LLC +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/istio-manifests/frontend-gateway.yaml b/istio-manifests/frontend-gateway.yaml index 8b52e2288e4..b3a1a647373 100644 --- a/istio-manifests/frontend-gateway.yaml +++ b/istio-manifests/frontend-gateway.yaml @@ -1,5 +1,4 @@ - -# Copyright 2021 Google LLC +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/istio-manifests/frontend.yaml b/istio-manifests/frontend.yaml index 4e14950931d..23cd64832c0 100644 --- a/istio-manifests/frontend.yaml +++ b/istio-manifests/frontend.yaml @@ -24,4 +24,4 @@ spec: - destination: host: frontend port: - number: 80 \ No newline at end of file + number: 80 diff --git a/kubernetes-manifests/loadgenerator.yaml b/kubernetes-manifests/loadgenerator.yaml index 96e4b366084..7b53dc0736f 100644 --- a/kubernetes-manifests/loadgenerator.yaml +++ b/kubernetes-manifests/loadgenerator.yaml @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - apiVersion: apps/v1 kind: Deployment metadata: diff --git a/kubernetes-manifests/redis.yaml b/kubernetes-manifests/redis.yaml index 4b8006ac189..b67649b93b4 100644 --- a/kubernetes-manifests/redis.yaml +++ b/kubernetes-manifests/redis.yaml @@ -1,5 +1,4 @@ - -# Copyright 2021 Google LLC +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/skaffold.yaml b/skaffold.yaml index c01301831b8..6f950649635 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -1,4 +1,3 @@ - # Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -105,4 +104,4 @@ build: deploy: kubectl: manifests: - - ./kubernetes-manifests/loadgenerator.yaml \ No newline at end of file + - ./kubernetes-manifests/loadgenerator.yaml diff --git a/src/adservice/genproto.sh b/src/adservice/genproto.sh index f5fed2e9e87..c80b5ea931b 100755 --- a/src/adservice/genproto.sh +++ b/src/adservice/genproto.sh @@ -1,5 +1,6 @@ - -# Copyright 2021 Google LLC +#!/bin/bash -eu +# +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,8 +15,6 @@ # limitations under the License. # [START gke_adservice_genproto] -#!/bin/bash -eu - # protos are needed in adservice folder for compiling during Docker build. mkdir -p proto && \ diff --git a/src/checkoutservice/genproto.sh b/src/checkoutservice/genproto.sh index 145c26e8be6..b8062a2ecde 100755 --- a/src/checkoutservice/genproto.sh +++ b/src/checkoutservice/genproto.sh @@ -1,6 +1,6 @@ #!/bin/bash -eu - -# Copyright 2021 Google LLC +# +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/currencyservice/genproto.sh b/src/currencyservice/genproto.sh index adda87f3052..9d28adaffaf 100755 --- a/src/currencyservice/genproto.sh +++ b/src/currencyservice/genproto.sh @@ -1,6 +1,6 @@ #!/bin/bash -eu - -# Copyright 2021 Google LLC +# +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/emailservice/genproto.sh b/src/emailservice/genproto.sh index 80ea050385c..f35887b7afe 100755 --- a/src/emailservice/genproto.sh +++ b/src/emailservice/genproto.sh @@ -1,6 +1,6 @@ #!/bin/bash -eu - -# Copyright 2021 Google LLC +# +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/frontend/genproto.sh b/src/frontend/genproto.sh index 9c2c1acca34..4e5619a61db 100755 --- a/src/frontend/genproto.sh +++ b/src/frontend/genproto.sh @@ -1,6 +1,6 @@ #!/bin/bash -eu - -# Copyright 2021 Google LLC +# +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/paymentservice/genproto.sh b/src/paymentservice/genproto.sh index 9600050ef4c..a980703ab0e 100755 --- a/src/paymentservice/genproto.sh +++ b/src/paymentservice/genproto.sh @@ -1,6 +1,6 @@ #!/bin/bash -eu - -# Copyright 2021 Google LLC +# +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/productcatalogservice/genproto.sh b/src/productcatalogservice/genproto.sh index 19dbeb79403..4ba0d36caf2 100755 --- a/src/productcatalogservice/genproto.sh +++ b/src/productcatalogservice/genproto.sh @@ -1,6 +1,6 @@ #!/bin/bash -eu - -# Copyright 2021 Google LLC +# +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/recommendationservice/genproto.sh b/src/recommendationservice/genproto.sh index d2458a7d86a..fc9660c6c91 100755 --- a/src/recommendationservice/genproto.sh +++ b/src/recommendationservice/genproto.sh @@ -1,5 +1,6 @@ #!/bin/bash -eu -# Copyright 2021 Google LLC +# +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/shippingservice/genproto.sh b/src/shippingservice/genproto.sh index 2a607fd33c4..d94a80f82c7 100755 --- a/src/shippingservice/genproto.sh +++ b/src/shippingservice/genproto.sh @@ -1,5 +1,5 @@ #!/bin/bash -eu - +# # Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); From b3e610476b7a1caa9cc1fb6603c502ec37794025 Mon Sep 17 00:00:00 2001 From: ckim328 Date: Thu, 27 Jan 2022 10:07:07 -0500 Subject: [PATCH 12/17] Addressed comments, changed gke to container per discussion --- .github/workflows/install-dependencies.sh | 2 +- cloudbuild.yaml | 4 ++-- hack/make-release-artifacts.sh | 6 +++--- src/adservice/genproto.sh | 4 ++-- src/checkoutservice/genproto.sh | 4 ++-- src/currencyservice/genproto.sh | 4 ++-- src/emailservice/genproto.sh | 4 ++-- src/frontend/genproto.sh | 4 ++-- src/paymentservice/genproto.sh | 4 ++-- src/productcatalogservice/genproto.sh | 4 ++-- src/recommendationservice/genproto.sh | 4 ++-- src/shippingservice/genproto.sh | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/install-dependencies.sh b/.github/workflows/install-dependencies.sh index 793556b62c1..2f2af921db1 100644 --- a/.github/workflows/install-dependencies.sh +++ b/.github/workflows/install-dependencies.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2021 Google LLC +# Copyright 2020 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 8832f9b99ed..df5a5c892e8 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_cloudbuild_microservice_demo_cloudbuild] +# [START container_cloudbuild_microservice_demo_cloudbuild] # This configuration file is used to build and deploy the app into a # GKE cluster using Google Cloud Build. @@ -40,4 +40,4 @@ timeout: '3600s' options: machineType: 'N1_HIGHCPU_8' -# [END gke_cloudbuild_microservice_demo_cloudbuild] \ No newline at end of file +# [END container_cloudbuild_microservice_demo_cloudbuild] \ No newline at end of file diff --git a/hack/make-release-artifacts.sh b/hack/make-release-artifacts.sh index 3629a956251..53aabf40387 100755 --- a/hack/make-release-artifacts.sh +++ b/hack/make-release-artifacts.sh @@ -76,9 +76,9 @@ mk_kubernetes_manifests() { print_license_header print_autogenerated_warning - echo '# [START gke_release_kubernetes_manifests_microservices_demo]' + echo '# [START container_release_kubernetes_manifests_microservices_demo]' echo "${out_manifest}" - echo "# [END gke_release_kubernetes_manifests_microservices_demo]" + echo "# [END container_release_kubernetes_manifests_microservices_demo]" } mk_istio_manifests() { @@ -101,5 +101,5 @@ main() { mk_istio_manifests > "${istio_manifests_file}" log "Written ${istio_manifests_file}" } -# "$@" + main diff --git a/src/adservice/genproto.sh b/src/adservice/genproto.sh index c80b5ea931b..bc50d224dde 100755 --- a/src/adservice/genproto.sh +++ b/src/adservice/genproto.sh @@ -14,10 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_adservice_genproto] +# [START container_adservice_genproto] # protos are needed in adservice folder for compiling during Docker build. mkdir -p proto && \ cp ../../pb/demo.proto src/main/proto -# [END gke_adservice_genproto] \ No newline at end of file +# [END container_adservice_genproto] \ No newline at end of file diff --git a/src/checkoutservice/genproto.sh b/src/checkoutservice/genproto.sh index b8062a2ecde..f13b5213d89 100755 --- a/src/checkoutservice/genproto.sh +++ b/src/checkoutservice/genproto.sh @@ -14,11 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_checkoutservice_genproto] +# [START container_checkoutservice_genproto] PATH=$PATH:$GOPATH/bin protodir=../../pb protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto -# [END gke_checkoutservice_genproto] \ No newline at end of file +# [END container_checkoutservice_genproto] \ No newline at end of file diff --git a/src/currencyservice/genproto.sh b/src/currencyservice/genproto.sh index 9d28adaffaf..4793d1456d5 100755 --- a/src/currencyservice/genproto.sh +++ b/src/currencyservice/genproto.sh @@ -14,10 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_currencyservice_genproto] +# [START container_currencyservice_genproto] # protos are loaded dynamically for node, simply copies over the proto. mkdir -p proto cp -r ../../pb/* ./proto -# [END gke_currencyservice_genproto] \ No newline at end of file +# [END container_currencyservice_genproto] \ No newline at end of file diff --git a/src/emailservice/genproto.sh b/src/emailservice/genproto.sh index f35887b7afe..963f3e0f321 100755 --- a/src/emailservice/genproto.sh +++ b/src/emailservice/genproto.sh @@ -14,8 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_emailservice_genproto] +# [START container_emailservice_genproto] python -m grpc_tools.protoc -I../../pb --python_out=. --grpc_python_out=. ../../pb/demo.proto -# [END gke_emailservice_genproto] \ No newline at end of file +# [END container_emailservice_genproto] \ No newline at end of file diff --git a/src/frontend/genproto.sh b/src/frontend/genproto.sh index 4e5619a61db..9e12235168d 100755 --- a/src/frontend/genproto.sh +++ b/src/frontend/genproto.sh @@ -14,11 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_frontend_genproto] +# [START container_frontend_genproto] PATH=$PATH:$GOPATH/bin protodir=../../pb protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto -# [END gke_frontend_genproto] \ No newline at end of file +# [END container_frontend_genproto] \ No newline at end of file diff --git a/src/paymentservice/genproto.sh b/src/paymentservice/genproto.sh index a980703ab0e..6e255aee917 100755 --- a/src/paymentservice/genproto.sh +++ b/src/paymentservice/genproto.sh @@ -14,10 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_paymentservice_genproto] +# [START container_paymentservice_genproto] # protos are loaded dynamically for node, simply copies over the proto. mkdir -p proto cp -r ../../pb/* ./proto -# [END gke_paymentservice_genproto] \ No newline at end of file +# [END container_paymentservice_genproto] \ No newline at end of file diff --git a/src/productcatalogservice/genproto.sh b/src/productcatalogservice/genproto.sh index 4ba0d36caf2..abe0159a653 100755 --- a/src/productcatalogservice/genproto.sh +++ b/src/productcatalogservice/genproto.sh @@ -14,11 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_productcatalogservice_genproto] +# [START container_productcatalogservice_genproto] PATH=$PATH:$GOPATH/bin protodir=../../pb protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto -# [END gke_productcatalogservice_genproto] \ No newline at end of file +# [END container_productcatalogservice_genproto] \ No newline at end of file diff --git a/src/recommendationservice/genproto.sh b/src/recommendationservice/genproto.sh index fc9660c6c91..29ff2562ce6 100755 --- a/src/recommendationservice/genproto.sh +++ b/src/recommendationservice/genproto.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_recommendationservice_genproto] +# [START container_recommendationservice_genproto] # script to compile python protos # @@ -23,4 +23,4 @@ python -m grpc_tools.protoc -I../../pb --python_out=. --grpc_python_out=. ../../pb/demo.proto -# [END gke_recommendationservice_genproto] \ No newline at end of file +# [END container_recommendationservice_genproto] \ No newline at end of file diff --git a/src/shippingservice/genproto.sh b/src/shippingservice/genproto.sh index d94a80f82c7..1944ed0bc51 100755 --- a/src/shippingservice/genproto.sh +++ b/src/shippingservice/genproto.sh @@ -14,11 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_shippingservice_genproto] +# [START container_shippingservice_genproto] PATH=$PATH:$GOPATH/bin protodir=../../pb protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto -# [END gke_shippingservice_genproto] \ No newline at end of file +# [END container_shippingservice_genproto] \ No newline at end of file From b49d1754d60bb64374a469ec43946c08d1429eee Mon Sep 17 00:00:00 2001 From: ckim328 Date: Wed, 2 Feb 2022 09:40:06 -0500 Subject: [PATCH 13/17] Replaced instances of container with gke --- cloudbuild.yaml | 4 ++-- hack/make-release-artifacts.sh | 4 ++-- src/adservice/genproto.sh | 4 ++-- src/checkoutservice/genproto.sh | 4 ++-- src/currencyservice/genproto.sh | 4 ++-- src/emailservice/genproto.sh | 4 ++-- src/frontend/genproto.sh | 4 ++-- src/paymentservice/genproto.sh | 4 ++-- src/productcatalogservice/genproto.sh | 4 ++-- src/recommendationservice/genproto.sh | 4 ++-- src/shippingservice/genproto.sh | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index df5a5c892e8..8832f9b99ed 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START container_cloudbuild_microservice_demo_cloudbuild] +# [START gke_cloudbuild_microservice_demo_cloudbuild] # This configuration file is used to build and deploy the app into a # GKE cluster using Google Cloud Build. @@ -40,4 +40,4 @@ timeout: '3600s' options: machineType: 'N1_HIGHCPU_8' -# [END container_cloudbuild_microservice_demo_cloudbuild] \ No newline at end of file +# [END gke_cloudbuild_microservice_demo_cloudbuild] \ No newline at end of file diff --git a/hack/make-release-artifacts.sh b/hack/make-release-artifacts.sh index 53aabf40387..959815a2d5f 100755 --- a/hack/make-release-artifacts.sh +++ b/hack/make-release-artifacts.sh @@ -76,9 +76,9 @@ mk_kubernetes_manifests() { print_license_header print_autogenerated_warning - echo '# [START container_release_kubernetes_manifests_microservices_demo]' + echo '# [START gke_release_kubernetes_manifests_microservices_demo]' echo "${out_manifest}" - echo "# [END container_release_kubernetes_manifests_microservices_demo]" + echo "# [END gke_release_kubernetes_manifests_microservices_demo]" } mk_istio_manifests() { diff --git a/src/adservice/genproto.sh b/src/adservice/genproto.sh index bc50d224dde..c80b5ea931b 100755 --- a/src/adservice/genproto.sh +++ b/src/adservice/genproto.sh @@ -14,10 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START container_adservice_genproto] +# [START gke_adservice_genproto] # protos are needed in adservice folder for compiling during Docker build. mkdir -p proto && \ cp ../../pb/demo.proto src/main/proto -# [END container_adservice_genproto] \ No newline at end of file +# [END gke_adservice_genproto] \ No newline at end of file diff --git a/src/checkoutservice/genproto.sh b/src/checkoutservice/genproto.sh index f13b5213d89..b8062a2ecde 100755 --- a/src/checkoutservice/genproto.sh +++ b/src/checkoutservice/genproto.sh @@ -14,11 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START container_checkoutservice_genproto] +# [START gke_checkoutservice_genproto] PATH=$PATH:$GOPATH/bin protodir=../../pb protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto -# [END container_checkoutservice_genproto] \ No newline at end of file +# [END gke_checkoutservice_genproto] \ No newline at end of file diff --git a/src/currencyservice/genproto.sh b/src/currencyservice/genproto.sh index 4793d1456d5..9d28adaffaf 100755 --- a/src/currencyservice/genproto.sh +++ b/src/currencyservice/genproto.sh @@ -14,10 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START container_currencyservice_genproto] +# [START gke_currencyservice_genproto] # protos are loaded dynamically for node, simply copies over the proto. mkdir -p proto cp -r ../../pb/* ./proto -# [END container_currencyservice_genproto] \ No newline at end of file +# [END gke_currencyservice_genproto] \ No newline at end of file diff --git a/src/emailservice/genproto.sh b/src/emailservice/genproto.sh index 963f3e0f321..f35887b7afe 100755 --- a/src/emailservice/genproto.sh +++ b/src/emailservice/genproto.sh @@ -14,8 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START container_emailservice_genproto] +# [START gke_emailservice_genproto] python -m grpc_tools.protoc -I../../pb --python_out=. --grpc_python_out=. ../../pb/demo.proto -# [END container_emailservice_genproto] \ No newline at end of file +# [END gke_emailservice_genproto] \ No newline at end of file diff --git a/src/frontend/genproto.sh b/src/frontend/genproto.sh index 9e12235168d..4e5619a61db 100755 --- a/src/frontend/genproto.sh +++ b/src/frontend/genproto.sh @@ -14,11 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START container_frontend_genproto] +# [START gke_frontend_genproto] PATH=$PATH:$GOPATH/bin protodir=../../pb protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto -# [END container_frontend_genproto] \ No newline at end of file +# [END gke_frontend_genproto] \ No newline at end of file diff --git a/src/paymentservice/genproto.sh b/src/paymentservice/genproto.sh index 6e255aee917..a980703ab0e 100755 --- a/src/paymentservice/genproto.sh +++ b/src/paymentservice/genproto.sh @@ -14,10 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START container_paymentservice_genproto] +# [START gke_paymentservice_genproto] # protos are loaded dynamically for node, simply copies over the proto. mkdir -p proto cp -r ../../pb/* ./proto -# [END container_paymentservice_genproto] \ No newline at end of file +# [END gke_paymentservice_genproto] \ No newline at end of file diff --git a/src/productcatalogservice/genproto.sh b/src/productcatalogservice/genproto.sh index abe0159a653..4ba0d36caf2 100755 --- a/src/productcatalogservice/genproto.sh +++ b/src/productcatalogservice/genproto.sh @@ -14,11 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START container_productcatalogservice_genproto] +# [START gke_productcatalogservice_genproto] PATH=$PATH:$GOPATH/bin protodir=../../pb protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto -# [END container_productcatalogservice_genproto] \ No newline at end of file +# [END gke_productcatalogservice_genproto] \ No newline at end of file diff --git a/src/recommendationservice/genproto.sh b/src/recommendationservice/genproto.sh index 29ff2562ce6..fc9660c6c91 100755 --- a/src/recommendationservice/genproto.sh +++ b/src/recommendationservice/genproto.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START container_recommendationservice_genproto] +# [START gke_recommendationservice_genproto] # script to compile python protos # @@ -23,4 +23,4 @@ python -m grpc_tools.protoc -I../../pb --python_out=. --grpc_python_out=. ../../pb/demo.proto -# [END container_recommendationservice_genproto] \ No newline at end of file +# [END gke_recommendationservice_genproto] \ No newline at end of file diff --git a/src/shippingservice/genproto.sh b/src/shippingservice/genproto.sh index 1944ed0bc51..d94a80f82c7 100755 --- a/src/shippingservice/genproto.sh +++ b/src/shippingservice/genproto.sh @@ -14,11 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START container_shippingservice_genproto] +# [START gke_shippingservice_genproto] PATH=$PATH:$GOPATH/bin protodir=../../pb protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto -# [END container_shippingservice_genproto] \ No newline at end of file +# [END gke_shippingservice_genproto] \ No newline at end of file From 318a04bd5f931787907fdba99af76fb2d98a0185 Mon Sep 17 00:00:00 2001 From: ckim328 Date: Thu, 3 Feb 2022 09:22:22 -0500 Subject: [PATCH 14/17] Discarded uncessecary white space changes --- .github/workflows/install-dependencies.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/install-dependencies.sh b/.github/workflows/install-dependencies.sh index 2f2af921db1..60aa83545bc 100644 --- a/.github/workflows/install-dependencies.sh +++ b/.github/workflows/install-dependencies.sh @@ -1,5 +1,4 @@ #!/bin/bash - # Copyright 2020 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - set -euo pipefail # install wget From f9714deeb190ce4c8ff34c11fa7b120578b735b4 Mon Sep 17 00:00:00 2001 From: ckim328 Date: Thu, 3 Feb 2022 09:23:20 -0500 Subject: [PATCH 15/17] Remove changes in github workflow --- .github/workflows/ci-pr.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-pr.yaml b/.github/workflows/ci-pr.yaml index 7b0b372cd1f..8947831aba6 100644 --- a/.github/workflows/ci-pr.yaml +++ b/.github/workflows/ci-pr.yaml @@ -61,6 +61,7 @@ jobs: run: | NAMESPACE="pr${PR_NUMBER}" echo "::set-env name=NAMESPACE::$NAMESPACE" + gcloud container clusters get-credentials $PR_CLUSTER --zone $ZONE --project $PROJECT_ID cat < Date: Thu, 3 Feb 2022 09:23:57 -0500 Subject: [PATCH 16/17] Remove changes in github workflow --- .github/workflows/ci-pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-pr.yaml b/.github/workflows/ci-pr.yaml index 8947831aba6..ff4e190849d 100644 --- a/.github/workflows/ci-pr.yaml +++ b/.github/workflows/ci-pr.yaml @@ -61,7 +61,7 @@ jobs: run: | NAMESPACE="pr${PR_NUMBER}" echo "::set-env name=NAMESPACE::$NAMESPACE" - + gcloud container clusters get-credentials $PR_CLUSTER --zone $ZONE --project $PROJECT_ID cat < Date: Thu, 3 Feb 2022 10:31:05 -0500 Subject: [PATCH 17/17] Captured cloudbuild yaml tag --- cloudbuild.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 8832f9b99ed..7299e10150c 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START gke_cloudbuild_microservice_demo_cloudbuild] +# [START cloudbuild_microservice_demo_cloudbuild] # This configuration file is used to build and deploy the app into a # GKE cluster using Google Cloud Build. @@ -40,4 +40,4 @@ timeout: '3600s' options: machineType: 'N1_HIGHCPU_8' -# [END gke_cloudbuild_microservice_demo_cloudbuild] \ No newline at end of file +# [END cloudbuild_microservice_demo_cloudbuild] \ No newline at end of file