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 PSA FG on Kubevirt #2093

Merged
merged 1 commit into from
Sep 22, 2022
Merged

Enable PSA FG on Kubevirt #2093

merged 1 commit into from
Sep 22, 2022

Conversation

tiraboschi
Copy link
Member

Enable PSA FG on Kubevirt to be compatible with
k8s >= 1.24 and derivates with PSA in enforcing mode.

Once available also in older versions of Kubevirt, we will have also to backport it to release-1.6
and release-1.7.

Signed-off-by: Simone Tiraboschi stirabos@redhat.com

Reviewer Checklist

Reviewers are supposed to review the PR for every aspect below one by one. To check an item means the PR is either "OK" or "Not Applicable" in terms of that item. All items are supposed to be checked before merging a PR.

  • PR Message
  • Commit Messages
  • How to test
  • Unit Tests
  • Functional Tests
  • User Documentation
  • Developer Documentation
  • Upgrade Scenario
  • Uninstallation Scenario
  • Backward Compatibility
  • Troubleshooting Friendly

Release note:

Enable PSA FG on Kubevirt

Enable PSA FG on Kubevirt to be compatible with
k8s >= 1.24 and derivates with PSA in enforcing mode.

Once available also in older versions of Kubevirt,
we will have also to backport it to release-1.6
and release-1.7.

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
@kubevirt-bot kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Sep 22, 2022
@sonarcloud
Copy link

sonarcloud bot commented Sep 22, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@coveralls
Copy link
Collaborator

Pull Request Test Coverage Report for Build 3104178582

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.02%) to 85.284%

Totals Coverage Status
Change from base Build 3090373677: 0.02%
Covered Lines: 4584
Relevant Lines: 5375

💛 - Coveralls

Copy link
Collaborator

@nunnatsa nunnatsa left a comment

Choose a reason for hiding this comment

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

/approve

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Sep 22, 2022
@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nunnatsa

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

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 22, 2022
@hco-bot
Copy link
Collaborator

hco-bot commented Sep 22, 2022

hco-e2e-upgrade-prev-index-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-index-azure

@kubevirt-bot
Copy link
Contributor

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-upgrade-prev-index-azure

In response to this:

hco-e2e-upgrade-prev-index-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-index-azure

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.

@openshift-ci
Copy link

openshift-ci bot commented Sep 22, 2022

@tiraboschi: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/hco-e2e-upgrade-prev-index-azure 4296006 link true /test hco-e2e-upgrade-prev-index-azure
ci/prow/hco-e2e-kv-smoke-azure 4296006 link true /test hco-e2e-kv-smoke-azure
ci/prow/hco-e2e-upgrade-index-sno-aws 4296006 link false /test hco-e2e-upgrade-index-sno-aws

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@hco-bot
Copy link
Collaborator

hco-bot commented Sep 22, 2022

hco-e2e-upgrade-index-sno-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-index-sno-aws

@kubevirt-bot
Copy link
Contributor

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-upgrade-index-sno-aws

In response to this:

hco-e2e-upgrade-index-sno-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-index-sno-aws

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.

@tiraboschi
Copy link
Member Author

/test pull-hyperconverged-cluster-operator-e2e-k8s-1.23

@openshift-ci
Copy link

openshift-ci bot commented Sep 22, 2022

@tiraboschi: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test ci-index
  • /test ci-index-hco-upgrade-bundle
  • /test ci-index-hco-upgrade-prev-bundle
  • /test hco-e2e-image-index-aws
  • /test hco-e2e-image-index-azure
  • /test hco-e2e-image-index-gcp
  • /test hco-e2e-kv-smoke-azure
  • /test hco-e2e-kv-smoke-gcp
  • /test hco-e2e-upgrade-index-aws
  • /test hco-e2e-upgrade-index-azure
  • /test hco-e2e-upgrade-prev-index-aws
  • /test hco-e2e-upgrade-prev-index-azure
  • /test images
  • /test okd-ci-index
  • /test okd-ci-index-hco-upgrade-bundle
  • /test okd-ci-index-hco-upgrade-prev-bundle
  • /test okd-hco-e2e-image-index-aws
  • /test okd-hco-e2e-image-index-gcp
  • /test okd-hco-e2e-upgrade-index-aws
  • /test okd-hco-e2e-upgrade-index-gcp
  • /test okd-images

