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

OCPBUGS-30855: Ensure portSecurity is correctly set in the Port #107

Merged
merged 1 commit into from Mar 13, 2024

Conversation

MaysaMacedo
Copy link
Contributor

@MaysaMacedo MaysaMacedo commented Mar 12, 2024

Right now we only enforce portSecurity when it's defined
within the Machine's Network field, but the portSecurity
in the Machine's ports field should also be enforced.
This commit fixes the issue by ensuring the value of
PortSecurity is correctly set in the Server port.

@openshift-ci openshift-ci bot requested review from EmilienM and gryf March 12, 2024 19:58
Copy link
Contributor

openshift-ci bot commented Mar 12, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MaysaMacedo

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 12, 2024
Right now we only enforce portSecurity when it's defined
within the Machine's Network field, but the portSecurity
in the Machine's ports field should also be enforced.
This commit fixes the issue by ensuring the value of
PortSecurity is correctly set in the Server port.
@MaysaMacedo
Copy link
Contributor Author

/cc @mandre

@openshift-ci openshift-ci bot requested a review from mandre March 12, 2024 21:53
Copy link
Contributor

openshift-ci bot commented Mar 12, 2024

@MaysaMacedo: all tests passed!

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.

@EmilienM
Copy link
Member

this worked, thanks
/lgtm

@EmilienM
Copy link
Member

/cherry-pick release-4.15
/cherry-pick release-4.14
/cherry-pick release-4.13
/cherry-pick release-4.12

@openshift-cherrypick-robot

@EmilienM: once the present PR merges, I will cherry-pick it on top of release-4.15 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.15
/cherry-pick release-4.14
/cherry-pick release-4.13
/cherry-pick release-4.12

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 openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 13, 2024
@EmilienM
Copy link
Member

/retitle OCPBUGS-30855: Ensure portSecurity is correctly set in the Port

@openshift-ci openshift-ci bot changed the title Ensure portSecurity is correctly set in the Port OCPBUGS-30855: Ensure portSecurity is correctly set in the Port Mar 13, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 13, 2024
@openshift-ci-robot
Copy link
Contributor

@MaysaMacedo: This pull request references Jira Issue OCPBUGS-30855, which is invalid:

  • expected the bug to target the "4.16.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Right now we only enforce portSecurity when it's defined
within the Machine's Network field, but the portSecurity
in the Machine's ports field should also be enforced.
This commit fixes the issue by ensuring the value of
PortSecurity is correctly set in the Server port.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Contributor

@EmilienM: This pull request references Jira Issue OCPBUGS-30855, which is invalid:

  • expected the bug to target the "4.16.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@EmilienM
Copy link
Member

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 13, 2024
@openshift-ci-robot
Copy link
Contributor

@EmilienM: This pull request references Jira Issue OCPBUGS-30855, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (itbrown@redhat.com), skipping review request.

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-bot openshift-merge-bot bot merged commit bf45c1f into openshift:master Mar 13, 2024
10 checks passed
@openshift-ci-robot
Copy link
Contributor

@MaysaMacedo: Jira Issue OCPBUGS-30855: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-30855 has been moved to the MODIFIED state.

In response to this:

Right now we only enforce portSecurity when it's defined
within the Machine's Network field, but the portSecurity
in the Machine's ports field should also be enforced.
This commit fixes the issue by ensuring the value of
PortSecurity is correctly set in the Server port.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-cherrypick-robot

@EmilienM: new pull request created: #108

In response to this:

/cherry-pick release-4.15
/cherry-pick release-4.14
/cherry-pick release-4.13
/cherry-pick release-4.12

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-cherrypick-robot

@EmilienM: #107 failed to apply on top of branch "release-4.14":

Applying: Ensure portSecurity is correctly set in the Instace Ports
Using index info to reconstruct a base tree...
M	pkg/machine/convert.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/machine/convert.go
CONFLICT (content): Merge conflict in pkg/machine/convert.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 Ensure portSecurity is correctly set in the Instace Ports
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-4.15
/cherry-pick release-4.14
/cherry-pick release-4.13
/cherry-pick release-4.12

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-cherrypick-robot

@EmilienM: #107 failed to apply on top of branch "release-4.13":

Applying: Ensure portSecurity is correctly set in the Instace Ports
Using index info to reconstruct a base tree...
M	pkg/machine/convert.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/machine/convert.go
CONFLICT (content): Merge conflict in pkg/machine/convert.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 Ensure portSecurity is correctly set in the Instace Ports
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-4.15
/cherry-pick release-4.14
/cherry-pick release-4.13
/cherry-pick release-4.12

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-cherrypick-robot

@EmilienM: #107 failed to apply on top of branch "release-4.12":

Applying: Ensure portSecurity is correctly set in the Instace Ports
Using index info to reconstruct a base tree...
M	pkg/machine/convert.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/machine/convert.go
CONFLICT (content): Merge conflict in pkg/machine/convert.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 Ensure portSecurity is correctly set in the Instace Ports
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-4.15
/cherry-pick release-4.14
/cherry-pick release-4.13
/cherry-pick release-4.12

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.

@EmilienM
Copy link
Member

We'll need to backport this one down to 4.12 I believe?

@mandre mandre deleted the fix-port-security branch March 13, 2024 08:23
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-machine-api-provider-openstack-container-v4.16.0-202403141746.p0.gbf45c1f.assembly.stream.el9 for distgit ose-machine-api-provider-openstack.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.16.0-0.nightly-2024-03-21-152650

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. jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants