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

Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.27 into release-4.14 #268

Conversation

shiftstack-merge-bot[bot]
Copy link

No description provided.

…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 upstream bump to k8s 1.23
…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
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
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
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)
…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.
@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Feb 8, 2024
Copy link

openshift-ci bot commented Feb 8, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: shiftstack-merge-bot[bot]
Once this PR has been reviewed and has the lgtm label, please assign dobsonj for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

Copy link

openshift-ci bot commented Feb 8, 2024

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 /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

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.

@mandre
Copy link
Member

mandre commented Feb 9, 2024

We've rebased on upstream stable branch. No longer needed.
/close

@openshift-ci openshift-ci bot closed this Feb 9, 2024
Copy link

openshift-ci bot commented Feb 9, 2024

@mandre: Closed this PR.

In response to this:

We've rebased on upstream stable branch. No longer needed.
/close

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.

@mandre mandre deleted the merge-bot-release-4.14 branch February 12, 2024 16:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet