Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.27 into release-4.14 #270
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![shiftstack-merge-bot[bot]](https://avatars.githubusercontent.com/u/48560946?s=60&v=4){kind=small}
…enshift-4.10-ose-openstack-cinder-csi-driver Updating ose-openstack-cinder-csi-driver images to be consistent with ART
Bug 2034537: OWNERS: Update ShiftStack members
Bug 2036569: Merge https://github.com/kubernetes/cloud-provider-openstack:master into master
Bug 2036569: Merge upstream bump to k8s 1.23
shiftstack: Update OWNERS
…penshift-4.11-ose-openstack-cloud-controller-manager Updating ose-openstack-cloud-controller-manager images to be consistent with ART
…penshift-4.11-ose-openstack-cinder-csi-driver Updating ose-openstack-cinder-csi-driver images to be consistent with ART
…penshift-4.11-csi-driver-manila Updating csi-driver-manila images to be consistent with ART
K8s denotes protocol names in uppercase (TCP) while Neutron uses lowercase (tcp) on the security group rules. This created conflicts and caused occm to incorrectly compare SG rules and make unnecessary creates and deletes. This commit fixes that by making sure we're always comparing `ToLower()` version of the protocol name. Also I made sure that we're always passing lowercase to the Neutron SG rule creation API too.
Sync from upstream
Conflicts:
OWNERS
charts/cinder-csi-plugin/Chart.yaml
charts/manila-csi-plugin/Chart.yaml
charts/openstack-cloud-controller-manager/Chart.yaml
docs/keystone-auth/using-keystone-webhook-authenticator-and-authorizer.md
docs/magnum-auto-healer/using-magnum-auto-healer.md
docs/octavia-ingress-controller/using-octavia-ingress-controller.md
examples/webhook/keystone-deployment.yaml
manifests/barbican-kms/ds.yaml
manifests/barbican-kms/pod.yaml
manifests/cinder-csi-plugin/cinder-csi-controllerplugin.yaml
manifests/cinder-csi-plugin/cinder-csi-nodeplugin.yaml
manifests/controller-manager/openstack-cloud-controller-manager-ds.yaml
manifests/controller-manager/openstack-cloud-controller-manager-pod.yaml
manifests/magnum-auto-healer/magnum-auto-healer.yaml
manifests/manila-csi-plugin/csi-controllerplugin.yaml
manifests/manila-csi-plugin/csi-nodeplugin.yaml
pkg/csi/manila/controllerserver.go
tests/playbooks/roles/install-cpo-occm/defaults/main.yaml
tests/playbooks/roles/install-csi-cinder/tasks/main.yaml
OCPBUGS-20392: Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.27 into release-4.14
This should allow us to remove the carry and avoid merge conflicts on upstream OWNERS.
…ry-pick-223-to-release-4.14 OCPBUGS-20568: [release-4.14] CARRY: Add DOWNSTREAM_OWNERS
OCPBUGS-21614: Merge branch 'release-1.27' into release-4.14
…1.27 into release-4.14
OCPBUGS-21271: Merge kubernetes/cloud-provider-openstack:release-1.27 into release-4.14
Previous code for manage-security-groups were adding the SGs to all the ports attached to the Node. That doesn't make a lot of sense, we only need this traffic opened to the LB members and we only add one port of the Node as the LB member. Moreover we've even tried to add SGs to the ports that had `port_security_enabled=false` which obviously failed. This patch makes sure that we only add the SG opening NodePort traffic to the port that is actually plugged into the LB. Moreover it adds a check for `port_security_enabled` to make sure that ports with it disabled are ignored.
OCPBUGS-22974: [release-4.14] manage-security-groups: Only add SGs to LB members (kubernetes#2455)
…1.27 into release-4.14
OCPBUGS-25804: Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.27 into release-4.14
…ry-pick-259-to-release-4.14 OCPBUGS-27026: [release-4.14] Add .snyk file
The test image was recently changed and now ships with go1.22rc2. We need to use a version of golangci-lint that is compatible with it.
…1.27 into release-4.14
openshift-ci
bot
added
the
needs-ok-to-test
|
Hi @shiftstack-merge-bot[bot]. Thanks for your PR. I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. 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. |
|
mergebot is doing something it shouldn't. |
openshift-ci
bot
added
the
do-not-merge/hold
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.