The following commands are available to trigger optional jobs:

  • /test hco-e2e-image-index-sno-aws
  • /test hco-e2e-image-index-sno-azure
  • /test hco-e2e-upgrade-index-sno-aws
  • /test hco-e2e-upgrade-index-sno-azure
  • /test hco-e2e-upgrade-prev-index-sno-aws
  • /test hco-e2e-upgrade-prev-index-sno-azure

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-kubevirt-hyperconverged-cluster-operator-main-hco-e2e-image-index-aws
  • pull-ci-kubevirt-hyperconverged-cluster-operator-main-hco-e2e-image-index-azure
  • pull-ci-kubevirt-hyperconverged-cluster-operator-main-hco-e2e-image-index-gcp
  • pull-ci-kubevirt-hyperconverged-cluster-operator-main-hco-e2e-image-index-sno-aws
  • pull-ci-kubevirt-hyperconverged-cluster-operator-main-hco-e2e-image-index-sno-azure
  • pull-ci-kubevirt-hyperconverged-cluster-operator-main-hco-e2e-kv-smoke-azure
  • pull-ci-kubevirt-hyperconverged-cluster-operator-main-hco-e2e-kv-smoke-gcp
  • pull-ci-kubevirt-hyperconverged-cluster-operator-main-hco-e2e-upgrade-index-aws
  • pull-ci-kubevirt-hyperconverged-cluster-operator-main-hco-e2e-upgrade-index-azure
  • pull-ci-kubevirt-hyperconverged-cluster-operator-main-hco-e2e-upgrade-index-sno-aws
  • pull-ci-kubevirt-hyperconverged-cluster-operator-main-hco-e2e-upgrade-index-sno-azure
  • pull-ci-kubevirt-hyperconverged-cluster-operator-main-hco-e2e-upgrade-prev-index-aws
  • pull-ci-kubevirt-hyperconverged-cluster-operator-main-hco-e2e-upgrade-prev-index-azure
  • pull-ci-kubevirt-hyperconverged-cluster-operator-main-hco-e2e-upgrade-prev-index-sno-aws
  • pull-ci-kubevirt-hyperconverged-cluster-operator-main-hco-e2e-upgrade-prev-index-sno-azure

In response to this:

/test pull-hyperconverged-cluster-operator-e2e-k8s-1.23

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.

@hco-bot
Copy link
Collaborator

hco-bot commented Sep 22, 2022

hco-e2e-kv-smoke-gcp lane succeeded.
/override ci/prow/hco-e2e-kv-smoke-azure

@kubevirt-bot
Copy link
Contributor

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-kv-smoke-azure

In response to this:

hco-e2e-kv-smoke-gcp lane succeeded.
/override ci/prow/hco-e2e-kv-smoke-azure

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.

@tiraboschi
Copy link
Member Author

/retest

2 similar comments
@tiraboschi
Copy link
Member Author

/retest

@tiraboschi
Copy link
Member Author

/retest

@oshoval
Copy link
Contributor

oshoval commented Sep 22, 2022

Now it uses the right image, lets see it pass ;]

@kubevirt-bot kubevirt-bot merged commit 4731026 into kubevirt:main Sep 22, 2022
@tiraboschi tiraboschi deleted the kv_psa branch September 22, 2022 16:14
@tiraboschi
Copy link
Member Author

/cherry-pick release-1.7

@tiraboschi
Copy link
Member Author

/cherry-pick release-1.6

@kubevirt-bot
Copy link
Contributor

@tiraboschi: #2093 failed to apply on top of branch "release-1.7":

