Merge branch 'master' into dependabot/go_modules/k8s-bafd687bc4

open-policy-agent · May 16, 2024 · e8f5545 · e8f5545
2 parents c6243c2 + a1a3813
commit e8f5545
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 20 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@ ARG BUILDPLATFORM="linux/amd64"
 ARG BUILDERIMAGE="golang:1.22-bookworm"
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-ARG BASEIMAGE="gcr.io/distroless/static:nonroot"
+ARG BASEIMAGE="gcr.io/distroless/static-debian12:nonroot"
 
 FROM --platform=$BUILDPLATFORM $BUILDERIMAGE as builder
 

diff --git a/gator.Dockerfile b/gator.Dockerfile
@@ -2,7 +2,7 @@ ARG BUILDPLATFORM="linux/amd64"
 ARG BUILDERIMAGE="golang:1.22-bookworm"
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-ARG BASEIMAGE="gcr.io/distroless/static:nonroot"
+ARG BASEIMAGE="gcr.io/distroless/static-debian12:nonroot"
 
 FROM --platform=$BUILDPLATFORM $BUILDERIMAGE as builder
 

diff --git a/go.mod b/go.mod
@@ -34,7 +34,7 @@ require (
 	golang.org/x/oauth2 v0.17.0
 	golang.org/x/sync v0.6.0
 	golang.org/x/time v0.5.0
-	google.golang.org/grpc v1.62.1
+	google.golang.org/grpc v1.62.2
 	google.golang.org/protobuf v1.33.0
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1

diff --git a/go.sum b/go.sum
@@ -524,8 +524,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
-google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
+google.golang.org/grpc v1.62.2 h1:iEIj1U5qjyBjzkM5nk3Fq+S1IbjbXSyqeULZ1Nfo4AA=
+google.golang.org/grpc v1.62.2/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

diff --git a/test/externaldata/dummy-provider/Dockerfile b/test/externaldata/dummy-provider/Dockerfile
@@ -1,6 +1,6 @@
 ARG BUILDPLATFORM="linux/amd64"
 ARG BUILDERIMAGE="golang:1.22-bookworm"
-ARG BASEIMAGE="gcr.io/distroless/static:nonroot"
+ARG BASEIMAGE="gcr.io/distroless/static-debian12:nonroot"
 
 FROM --platform=$BUILDPLATFORM $BUILDERIMAGE as builder
 

diff --git a/test/pubsub/fake-subscriber/Dockerfile b/test/pubsub/fake-subscriber/Dockerfile
@@ -1,6 +1,6 @@
 ARG BUILDPLATFORM="linux/amd64"
 ARG BUILDERIMAGE="golang:1.22-bookworm"
-ARG BASEIMAGE="gcr.io/distroless/static:nonroot"
+ARG BASEIMAGE="gcr.io/distroless/static-debian12:nonroot"
 
 FROM --platform=$BUILDPLATFORM $BUILDERIMAGE as builder
 

diff --git a/vendor/google.golang.org/grpc/version.go b/vendor/google.golang.org/grpc/version.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -850,7 +850,7 @@ google.golang.org/genproto/googleapis/api/monitoredres
 google.golang.org/genproto/googleapis/rpc/code
 google.golang.org/genproto/googleapis/rpc/errdetails
 google.golang.org/genproto/googleapis/rpc/status
-# google.golang.org/grpc v1.62.1
+# google.golang.org/grpc v1.62.2
 ## explicit; go 1.19
 google.golang.org/grpc
 google.golang.org/grpc/attributes

diff --git a/website/docs/mutation.md b/website/docs/mutation.md
@@ -159,7 +159,7 @@ parameters:
   pathTests:
   - subPath: "spec.containers[name: foo]"
     condition: MustExist
-  - subPath: spec.containers[name: foo].securityContext.capabilities
+  - subPath: "spec.containers[name: foo].securityContext.capabilities"
     condition: MustNotExist
 ```
 

diff --git a/website/versioned_docs/version-v3.10.x/mutation.md b/website/versioned_docs/version-v3.10.x/mutation.md
@@ -158,7 +158,7 @@ parameters:
   pathTests:
   - subPath: "spec.containers[name: foo]"
     condition: MustExist
-  - subPath: spec.containers[name: foo].securityContext.capabilities
+  - subPath: "spec.containers[name: foo].securityContext.capabilities"
     condition: MustNotExist
 ```
 

diff --git a/website/versioned_docs/version-v3.11.x/mutation.md b/website/versioned_docs/version-v3.11.x/mutation.md
@@ -158,7 +158,7 @@ parameters:
   pathTests:
   - subPath: "spec.containers[name: foo]"
     condition: MustExist
-  - subPath: spec.containers[name: foo].securityContext.capabilities
+  - subPath: "spec.containers[name: foo].securityContext.capabilities"
     condition: MustNotExist
 ```
 

diff --git a/website/versioned_docs/version-v3.12.x/mutation.md b/website/versioned_docs/version-v3.12.x/mutation.md
@@ -159,7 +159,7 @@ parameters:
   pathTests:
   - subPath: "spec.containers[name: foo]"
     condition: MustExist
-  - subPath: spec.containers[name: foo].securityContext.capabilities
+  - subPath: "spec.containers[name: foo].securityContext.capabilities"
     condition: MustNotExist
 ```
 

diff --git a/website/versioned_docs/version-v3.13.x/mutation.md b/website/versioned_docs/version-v3.13.x/mutation.md
@@ -159,7 +159,7 @@ parameters:
   pathTests:
   - subPath: "spec.containers[name: foo]"
     condition: MustExist
-  - subPath: spec.containers[name: foo].securityContext.capabilities
+  - subPath: "spec.containers[name: foo].securityContext.capabilities"
     condition: MustNotExist
 ```
 

diff --git a/website/versioned_docs/version-v3.14.x/mutation.md b/website/versioned_docs/version-v3.14.x/mutation.md
@@ -159,7 +159,7 @@ parameters:
   pathTests:
   - subPath: "spec.containers[name: foo]"
     condition: MustExist
-  - subPath: spec.containers[name: foo].securityContext.capabilities
+  - subPath: "spec.containers[name: foo].securityContext.capabilities"
     condition: MustNotExist
 ```
 

diff --git a/website/versioned_docs/version-v3.15.x/mutation.md b/website/versioned_docs/version-v3.15.x/mutation.md
@@ -159,7 +159,7 @@ parameters:
   pathTests:
   - subPath: "spec.containers[name: foo]"
     condition: MustExist
-  - subPath: spec.containers[name: foo].securityContext.capabilities
+  - subPath: "spec.containers[name: foo].securityContext.capabilities"
     condition: MustNotExist
 ```
 

diff --git a/website/versioned_docs/version-v3.16.x/mutation.md b/website/versioned_docs/version-v3.16.x/mutation.md
@@ -159,7 +159,7 @@ parameters:
   pathTests:
   - subPath: "spec.containers[name: foo]"
     condition: MustExist
-  - subPath: spec.containers[name: foo].securityContext.capabilities
+  - subPath: "spec.containers[name: foo].securityContext.capabilities"
     condition: MustNotExist
 ```
 

diff --git a/website/versioned_docs/version-v3.7.x/mutation.md b/website/versioned_docs/version-v3.7.x/mutation.md
@@ -160,7 +160,7 @@ parameters:
   pathTests:
   - subPath: "spec.containers[name: foo]"
     condition: MustExist
-  - subPath: spec.containers[name: foo].securityContext.capabilities
+  - subPath: "spec.containers[name: foo].securityContext.capabilities"
     condition: MustNotExist
 ```
 

diff --git a/website/versioned_docs/version-v3.8.x/mutation.md b/website/versioned_docs/version-v3.8.x/mutation.md
@@ -160,7 +160,7 @@ parameters:
   pathTests:
   - subPath: "spec.containers[name: foo]"
     condition: MustExist
-  - subPath: spec.containers[name: foo].securityContext.capabilities
+  - subPath: "spec.containers[name: foo].securityContext.capabilities"
     condition: MustNotExist
 ```
 

diff --git a/website/versioned_docs/version-v3.9.x/mutation.md b/website/versioned_docs/version-v3.9.x/mutation.md
@@ -160,7 +160,7 @@ parameters:
   pathTests:
   - subPath: "spec.containers[name: foo]"
     condition: MustExist
-  - subPath: spec.containers[name: foo].securityContext.capabilities
+  - subPath: "spec.containers[name: foo].securityContext.capabilities"
     condition: MustNotExist
 ```