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

[occm] fix ovn security groups #2705

Merged
merged 2 commits into from
Nov 13, 2024
Merged

[occm] fix ovn security groups #2705

merged 2 commits into from
Nov 13, 2024

Conversation

zetaab
Copy link
Member

@zetaab zetaab commented Nov 4, 2024

What this PR does / why we need it: the main reason for #2699 was that svcConf.allowedCIDR was not passed to ensureAndUpdateOctaviaSecurityGroup from updateloadbalancer (it was passed from ensureloadbalancer). However, I compined some of the creating values for svcConf to new function to make it little bit easier to read and remove duplicates

Which issue this PR fixes(if applicable):
fixes #2699

Special notes for reviewers:

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label Nov 4, 2024
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 4, 2024
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 4, 2024
@zetaab
Copy link
Member Author

zetaab commented Nov 4, 2024

/test openstack-cloud-controller-manager-e2e-test

@zetaab
Copy link
Member Author

zetaab commented Nov 13, 2024

ping @kayrus @dulek currently ovn loadbalancers are kind of broken because of this. If using manage-security-groups="true"

@zetaab
Copy link
Member Author

zetaab commented Nov 13, 2024

/kind bug

@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Nov 13, 2024
@kayrus
Copy link
Contributor

kayrus commented Nov 13, 2024

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 13, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kayrus

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 13, 2024
@k8s-ci-robot k8s-ci-robot merged commit bf31268 into kubernetes:master Nov 13, 2024
6 checks passed
@zetaab zetaab deleted the fixx branch November 14, 2024 05:31
@zetaab
Copy link
Member Author

zetaab commented Nov 14, 2024

/cherry-pick release-1.31
/cherry-pick release-1.30

@k8s-infra-cherrypick-robot

@zetaab: #2705 failed to apply on top of branch "release-1.30":

Applying: fix ovn security groups
Using index info to reconstruct a base tree...
M	pkg/openstack/loadbalancer.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/openstack/loadbalancer.go
CONFLICT (content): Merge conflict in pkg/openstack/loadbalancer.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 fix ovn security groups

In response to this:

/cherry-pick release-1.31
/cherry-pick release-1.30

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-sigs/prow repository.

@zetaab
Copy link
Member Author

zetaab commented Nov 14, 2024

/cherry-pick release-1.31

@k8s-infra-cherrypick-robot

@zetaab: new pull request created: #2713

In response to this:

/cherry-pick release-1.31

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-sigs/prow repository.

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
4 participants