Skip to content

Conversation

cpaika
Copy link

@cpaika cpaika commented Apr 17, 2019

Description:
Following @moderation comment from this pr to upgrade the docker-compose version for every example.
Standardizing on .yaml extension per their comment
Changing the build script name in grpc-bridge-example to match the documentation

Risk Level: Low
Testing: Manual - brought up every example after upgrading the docker-compose version
Docs Changes: Yes - just matched the new file extensions
Release Notes: No

cpaika added 2 commits April 16, 2019 22:25
Signed-off-by: Chris Paika <paika.christopher@gmail.com>
Signed-off-by: Chris Paika <paika.christopher@gmail.com>
@cpaika cpaika force-pushed the upgrade-compose-version branch from 9a0d186 to 9261c2a Compare April 17, 2019 02:25
@htuch htuch requested a review from moderation April 17, 2019 03:26
Copy link
Contributor

@moderation moderation left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert where you rename examples/grpc-bridge/script/build.sh to examples/grpc-bridge/script/build. This was explicitly changed to prevent a Bazel conflict in #6216. I suggest leaving this file with the .sh extension and then renaming the other two files in the directory to include the .sh extension. You'll need to update 'docs/root/start/sandboxes/grpc_bridge.rstandexamples/grpc-bridge/Dockerfile-grpc` with the new filenames.

@@ -1,4 +1,4 @@
version: '2'
version: '3.7'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit. I didn't mention this on my comment on the prior issue but for consistency with quoting in YAML files can you also change the quoting here from single quote to double quote. ie "3.7". Same for the other occurrences.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha, will update thanks 👍

@cpaika
Copy link
Author

cpaika commented Apr 17, 2019

@moderation Makes sense - good memory haha. Will update the docs and revert the name change. Note to self always check git blame before changing a line...

Updated

Signed-off-by: Chris Paika <paika.christopher@gmail.com>
@cpaika cpaika force-pushed the upgrade-compose-version branch from 15bce93 to 9c6b88a Compare April 17, 2019 11:23
@@ -24,9 +24,9 @@ To build the Go gRPC service run::
$ pwd
envoy/examples/grpc-bridge
$ script/bootstrap
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest your rename bootstrap to bootstrap.sh here for consistency and updating and update the doco. Similarly rename grpc_start to grpc_start.sh and update the Dockerfile. This way all shell scripts in the directly will have .sh extensions.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, will do 👍

Signed-off-by: Chris Paika <paika.christopher@gmail.com>
@cpaika
Copy link
Author

cpaika commented Apr 17, 2019

Updated to follow comments @moderation

@cpaika
Copy link
Author

cpaika commented Apr 18, 2019

Could I also get a retest?
The test that failed was //test/common/event:dispatcher_impl_test which seems unrelated

@moderation
Copy link
Contributor

@cpaika You can kick off your own retest - see https://github.com/envoyproxy/envoy/blob/master/source/docs/repokitteh.md#circleci-retest

LGTM otherwise. Thanks

Copy link
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@mattklein123 mattklein123 merged commit 4050392 into envoyproxy:master Apr 18, 2019
@cpaika
Copy link
Author

cpaika commented Apr 19, 2019

@moderation Thanks for the reviews on this! I'm looking forward to getting involved so if you know of anything that is a good beginner issue and need someone to work on please let me know. Otherwise I'll start looking through the existing issues for something that hasn't been grabbed.

mpuncel added a commit to mpuncel/envoy that referenced this pull request Apr 19, 2019
* master: (26 commits)
  docs: update docs to recommend /retest repokitteh command (envoyproxy#6655)
  http timeout integration test: wait for 15s for upstream reset (envoyproxy#6646)
  access log: add response code details to the access log formatter (envoyproxy#6626)
  build: add ppc build badge to README (envoyproxy#6629)
  Revert dispatcher stats (envoyproxy#6649)
  Batch implementation with timer (envoyproxy#6452)
  fault filter: reset token bucket on data start (envoyproxy#6627)
  event: update libevent dependency to fix race condition (envoyproxy#6637)
  examples: standardize docker-compose version and yaml extension (envoyproxy#6613)
  quiche: Implement SpdyUnsafeArena using SpdySimpleArena (envoyproxy#6612)
  router: support customizable retry back-off intervals (envoyproxy#6568)
  api: create OpenRCA service proto file (envoyproxy#6497)
  ext_authz: option for clearing route cache of authorized requests (envoyproxy#6503)
  build: update jinja to 2.10.1. (envoyproxy#6623)
  tools: check spelling in pre-push hook (envoyproxy#6631)
  security: blameless postmortem template. (envoyproxy#6553)
  Implementing Endpoint lease for ClusterLoadAssigment (envoyproxy#6477)
  add HTTP integration tests exercising timeouts (envoyproxy#6621)
  event: fix DispatcherImplTest::InitializeStats flake (envoyproxy#6619)
  Add tag extractor for RDS route config name (envoyproxy#6618)
  ...

Signed-off-by: Michael Puncel <mpuncel@squareup.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants