Skip to content
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.

Sign up for GitHub

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

ci: fix tagged release test for release-3.11 #2467

Merged
merged 5 commits into from
Dec 19, 2022
Merged

ci: fix tagged release test for release-3.11 #2467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14f97e3
fix tagged release test
sozercan Dec 15, 2022
48fcd55
Merge branch 'release-3.11' into fix-tagged-release
sozercan Dec 15, 2022
962fd5b
chore: bump github/codeql-action from 2.1.36 to 2.1.37 (#2463)
dependabot[bot] Dec 16, 2022
1677be5
feat: log constraint annotations (#2464)
acpana Dec 17, 2022
169cfaa
Merge branch 'master' into fix-tagged-release
sozercan Dec 19, 2022
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
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b

- name: Initialize CodeQL
uses: github/codeql-action/init@a669cc5936cc5e1b6a362ec1ff9e410dc570d190
uses: github/codeql-action/init@959cbb7472c4d4ad70cdfe6f4976053fe48ab394
with:
languages: go

- name: Autobuild
uses: github/codeql-action/autobuild@a669cc5936cc5e1b6a362ec1ff9e410dc570d190
uses: github/codeql-action/autobuild@959cbb7472c4d4ad70cdfe6f4976053fe48ab394

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@a669cc5936cc5e1b6a362ec1ff9e410dc570d190
uses: github/codeql-action/analyze@959cbb7472c4d4ad70cdfe6f4976053fe48ab394
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ e2e-build-load-externaldata-image: docker-buildx-builder
docker buildx build --platform="linux/amd64" -t dummy-provider:test --load -f test/externaldata/dummy-provider/Dockerfile test/externaldata/dummy-provider
kind load docker-image --name kind dummy-provider:test

e2e-verify-release: patch-image deploy test-e2e
e2e-verify-release: e2e-build-load-externaldata-image patch-image deploy test-e2e
echo -e '\n\n======= manager logs =======\n\n' && kubectl logs -n ${GATEKEEPER_NAMESPACE} -l control-plane=controller-manager

e2e-helm-install:
Expand Down
4 changes: 4 additions & 0 deletions pkg/audit/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,6 +1013,9 @@ func logViolation(l logr.Logger,
constraint *unstructured.Unstructured,
enforcementAction util.EnforcementAction, resourceGroupVersionKind schema.GroupVersionKind, rnamespace, rname, message string, details interface{}, rlabels map[string]string,
) {
userConstraintAnnotations := constraint.GetAnnotations()
delete(userConstraintAnnotations, "kubectl.kubernetes.io/last-applied-configuration")

l.Info(
message,
logging.Details, details,
Expand All @@ -1023,6 +1026,7 @@ func logViolation(l logr.Logger,
logging.ConstraintName, constraint.GetName(),
logging.ConstraintNamespace, constraint.GetNamespace(),
logging.ConstraintAction, enforcementAction,
logging.ConstraintAnnotations, userConstraintAnnotations,
logging.ResourceGroup, resourceGroupVersionKind.Group,
logging.ResourceAPIVersion, resourceGroupVersionKind.Version,
logging.ResourceKind, resourceGroupVersionKind.Kind,
Expand Down
47 changes: 24 additions & 23 deletions pkg/logging/logging.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,28 @@ package logging

// Log keys.
const (
Process = "process"
Details = "details"
EventType = "event_type"
TemplateName = "template_name"
ConstraintNamespace = "constraint_namespace"
ConstraintName = "constraint_name"
ConstraintGroup = "constraint_group"
ConstraintKind = "constraint_kind"
ConstraintAPIVersion = "constraint_api_version"
ConstraintStatus = "constraint_status"
ConstraintAction = "constraint_action"
AuditID = "audit_id"
ConstraintViolations = "constraint_violations"
ResourceGroup = "resource_group"
ResourceKind = "resource_kind"
ResourceLabels = "resource_labels"
ResourceAPIVersion = "resource_api_version"
ResourceNamespace = "resource_namespace"
ResourceName = "resource_name"
RequestUsername = "request_username"
MutationApplied = "mutation_applied"
Mutator = "mutator"
DebugLevel = 2 // r.log.Debug(foo) == r.log.V(logging.DebugLevel).Info(foo)
Process = "process"
Details = "details"
EventType = "event_type"
TemplateName = "template_name"
ConstraintNamespace = "constraint_namespace"
ConstraintName = "constraint_name"
ConstraintGroup = "constraint_group"
ConstraintKind = "constraint_kind"
ConstraintAPIVersion = "constraint_api_version"
ConstraintStatus = "constraint_status"
ConstraintAction = "constraint_action"
ConstraintAnnotations = "constraint_annotations"
AuditID = "audit_id"
ConstraintViolations = "constraint_violations"
ResourceGroup = "resource_group"
ResourceKind = "resource_kind"
ResourceLabels = "resource_labels"
ResourceAPIVersion = "resource_api_version"
ResourceNamespace = "resource_namespace"
ResourceName = "resource_name"
RequestUsername = "request_username"
MutationApplied = "mutation_applied"
Mutator = "mutator"
DebugLevel = 2 // r.log.Debug(foo) == r.log.V(logging.DebugLevel).Info(foo)
)
3 changes: 3 additions & 0 deletions website/docs/audit.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ The audit pod emits JSON-formatted audit logs to stdout. The following is an exa
"constraint_name": "container-must-have-limits",
"constraint_namespace": "",
"constraint_action": "deny",
"constraint_annotations": {
"test-annotation-1": "annotation_1"
},
"resource_group": "",
"resource_api_version": "v1",
"resource_kind": "Pod",
Expand Down