Skip to content

[release-4.18] OCPBUGS-56030: Exclude machineconfig and controllerconfig objects from audit logs #1962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@
resources: ["tokenreviews", "tokenrequests"]
- group: "oauth.openshift.io"
resources: ["oauthclients", "tokenreviews"]
- group: "machineconfiguration.openshift.io"
resource: ["machineconfig", "controllerconfig"]
# catch-all rule to log all other requests with request and response payloads
- level: RequestResponse
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
resources: ["tokenreviews", "tokenrequests"]
- group: "oauth.openshift.io"
resources: ["oauthclients", "tokenreviews"]
- group: "machineconfiguration.openshift.io"
resource: ["machineconfig", "controllerconfig"]
# log request and response payloads for all write requests
- level: RequestResponse
verbs:
Expand Down
2 changes: 2 additions & 0 deletions pkg/operator/apiserver/audit/testdata/allrequestbodies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,7 @@ rules:
resources: ["tokenreviews", "tokenrequests"]
- group: "oauth.openshift.io"
resources: ["oauthclients", "tokenreviews"]
- group: "machineconfiguration.openshift.io"
resource: ["machineconfig", "controllerconfig"]
# catch-all rule to log all other requests with request and response payloads
- level: RequestResponse
4 changes: 4 additions & 0 deletions pkg/operator/apiserver/audit/testdata/multipleCr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ rules:
resources: ["tokenreviews", "tokenrequests"]
- group: "oauth.openshift.io"
resources: ["oauthclients", "tokenreviews"]
- group: "machineconfiguration.openshift.io"
resource: ["machineconfig", "controllerconfig"]
userGroups:
- system:authenticated:oauth
# log request and response payloads for all write requests
Expand Down Expand Up @@ -64,6 +66,8 @@ rules:
resources: ["tokenreviews", "tokenrequests"]
- group: "oauth.openshift.io"
resources: ["oauthclients", "tokenreviews"]
- group: "machineconfiguration.openshift.io"
resource: ["machineconfig", "controllerconfig"]
userGroups:
- system:authenticated
- level: RequestResponse
Expand Down
2 changes: 2 additions & 0 deletions pkg/operator/apiserver/audit/testdata/oauth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ rules:
resources: ["tokenreviews", "tokenrequests"]
- group: "oauth.openshift.io"
resources: ["oauthclients", "tokenreviews"]
- group: "machineconfiguration.openshift.io"
resource: ["machineconfig", "controllerconfig"]
userGroups:
- system:authenticated:oauth
# log request and response payloads for all write requests
Expand Down
2 changes: 2 additions & 0 deletions pkg/operator/apiserver/audit/testdata/writerequestbodies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ rules:
resources: ["tokenreviews", "tokenrequests"]
- group: "oauth.openshift.io"
resources: ["oauthclients", "tokenreviews"]
- group: "machineconfiguration.openshift.io"
resource: ["machineconfig", "controllerconfig"]
# log request and response payloads for all write requests
- level: RequestResponse
verbs:
Expand Down