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

Jump to bottom

tools: Align AGENT_POLICY_FILE check in rootfs-builder with upstream #244

Merged
merged 4 commits into from
Oct 30, 2024
Merged

tools: Align AGENT_POLICY_FILE check in rootfs-builder with upstream #244

merged 4 commits into from
Oct 30, 2024

Conversation

ms-mahuber
Copy link

@ms-mahuber ms-mahuber commented Oct 21, 2024 •
edited
Loading

Merge Checklist
  • Followed patch format from upstream recommendation: https://github.com/kata-containers/community/blob/main/CONTRIBUTING.md#patch-format
    • Included a single commit in a given PR - at least unless there are related commits and each makes sense as a change on its own.
  • Aware about the PR to be merged using "create a merge commit" rather than "squash and merge" (or similar)
  • The upstream/missing label (or upstream/not-needed) has been set on the PR.
Summary
Test Methodology

Internal CI, package/image build and AKS image tests

ms-mahuber and others added 3 commits October 21, 2024 22:21
@ms-mahuber
Revert "rootfs-builder: only look for AGENT_POLICY_FILE if AGENT_POLI…
7df996b 
…CY=yes"

This reverts commit 6f4a49c.
@Redent0r @ms-mahuber
rootfs: Allow AGENT_POLICY_FILE te be an absolute
a22230b 
path

Don't set AGENT_POLICY_FILE as $script_dir may change

Signed-off-by: Saul Paredes <[email protected]>
@emanuellima1 @ms-mahuber
build: Fix RPM build fail due to AGENT_POLICY
bcf32a6 
By checking for AGENT_POLICY we ensure we only try to read
allow-all.rego if AGENT_POLICY is set to "yes"

Signed-off-by: Emanuel Lima <[email protected]>
@ms-mahuber ms-mahuber force-pushed the mahuber/upstr-agent-policy-patch branch from a5859e1 to bcf32a6 Compare October 21, 2024 22:31
@ms-mahuber ms-mahuber added the upstream/merged PRs that have been merged upstream label Oct 22, 2024
@ms-mahuber ms-mahuber changed the title Mahuber/upstr agent policy patch tools: Align AGENT_POLICY_FILE check in rootfs-builder with upstream Oct 22, 2024
@ms-mahuber ms-mahuber marked this pull request as ready for review October 22, 2024 23:31
@ms-mahuber ms-mahuber requested review from a team as code owners October 22, 2024 23:31
@ms-mahuber
Copy link
Author

Requires some changes to node-builder/azure-linux to properly set the AGENT_POLICY_FILE parameter

@sprt
Copy link
Collaborator

sprt commented Oct 28, 2024 •
edited
Loading

Requires some changes to node-builder/azure-linux to properly set the AGENT_POLICY_FILE parameter

Are we making that change in this PR then? I would rather, so that we don't break the dev flow.

@ms-mahuber
Copy link
Author

Requires some changes to node-builder/azure-linux to properly set the AGENT_POLICY_FILE parameter

Are we making that change in this PR then? I would rather, so that we don't break the dev flow.

Yes, holding on with merging. Trying to get to it this week.

@ms-mahuber
tools: Adapt AGENT_POLICY_FILE path
4db5ba4 
- Adapt path in uvm_build.sh script to comply
  with the usptream changes we pulled in

Signed-off-by: Manuel Huber <[email protected]>
@ms-mahuber ms-mahuber merged commit eeeea27 into msft-main Oct 30, 2024
44 of 55 checks passed
@Redent0r Redent0r deleted the mahuber/upstr-agent-policy-patch branch December 18, 2024 23:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danmihai1 danmihai1 danmihai1 approved these changes

Assignees
No one assigned
Labels
upstream/merged PRs that have been merged upstream
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ms-mahuber @sprt @danmihai1 @Redent0r @emanuellima1