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.

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

Enable Audit Logs for Tinkerbell #6760

Merged
merged 8 commits into from
Oct 5, 2023

Conversation

tatlat
Copy link
Member

@tatlat tatlat commented Oct 3, 2023

Issue #, if available:

https://github.com/aws/eks-anywhere-internal/issues/1883

Description of changes:

Testing (if applicable):

Documentation added/planned (if applicable):

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot eks-distro-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 3, 2023
@eks-distro-bot eks-distro-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 3, 2023
@codecov
Copy link

codecov bot commented Oct 3, 2023

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (5428b97) 75.67% compared to head (dfb9dee) 71.70%.
Report is 11 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6760      +/-   ##
==========================================
- Coverage   75.67%   71.70%   -3.97%     
==========================================
  Files         475      531      +56     
  Lines       38411    41126    +2715     
==========================================
+ Hits        29066    29488     +422     
- Misses       7733     9983    +2250     
- Partials     1612     1655      +43     
Files Coverage Δ
pkg/providers/tinkerbell/template.go 67.76% <100.00%> (+0.31%) ⬆️

... and 62 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@tatlat
Copy link
Member Author

tatlat commented Oct 5, 2023

/retest

@@ -362,6 +362,11 @@ func buildTemplateMapCP(
etcdTemplateOverride string,
datacenterSpec v1alpha1.TinkerbellDatacenterConfigSpec,
) (map[string]interface{}, error) {
auditPolicy, err := common.GetAuditPolicy(clusterSpec.Cluster.Spec.KubernetesVersion)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

then you can move values["auditPolicy"] = auditPolicy to

values := map[string]interface{}{

@jiayiwang7
Copy link
Member

/lgtm

@tatlat
Copy link
Member Author

tatlat commented Oct 5, 2023

/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tatlat

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tatlat
Copy link
Member Author

tatlat commented Oct 5, 2023

/retest

@eks-distro-bot eks-distro-bot merged commit ad7e64b into aws:main Oct 5, 2023
5 checks passed
@tatlat
Copy link
Member Author

tatlat commented Oct 5, 2023

/cherry-pick release-0.17

@eks-distro-pr-bot
Copy link
Contributor

@tatlat: #6760 failed to apply on top of branch "release-0.17":

Applying: Enable Audit Logs for Tinkerbell
Applying: update tinkerbell testdata for audit config
Applying: fix tinkerbell audit config
Applying: fix tinkerbell unit tests
Applying: fix apiServer config in tinkerbell cp template
Applying: fix tinkerbell unit tests
Applying: increase code coverage
Using index info to reconstruct a base tree...
M	pkg/providers/tinkerbell/template.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/providers/tinkerbell/template.go
CONFLICT (content): Merge conflict in pkg/providers/tinkerbell/template.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0007 increase code coverage
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants