Skip to content

Commit

Permalink
Merge branch 'master' into add_disallow_interactive_tty_constraint
Browse files Browse the repository at this point in the history
  • Loading branch information
apeabody authored Dec 6, 2023
2 parents 317f82e + 1136967 commit 56a24f7
Show file tree
Hide file tree
Showing 23 changed files with 34 additions and 34 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
uses: github/codeql-action/init@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -60,7 +60,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
uses: github/codeql-action/autobuild@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -73,6 +73,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
uses: github/codeql-action/analyze@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:
- name: 'Checkout Repository'
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: 'Dependency Review'
uses: actions/dependency-review-action@7bbfa034e752445ea40215fff1c3bf9597993d3f # v3.1.3
uses: actions/dependency-review-action@01bc87099ba56df1e897b6874784491ea6309bc4 # v3.1.4
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/scripts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0
with:
version: v1.54.2
version: v1.55.2
working-directory: scripts/${{ matrix.folder }}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spspdefaultallowprivilegeescalation
Expand All @@ -15,7 +15,7 @@ spec:
assign:
value: false
---
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spspdefaultallowprivilegeescalation-init
Expand All @@ -32,7 +32,7 @@ spec:
assign:
value: false
---
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spspdefaultallowprivilegeescalation-ephemeral
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spspcapabilities
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: ModifySet
metadata:
name: k8spspcapabilities
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spspreadonlyrootfs
Expand Down
2 changes: 1 addition & 1 deletion mutation/pod-security-policy/seccomp/samples/mutation.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: AssignMetadata
metadata:
name: k8spspseccomp
Expand Down
2 changes: 1 addition & 1 deletion mutation/pod-security-policy/selinux/samples/mutation.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spspselinux
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spspfsGroup
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spsprunasnonroot
Expand All @@ -15,7 +15,7 @@ spec:
assign:
value: true
---
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spsprunasnonroot-init
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spsprunasgroup
Expand All @@ -15,7 +15,7 @@ spec:
assign:
value: 2000
---
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spsprunasgroup-init
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spsprunasuser
Expand All @@ -15,7 +15,7 @@ spec:
assign:
value: 1000
---
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spsprunasuser-init
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spspsupplementalgroups
Expand Down
2 changes: 1 addition & 1 deletion scripts/require-sync/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.20
require (
github.com/open-policy-agent/frameworks/constraint v0.0.0-20231030230613-2e0cb3d68575
github.com/open-policy-agent/gatekeeper/v3 v3.14.0
k8s.io/apimachinery v0.27.7
k8s.io/apimachinery v0.27.8
)

require (
Expand Down
6 changes: 3 additions & 3 deletions scripts/require-sync/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down Expand Up @@ -513,8 +513,8 @@ k8s.io/api v0.27.4 h1:0pCo/AN9hONazBKlNUdhQymmnfLRbSZjd5H5H3f0bSs=
k8s.io/api v0.27.4/go.mod h1:O3smaaX15NfxjzILfiln1D8Z3+gEYpjEpiNA/1EVK1Y=
k8s.io/apiextensions-apiserver v0.27.4 h1:ie1yZG4nY/wvFMIR2hXBeSVq+HfNzib60FjnBYtPGSs=
k8s.io/apiextensions-apiserver v0.27.4/go.mod h1:KHZaDr5H9IbGEnSskEUp/DsdXe1hMQ7uzpQcYUFt2bM=
k8s.io/apimachinery v0.27.7 h1:Gxgtb7Y/Rsu8ymgmUEaiErkxa6RY4oTd8kNUI6SUR58=
k8s.io/apimachinery v0.27.7/go.mod h1:jBGQgTjkw99ef6q5hv1YurDd3BqKDk9YRxmX0Ozo0i8=
k8s.io/apimachinery v0.27.8 h1:Xg+ogjDm8s7KmV3vZGf7uOZ0jrC6FPy2Lk/h7BIRmvg=
k8s.io/apimachinery v0.27.8/go.mod h1:EIXLxLt/b1muPITiF5zlrcm7I+YnXsIgM+0GdnPTQvA=
k8s.io/apiserver v0.27.4 h1:ncZ0MBR9yQ/Gf34rtu1EK+HqT8In1YpfAUINu/Akvho=
k8s.io/apiserver v0.27.4/go.mod h1:GDEFRfFZ4/l+pAvwYRnoSfz0K4j3TWiN4WsG2KnRteE=
k8s.io/client-go v0.27.4 h1:vj2YTtSJ6J4KxaC88P4pMPEQECWMY8gqPqsTgUKzvjk=
Expand Down
6 changes: 3 additions & 3 deletions website/docs/mutation-examples/allow-privilege-escalation.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ kubectl apply -f https://raw.githubusercontent.com/open-policy-agent/gatekeeper-
```
## Mutation Examples
```yaml
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spspdefaultallowprivilegeescalation
Expand All @@ -28,7 +28,7 @@ spec:
assign:
value: false
---
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spspdefaultallowprivilegeescalation-init
Expand All @@ -45,7 +45,7 @@ spec:
assign:
value: false
---
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spspdefaultallowprivilegeescalation-ephemeral
Expand Down
2 changes: 1 addition & 1 deletion website/docs/mutation-examples/capabilities.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ kubectl apply -f https://raw.githubusercontent.com/open-policy-agent/gatekeeper-
```
## Mutation Examples
```yaml
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: ModifySet
metadata:
name: k8spspcapabilities
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ kubectl apply -f https://raw.githubusercontent.com/open-policy-agent/gatekeeper-
```
## Mutation Examples
```yaml
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spspreadonlyrootfs
Expand Down
2 changes: 1 addition & 1 deletion website/docs/mutation-examples/seccomp.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ kubectl apply -f https://raw.githubusercontent.com/open-policy-agent/gatekeeper-
```
## Mutation Examples
```yaml
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: AssignMetadata
metadata:
name: k8spspseccomp
Expand Down
2 changes: 1 addition & 1 deletion website/docs/mutation-examples/selinux.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ kubectl apply -f https://raw.githubusercontent.com/open-policy-agent/gatekeeper-
```
## Mutation Examples
```yaml
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spspselinux
Expand Down
2 changes: 1 addition & 1 deletion website/docs/mutation-examples/users.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ kubectl apply -f https://raw.githubusercontent.com/open-policy-agent/gatekeeper-
```
## Mutation Examples
```yaml
apiVersion: mutations.gatekeeper.sh/v1alpha1
apiVersion: mutations.gatekeeper.sh/v1
kind: Assign
metadata:
name: k8spspsupplementalgroups
Expand Down

0 comments on commit 56a24f7

Please sign in to comment.