Applying: Enable PSA FG on Kubevirt
Using index info to reconstruct a base tree...
M	controllers/hyperconverged/hyperconverged_controller_test.go
M	controllers/operands/kubevirt.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/operands/kubevirt.go
CONFLICT (content): Merge conflict in controllers/operands/kubevirt.go
Auto-merging controllers/hyperconverged/hyperconverged_controller_test.go
CONFLICT (content): Merge conflict in controllers/hyperconverged/hyperconverged_controller_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Enable PSA FG on Kubevirt
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-1.7

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.

@kubevirt-bot
Copy link
Contributor

@tiraboschi: #2093 failed to apply on top of branch "release-1.6":

Applying: Enable PSA FG on Kubevirt
Using index info to reconstruct a base tree...
A	controllers/hyperconverged/hyperconverged_controller_test.go
A	controllers/operands/kubevirt.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/operands/kubevirt.go
CONFLICT (content): Merge conflict in pkg/controller/operands/kubevirt.go
Auto-merging pkg/controller/hyperconverged/hyperconverged_controller_test.go
CONFLICT (content): Merge conflict in pkg/controller/hyperconverged/hyperconverged_controller_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Enable PSA FG on Kubevirt
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-1.6

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.

tiraboschi added a commit to tiraboschi/hyperconverged-cluster-operator that referenced this pull request Oct 7, 2022
Enable PSA FG on Kubevirt to be compatible with
k8s >= 1.24 and derivates with PSA in enforcing mode.

Once available also in older versions of Kubevirt,
we will have also to backport it to release-1.6
and release-1.7.

This is a manual cherry-pick of kubevirt#2093

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
tiraboschi added a commit to tiraboschi/hyperconverged-cluster-operator that referenced this pull request Oct 7, 2022
Enable PSA FG on Kubevirt to be compatible with
k8s >= 1.24 and derivates with PSA in enforcing mode.

Once available also in older versions of Kubevirt,
we will have also to backport it to release-1.6
and release-1.7.

This is a manual cherry-pick of kubevirt#2093

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
kubevirt-bot pushed a commit that referenced this pull request Oct 7, 2022
Enable PSA FG on Kubevirt to be compatible with
k8s >= 1.24 and derivates with PSA in enforcing mode.

Once available also in older versions of Kubevirt,
we will have also to backport it to release-1.6
and release-1.7.

This is a manual cherry-pick of #2093

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
kubevirt-bot pushed a commit that referenced this pull request Oct 7, 2022
Enable PSA FG on Kubevirt to be compatible with
k8s >= 1.24 and derivates with PSA in enforcing mode.

Once available also in older versions of Kubevirt,
we will have also to backport it to release-1.6
and release-1.7.

This is a manual cherry-pick of #2093

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
@tiraboschi
Copy link
Member Author

/revert

tiraboschi added a commit to tiraboschi/hyperconverged-cluster-operator that referenced this pull request Nov 8, 2022
This reverts commit 4731026.

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
tiraboschi added a commit to tiraboschi/hyperconverged-cluster-operator that referenced this pull request Nov 14, 2022
This reverts commit 4731026.

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
kubevirt-bot pushed a commit that referenced this pull request Nov 15, 2022
* Revert "Enable PSA FG on Kubevirt (#2093)"

This reverts commit 4731026.

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>

* hack: brutal workaround to bypass SCC->PSA on OCP

brutal workaround to bypass SCC -> PSA on OCP >= 4.12

remove ASAP!!!

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
kubevirt-bot pushed a commit that referenced this pull request Nov 15, 2022
* Revert "Enable PSA FG on Kubevirt (#2093)"

This reverts commit 4731026.

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>

* hack: brutal workaround to bypass SCC->PSA on OCP

brutal workaround to bypass SCC -> PSA on OCP >= 4.12

remove ASAP!!!

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>

* Another workaround for PSA on OCP/OKD 4.12

Remove once kubevirt/kubevirt#8748
lands in Kubevirt v0.59.0

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants