Skip to content

Commit 185f229

Browse files
authored
cleanup: add region tags to yaml and sh (GoogleCloudPlatform#684)
* Added region tags to yaml and sh, edited the asm and gke files * Fix skaffold artifacts * make-release adds region tag to istio and k8 manifest * Addressed comments, changed gke to container per discussion * Replaced instances of container with gke, discarded uncessecary white space changes * Remove changes in github workflow, captured cloudbuild yaml tag
1 parent 050a590 commit 185f229

File tree

13 files changed

+47
-3
lines changed

13 files changed

+47
-3
lines changed

.github/snippet-bot.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Copyright 2022 Google LLC
1+
2+
# Copyright 2021 Google LLC
23
#
34
# Licensed under the Apache License, Version 2.0 (the "License");
45
# you may not use this file except in compliance with the License.
@@ -10,4 +11,4 @@
1011
# distributed under the License is distributed on an "AS IS" BASIS,
1112
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1213
# See the License for the specific language governing permissions and
13-
# limitations under the License.
14+
# limitations under the License.

.github/workflows/ci-pr.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,4 +141,4 @@ jobs:
141141
-H "Content-Type: application/json" \
142142
-H "Authorization: token $GITHUB_TOKEN" \
143143
--data '{ "body": "🚲 PR staged at '"http://${EXTERNAL_IP}"'"}'
144-
sleep 60
144+
sleep 60

cloudbuild.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
# [START cloudbuild_microservice_demo_cloudbuild]
16+
1517
# This configuration file is used to build and deploy the app into a
1618
# GKE cluster using Google Cloud Build.
1719
#
@@ -37,3 +39,5 @@ steps:
3739
timeout: '3600s'
3840
options:
3941
machineType: 'N1_HIGHCPU_8'
42+
43+
# [END cloudbuild_microservice_demo_cloudbuild]

hack/make-release-artifacts.sh

+4
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,17 @@ mk_kubernetes_manifests() {
7676

7777
print_license_header
7878
print_autogenerated_warning
79+
echo '# [START gke_release_kubernetes_manifests_microservices_demo]'
7980
echo "${out_manifest}"
81+
echo "# [END gke_release_kubernetes_manifests_microservices_demo]"
8082
}
8183

8284
mk_istio_manifests() {
8385
print_license_header
8486
print_autogenerated_warning
87+
echo '# [START servicemesh_release_istio_manifests_microservices_demo]'
8588
read_manifests "${SCRIPTDIR}/../istio-manifests"
89+
echo '# [END servicemesh_release_istio_manifests_microservices_demo]'
8690
}
8791

8892
main() {

src/adservice/genproto.sh

+3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17+
# [START gke_adservice_genproto]
1718
# protos are needed in adservice folder for compiling during Docker build.
1819

1920
mkdir -p proto && \
2021
cp ../../pb/demo.proto src/main/proto
22+
23+
# [END gke_adservice_genproto]

src/checkoutservice/genproto.sh

+4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17+
# [START gke_checkoutservice_genproto]
18+
1719
PATH=$PATH:$GOPATH/bin
1820
protodir=../../pb
1921

2022
protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto
23+
24+
# [END gke_checkoutservice_genproto]

src/currencyservice/genproto.sh

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17+
# [START gke_currencyservice_genproto]
18+
1719
# protos are loaded dynamically for node, simply copies over the proto.
1820
mkdir -p proto
1921
cp -r ../../pb/* ./proto
22+
23+
# [END gke_currencyservice_genproto]

src/emailservice/genproto.sh

+4
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,8 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17+
# [START gke_emailservice_genproto]
18+
1719
python -m grpc_tools.protoc -I../../pb --python_out=. --grpc_python_out=. ../../pb/demo.proto
20+
21+
# [END gke_emailservice_genproto]

src/frontend/genproto.sh

+4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17+
# [START gke_frontend_genproto]
18+
1719
PATH=$PATH:$GOPATH/bin
1820
protodir=../../pb
1921

2022
protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto
23+
24+
# [END gke_frontend_genproto]

src/paymentservice/genproto.sh

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17+
# [START gke_paymentservice_genproto]
18+
1719
# protos are loaded dynamically for node, simply copies over the proto.
1820
mkdir -p proto
1921
cp -r ../../pb/* ./proto
22+
23+
# [END gke_paymentservice_genproto]

src/productcatalogservice/genproto.sh

+4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17+
# [START gke_productcatalogservice_genproto]
18+
1719
PATH=$PATH:$GOPATH/bin
1820
protodir=../../pb
1921

2022
protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto
23+
24+
# [END gke_productcatalogservice_genproto]

src/recommendationservice/genproto.sh

+4
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17+
# [START gke_recommendationservice_genproto]
18+
1719
# script to compile python protos
1820
#
1921
# requires gRPC tools:
2022
# pip install -r requirements.txt
2123

2224
python -m grpc_tools.protoc -I../../pb --python_out=. --grpc_python_out=. ../../pb/demo.proto
25+
26+
# [END gke_recommendationservice_genproto]

src/shippingservice/genproto.sh

+4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17+
# [START gke_shippingservice_genproto]
18+
1719
PATH=$PATH:$GOPATH/bin
1820
protodir=../../pb
1921

2022
protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto
23+
24+
# [END gke_shippingservice_genproto]

0 commit comments

Comments
 (0)