Skip to content

Conversation

@Redent0r
Copy link

@Redent0r Redent0r commented Apr 9, 2024

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)
  • genPolicy only: Ensured the tool still builds on Windows
  • genPolicy only: Updated sample YAMLs' policy annotations, if applicable
  • The upstream-missing label (or upstream-not-needed) has been set on the PR.
Summary

genpolicy sync with upstream [1/3]

Test Methodology

https://dev.azure.com/mariner-org/mariner/_build/results?buildId=547078&view=ms.vss-test-web.build-test-results-tab [pass]

Add metadata containing the Policy annotation if the user didn't
provide any metadata in the input yaml file.

For a simple sanity test using a Kata CI YAML file:

genpolicy -u -y job.yaml

kubectl apply -f job.yaml

kubectl get pods | grep job
job-pi-test-64dxs 0/1     Completed   0          14s

Fixes: kata-containers#8891

Signed-off-by: Dan Mihai <[email protected]>
Validating the node name is currently outside the scope of the CoCo
policy.

This change unblocks testing using Kata CI's test-pod-file-volume.yaml
and pv-pod.yaml.

Fixes: kata-containers#8888

Signed-off-by: Dan Mihai <[email protected]>
},
"kata_config": {
"confidential_guest": false
"confidential_guest": true

Choose a reason for hiding this comment

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

Given that 3cc0745 breaks the functionality of the MSFT fork, I would remove the second part of 3cc0745 (including its second commit comment) instead of adding d2df449.

But, it's OK with me in case you prefer to keep this additional commit.

@Redent0r Redent0r force-pushed the saulparedes/genpolicy_sync_1 branch from d2df449 to 152db54 Compare April 9, 2024 16:28
Allow Kata CI's pod-nested-configmap-secret.yaml to work with
genpolicy and current cbl-mariner images:

1. Ignore the optional type field of Secret input YAML files.

   It's possible that CoCo will need a more sophisticated Policy
   for Secrets, but this change at least unblocks CI testing for
   already-existing genpolicy features.

Simple sanity testing for these changes:

genpolicy -u -y pod-nested-configmap-secret.yaml

kubectl apply -f pod-nested-configmap-secret.yaml

kubectl get pods | grep config
nested-configmap-secret-pod 1/1     Running   0          26s

Fixes: kata-containers#8892

Signed-off-by: Dan Mihai <[email protected]>
The auto-generated Policy already allows these volumes to be mounted,
regardless if they are:
- Present, or
- Missing and optional

Fixes: kata-containers#8893

Signed-off-by: Dan Mihai <[email protected]>
@Redent0r Redent0r force-pushed the saulparedes/genpolicy_sync_1 branch from 152db54 to a3d481f Compare April 9, 2024 16:41
@Redent0r Redent0r added the upstream/not-needed PRs that will not be upstreamed (e.g. internal) label Apr 9, 2024
@Redent0r Redent0r changed the title Saulparedes/genpolicy sync [1/3] genpolicy sync with upstream [1/3] Apr 9, 2024
@Redent0r Redent0r marked this pull request as ready for review April 9, 2024 17:07
@Redent0r Redent0r requested review from a team as code owners April 9, 2024 17:07
@Redent0r
Copy link
Author

Redent0r commented Apr 9, 2024

Good for merge once required checks pass

@Redent0r Redent0r merged commit 04bdb2f into msft-main Apr 9, 2024
@Redent0r Redent0r deleted the saulparedes/genpolicy_sync_1 branch April 9, 2024 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

upstream/not-needed PRs that will not be upstreamed (e.g. internal)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants