cleanup: add region tags to yaml and sh #684

xtineskim · 2022-01-10T21:36:23Z

Background

Adding region tags to our yaml and shell files. Allows for our team to leverage internal tools!

Fixes

n/a

Change Summary

Added region tags. Snippet-bot will add a comment below of the tags added (and where).
Tags are gke_... and servicemesh_...

Additional Notes

Since there were no existing region tags in this repo, we don't have to worry about any internal references to tags (ie no existing code widgets!)
Also please note that this update will take a couple hours or more to reflect internally.

Testing Procedure

n/a

Related PRs or Issues

n/a

snippet-bot · 2022-01-10T21:36:33Z

Here is the summary of changes.

You are about to add 12 region tags.

cloudbuild.yaml:15, tag cloudbuild_microservice_demo_cloudbuild
hack/make-release-artifacts.sh:79, tag gke_release_kubernetes_manifests_microservices_demo
hack/make-release-artifacts.sh:87, tag servicemesh_release_istio_manifests_microservices_demo
src/adservice/genproto.sh:17, tag gke_adservice_genproto
src/checkoutservice/genproto.sh:17, tag gke_checkoutservice_genproto
src/currencyservice/genproto.sh:17, tag gke_currencyservice_genproto
src/emailservice/genproto.sh:17, tag gke_emailservice_genproto
src/frontend/genproto.sh:17, tag gke_frontend_genproto
src/paymentservice/genproto.sh:17, tag gke_paymentservice_genproto
src/productcatalogservice/genproto.sh:17, tag gke_productcatalogservice_genproto
src/recommendationservice/genproto.sh:17, tag gke_recommendationservice_genproto
src/shippingservice/genproto.sh:17, tag gke_shippingservice_genproto

This comment is generated by snippet-bot.
If you find problems with this result, please file an issue at:
https://github.com/googleapis/repo-automation-bots/issues.
To update this comment, add snippet-bot:force-run label or use the checkbox below:

Refresh this comment

xtineskim · 2022-01-10T21:37:40Z

I had tags generated for the hack and workflow folders, but I opted to remove them, let me know if you prefer to keep them?

xtineskim · 2022-01-10T21:39:43Z

~~Closing as there are asm and gke products here~~ 😅
Captured servicemesh_ and gke_

github-actions · 2022-01-10T22:34:24Z

🚲 PR staged at http://34.71.99.106

NimJay

Thanks for creating this pull-request, @ckim328! :)
And great work.

I left a few comments.
One question is about the need for this change.
Let's address that before the other comments. :)

.github/workflows/install-dependencies.sh

istio-manifests/frontend-gateway.yaml

NimJay · 2022-01-11T14:16:30Z

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]


Issue:

I noticed that we're adding region tags to file YAML files in kubernetes-manifests/. All these YAML files get concatenated into one file, release/kubernetes-manifests.yaml, when we create a new release.

So, for instance, this
# [START gke_kubernetes_manifests_adservice_deployment_adservice]
region tag would exist here and in the release/kubernetes-manifests.yaml file.

Will this create any problems (having a region tag show up in two places)?

ooooh good point.
this will cause a problem, since we shouldn't have duplicate region tags (with the same language, in this case yaml)
I'll try to see a workaround, thanks for bringing this up!!
I think the make-release-artifacts.sh can be edited to remove the tags (I don't think we need to have them in the release manifests)

I agree. Adding code to remove lines look like # [START ... ] and # [END ... in make-release-artifacts.sh might be the best solution.

Addressed this! I added 2 lines for the kubernetes and istio manifest section.
For example here

sed -i '' '/[^# \[]]/d' "${k8s_manifests_file}"

finds lines that start with # [ and deletes it

Awesome! Thanks so much for adding this in. :)

after discussion with Megan, I edited make-release-artifacts.sh to add region tags around the release/kubernetes-manifests.yaml and the release/istio-manifests.yaml

src/paymentservice/genproto.sh

github-actions · 2022-01-11T14:51:15Z

🚲 PR staged at http://34.71.99.106

github-actions · 2022-01-11T18:30:23Z

🚲 PR staged at http://34.71.99.106

.github/snippet-bot.yml

github-actions · 2022-01-13T15:17:25Z

🚲 PR staged at http://34.71.99.106

github-actions · 2022-01-13T15:32:29Z

🚲 PR staged at http://34.71.99.106

hack/make-release-artifacts.sh

xtineskim · 2022-01-26T21:42:35Z

~~i'll change these to container_ for consistency after a discussion with Megan, to stay consistent~~
will convert to draft. Pending on discussions of using container_ vs gke_

github-actions · 2022-01-27T15:12:10Z

🚲 PR staged at http://34.71.99.106

github-actions · 2022-02-02T14:42:17Z

🚲 PR staged at http://34.71.99.106

github-actions · 2022-02-02T14:45:27Z

🚲 PR staged at http://34.71.99.106

github-actions · 2022-02-03T14:20:05Z

🚲 PR staged at http://34.71.99.106

github-actions · 2022-02-03T14:24:15Z

🚲 PR staged at http://34.71.99.106

github-actions · 2022-02-03T14:25:28Z

🚲 PR staged at http://34.71.99.106

github-actions · 2022-02-03T14:27:02Z

🚲 PR staged at http://34.71.99.106

xtineskim · 2022-02-03T14:42:01Z

This PR is ready to review + merge!

Since there were no region tags to begin with in microservice-demo, we don't have to be worried about region tags being changed for devsite/sample browser.
The drift services will just pick up these region tag changes, and (hopefully) by tomorrow these tags will show up in devrel services

github-actions · 2022-02-03T15:32:59Z

🚲 PR staged at http://34.71.99.106

* 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 * Bump node-fetch from 2.6.6 to 2.6.7 in /src/paymentservice (GoogleCloudPlatform#707) Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](node-fetch/node-fetch@v2.6.6...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump node-fetch from 2.6.6 to 2.6.7 in /src/currencyservice (GoogleCloudPlatform#708) Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](node-fetch/node-fetch@v2.6.6...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Shabir Mohamed Abdul Samadh <[email protected]> Co-authored-by: Christine Kim <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Shabir Mohamed Abdul Samadh <[email protected]>

ckim328 added 2 commits January 10, 2022 16:29

Added region tags to yaml and sh

a3fa2a7

Added manual tags for the cloudbuild

7770cf9

xtineskim requested review from askmeegs and a team January 10, 2022 21:36

xtineskim closed this Jan 10, 2022

Edited the asm and gke files

5e7efb2

xtineskim reopened this Jan 10, 2022

ckim328 added 2 commits January 10, 2022 16:56

Skaffold region tags fix

4d05d81

Fix skaffold artifacts

2a17e74

askmeegs requested review from NimJay and removed request for askmeegs January 10, 2022 22:08

ckim328 added 2 commits January 10, 2022 17:15

Spacing in skaffold yaml

d26fd6d

Fixed for real

e7bd41a

xtineskim requested a review from askmeegs January 11, 2022 14:00

NimJay requested changes Jan 11, 2022

View reviewed changes

shebangs back at the top of the sh files

5d7a521

Edit to the make-release-artifacts to remove tags

49b5b9c

NimJay reviewed Jan 11, 2022

View reviewed changes

.github/snippet-bot.yml Show resolved Hide resolved

make-release adds region tag to istio and k8 manifest

1bab709

ckim328 added 2 commits January 13, 2022 10:23

Merge branch 'master' into yaml_tags_comments

2d5a1df

reverted few changes

06e8cdf

askmeegs reviewed Jan 13, 2022

View reviewed changes

hack/make-release-artifacts.sh Show resolved Hide resolved

ckim328 added 2 commits January 27, 2022 10:03

Merge branch 'main' into yaml_tags_comments

165438e

Addressed comments, changed gke to container per discussion

b3e6104

xtineskim requested a review from askmeegs January 27, 2022 15:09

xtineskim marked this pull request as draft January 31, 2022 15:48

ckim328 added 2 commits February 2, 2022 09:40

Replaced instances of container with gke

b49d175

Merge branch 'main' into yaml_tags_comments

1a23ae1

Merge branch 'main' into yaml_tags_comments

5a8a8ed

ckim328 added 3 commits February 3, 2022 09:22

Discarded uncessecary white space changes

318a04b

Remove changes in github workflow

f9714de

Remove changes in github workflow

07bfebf

xtineskim marked this pull request as ready for review February 3, 2022 14:25

xtineskim changed the title ~~Added region tags to yaml and sh~~ cleanup: add region tags to yaml and sh Feb 3, 2022

askmeegs approved these changes Feb 3, 2022

View reviewed changes

Captured cloudbuild yaml tag

02ac49d

xtineskim merged commit 185f229 into main Feb 3, 2022

xtineskim deleted the yaml_tags_comments branch February 3, 2022 15:36

xtineskim mentioned this pull request Feb 4, 2022

cleanup: add drift region tags GoogleCloudPlatform/bank-of-anthos#611

Merged

This was referenced Feb 18, 2022

cleanup: adding DRIFT region tags to yaml and sh files GoogleCloudPlatform/anthos-samples#173

Merged

cleanup: adding DRIFT region tags to yaml and sh files GoogleCloudPlatform/anthos-config-management-samples#35

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cleanup: add region tags to yaml and sh #684

cleanup: add region tags to yaml and sh #684

xtineskim commented Jan 10, 2022 •

edited

Loading

snippet-bot bot commented Jan 10, 2022 •

edited

Loading

xtineskim commented Jan 10, 2022

xtineskim commented Jan 10, 2022 •

edited

Loading

github-actions bot commented Jan 10, 2022

NimJay left a comment •

edited

Loading

NimJay Jan 11, 2022

xtineskim Jan 11, 2022 •

edited

Loading

NimJay Jan 11, 2022

xtineskim Jan 11, 2022

NimJay Jan 11, 2022

xtineskim Jan 13, 2022

github-actions bot commented Jan 11, 2022

github-actions bot commented Jan 11, 2022

github-actions bot commented Jan 13, 2022

github-actions bot commented Jan 13, 2022

xtineskim commented Jan 26, 2022 •

edited

Loading

github-actions bot commented Jan 27, 2022

github-actions bot commented Feb 2, 2022

github-actions bot commented Feb 2, 2022

github-actions bot commented Feb 3, 2022

github-actions bot commented Feb 3, 2022

github-actions bot commented Feb 3, 2022

github-actions bot commented Feb 3, 2022

xtineskim commented Feb 3, 2022

github-actions bot commented Feb 3, 2022

cleanup: add region tags to yaml and sh #684

cleanup: add region tags to yaml and sh #684

Conversation

xtineskim commented Jan 10, 2022 • edited Loading

Background

Fixes

Change Summary

Additional Notes

Testing Procedure

Related PRs or Issues

snippet-bot bot commented Jan 10, 2022 • edited Loading

xtineskim commented Jan 10, 2022

xtineskim commented Jan 10, 2022 • edited Loading

github-actions bot commented Jan 10, 2022

NimJay left a comment • edited Loading

Choose a reason for hiding this comment

NimJay Jan 11, 2022

Choose a reason for hiding this comment

xtineskim Jan 11, 2022 • edited Loading

Choose a reason for hiding this comment

NimJay Jan 11, 2022

Choose a reason for hiding this comment

xtineskim Jan 11, 2022

Choose a reason for hiding this comment

NimJay Jan 11, 2022

Choose a reason for hiding this comment

xtineskim Jan 13, 2022

Choose a reason for hiding this comment

github-actions bot commented Jan 11, 2022

github-actions bot commented Jan 11, 2022

github-actions bot commented Jan 13, 2022

github-actions bot commented Jan 13, 2022

xtineskim commented Jan 26, 2022 • edited Loading

github-actions bot commented Jan 27, 2022

github-actions bot commented Feb 2, 2022

github-actions bot commented Feb 2, 2022

github-actions bot commented Feb 3, 2022

github-actions bot commented Feb 3, 2022

github-actions bot commented Feb 3, 2022

github-actions bot commented Feb 3, 2022

xtineskim commented Feb 3, 2022

github-actions bot commented Feb 3, 2022

xtineskim commented Jan 10, 2022 •

edited

Loading

snippet-bot bot commented Jan 10, 2022 •

edited

Loading

xtineskim commented Jan 10, 2022 •

edited

Loading

NimJay left a comment •

edited

Loading

xtineskim Jan 11, 2022 •

edited

Loading

xtineskim commented Jan 26, 2022 •

edited

Loading