Skip to content

Commit

Permalink
fixup: Code review
Browse files Browse the repository at this point in the history
  • Loading branch information
eugeneo committed Aug 1, 2024
1 parent f656375 commit 540bfa4
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 7 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,3 @@ venv/
venv-*/
out/
protos/**/*_pb2*

### Intermitten build result
fallback-control-plane
2 changes: 1 addition & 1 deletion docker/go-control-plane/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ RUN protoc -I=. --go_out=. protos/grpc/testing/xdsconfig/*.proto --go-grpc_out=.
COPY docker/go-control-plane .
RUN go build -v -o /usr/local/bin/fallback-control-plane .

ENTRYPOINT ["fallback-control-plane"]
ENTRYPOINT ["fallback-control-plane"]
16 changes: 16 additions & 0 deletions docker/go-control-plane/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# A simple xDS control panel implementation for tests

## Overview

An xDS control panel implementation that provides special gRPC API for tests
that require a fine-grained control over the control plane behavior.

## Building

Docker requires that all the files are under the build root and this project
depends on `protos/grpc/testing/xdsconfig`, the build needs to be ran from
the root of `grpc/psm-interop` checkout.

```
docker build . -f docker/go-control-plane/Dockerfile
```
4 changes: 2 additions & 2 deletions docker/go-control-plane/fallback-control-plane.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import (
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/types/known/anypb"

"github.com/eugeneo/fallback-control-plane/controlplane"
xdsconfigpb "github.com/eugeneo/fallback-control-plane/grpc/interop/grpc_testing/xdsconfig"
"github.com/grpc/psm-interop/docker/go-control-plane/controlplane"
xdsconfigpb "github.com/grpc/psm-interop/docker/go-control-plane/grpc/interop/grpc_testing/xdsconfig"

v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
Expand Down
2 changes: 1 addition & 1 deletion docker/go-control-plane/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/eugeneo/fallback-control-plane
module github.com/grpc/psm-interop/docker/go-control-plane

go 1.22

Expand Down

0 comments on commit 540bfa4

Please sign in to comment.