Merge branch 'main' into handle_bad_requests

open-policy-agent · Aug 6, 2024 · b476322 · b476322
2 parents c429525 + 584c64b
commit b476322
Show file tree

Hide file tree

Showing 13 changed files with 4,898 additions and 21 deletions.
diff --git a/build/install-istio-with-kind.sh b/build/install-istio-with-kind.sh
@@ -6,8 +6,8 @@ set -x
 
 GOARCH=$(go env GOARCH)
 GOOS=$(go env GOOS)
-KIND_VERSION=0.11.1
-ISTIO_VERSION=1.19.4
+KIND_VERSION=0.23.0
+ISTIO_VERSION=1.22.3
 
 # Download and install kind
 curl -L https://github.com/kubernetes-sigs/kind/releases/download/v${KIND_VERSION}/kind-${GOOS}-${GOARCH} --output kind && chmod +x kind && sudo mv kind /usr/local/bin/

diff --git a/examples/grpc/Makefile b/examples/grpc/Makefile
@@ -14,12 +14,12 @@ testsrv.pb: testsrv/test.proto
 
 .PHONY: test-setup
 test-setup:
-	docker-compose up -d
+	docker compose up -d
 
 .PHONY: test-teardown
 test-teardown:
-	docker-compose logs
-	docker-compose down
+	docker compose logs
+	docker compose down
 
 .PHONY: test
 test:

diff --git a/examples/grpc/README.md b/examples/grpc/README.md
@@ -20,7 +20,7 @@ The docker-compose.yaml file defines three services:
          pack_as_bytes: true
    ```
 
-After spinning them up with `docker-compose up`, they can be exercised
+After spinning them up with `docker compose up`, they can be exercised
 using a gRPC client.
 
 This is an example invocation using `grpcurl`:

diff --git a/examples/grpc/docker-compose.yaml b/examples/grpc/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   envoy:
-    image: envoyproxy/envoy:v1.26-latest
+    image: envoyproxy/envoy:v1.31-latest
     ports:
       - "9901:9901"
       - "51051:51051"

diff --git a/examples/istio/quick_start.yaml b/examples/istio/quick_start.yaml
@@ -6,7 +6,7 @@
 #   - name: opa-ext-authz-grpc
 #     envoyExtAuthzGrpc:
 #       service: opa-ext-authz-grpc.local
-#       port: "9191"
+#       port: 9191
 #   # END
 #   defaultConfig:
 #     discoveryAddress: istiod.istio-system.svc:15012

diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ toolchain go1.21.0
 require (
 	github.com/envoyproxy/go-control-plane v0.12.0
 	github.com/golang/protobuf v1.5.4
-	github.com/open-policy-agent/opa v0.67.0
+	github.com/open-policy-agent/opa v0.67.1
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.19.1
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0

diff --git a/go.sum b/go.sum
@@ -170,8 +170,8 @@ github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vyg
 github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
-github.com/open-policy-agent/opa v0.67.0 h1:FOdsO9yNhfmrh+72oVK7ImWmzruG+VSpfbr5IBqEWVs=
-github.com/open-policy-agent/opa v0.67.0/go.mod h1:aqKlHc8E2VAAylYE9x09zJYr/fYzGX+JKne89UGqFzk=
+github.com/open-policy-agent/opa v0.67.1 h1:rzy26J6g1X+CKknAcx0Vfbt41KqjuSzx4E0A8DAZf3E=
+github.com/open-policy-agent/opa v0.67.1/go.mod h1:aqKlHc8E2VAAylYE9x09zJYr/fYzGX+JKne89UGqFzk=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=