Skip to content

Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.36 (789ece9) into main - #411

Open
shiftstack-merge-bot[bot] wants to merge 88 commits into
openshift:mainfrom
shiftstack:rebase-bot-main
Open

Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.36 (789ece9) into main#411
shiftstack-merge-bot[bot] wants to merge 88 commits into
openshift:mainfrom
shiftstack:rebase-bot-main

Conversation

@shiftstack-merge-bot

@shiftstack-merge-bot shiftstack-merge-bot Bot commented Jul 30, 2026

Copy link
Copy Markdown

This is an automated rebase PR generated by RebaseBot.

Summary

  • Source: https://github.com/kubernetes/cloud-provider-openstack:release-1.36
  • Destination: https://github.com/openshift/cloud-provider-openstack:main
  • 5 new upstream commits

Logs

View job log

…l tags annotations (kubernetes#3154)

* feat: add support for load balancer, listener, and pool tags annotations

* feat: refactor load balancer tag handling to use SplitTrim for better parsing

* feat: streamline load balancer listener tag management for improved consistency

* feat: address PR kubernetes#3058 review feedback for LB tag annotations

- Simplify mergeTags: drop unreachable nil check and redundant else
- Collapse repeated SplitTrim guard blocks at all tag call sites
- Correct annotation comments to comma-separated (not JSON) format
- Add TestMergeTags and listener-tag cases to TestBuildListenerCreateOpt
- Document load-balancer-tags, listener-tags and pool-tags annotations

* Address feedback

* Add withLBNameTag helper

* Rename desiredTags completely

* Change structure

* Outdated comments

* Fix mergeTags to treat empty/empty as no-op

* Prevent duplicate tags

* Also within annotations

* Make sure tags are always populated

* Sanitize user tags

* Reserved service prefix

* Introduce generic helpers

---------

Co-authored-by: A10ss <la10ss@163.com>
Co-authored-by: Alexander Stephan <alexander.stephan@sap.com>
@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 Jul 30, 2026
@openshift-ci
openshift-ci Bot requested review from gryf and stephenfin July 30, 2026 10:02
@openshift-ci

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown

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.

Details

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.

@openshift-ci

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown

[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 eshulman2 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details 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

The Keystone authentication webhook handler writes the raw bearer token
submitted in every TokenReview to the log stream when verbosity is 4 or
higher. It is pretty common to set this level (-v=4) while e.g.
debugging. Additionally, it is common for logs to be sent to a central
store, with different access controls than the main cluster. A user with
access to this store can use the captured token for replay attacks for
any user that authenticates against the cluster until the token's TTL.

Stop logging the token and avoid all of this. The combo of user, any
error and the usual timestamp etc. should be more than sufficient.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Co-authored-by: Stephen Finucane <stephenfin@redhat.com>
Adding myself to the OWNERS file.
I'm no stranger to CPO, having reviewed a number of patches already [1],
and as noted a comment [2] I intend to increase my participation to the
project.

[1] https://github.com/kubernetes/cloud-provider-openstack/pulls?q=is%3Apr+involves%3Amandre
[2] kubernetes#3166 (comment)

Co-authored-by: Martin André <m.andre@redhat.com>
…netes#3188)

* magnum-auto-healer: Add certificate validation

The controller always sets InsecureSkipVerify. The two modern Magnum
drivers in use today both use CAPI and thus kubeadm under the hood.
kubeadm injects nodes internal IPs as SANs into the certs it generates,
meaning certificate validation should pass when using the same root
cert. Thus, we add two new configuration knobs: one to point to a CA
file to use (defaulting to the well-known location k8s mounts certs to)
and another to explicitly disable verification as an escape hatch.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Assisted-by: Claude Sonnet 4.8 <noreply@anthropic.com>

* magnum-auto-healer: Document Endpoint health check parameters

Add a parameter reference table covering all Endpoint check options,
including the newly added ca-file and tls-insecure fields.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

* magnum-auto-healer: Respect the unhealthy-duration grace period

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

---------

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Co-authored-by: Stephen Finucane <stephenfin@redhat.com>
Co-authored-by: kayrus <kay.diam@gmail.com>
Co-authored-by: kayrus <kay.diam@gmail.com>
Co-authored-by: pýrus <kayrus@users.noreply.github.com>
…rvices (kubernetes#2603)

* POC of TargetNodeLabels selector on OpenStack LB

* Fix type errors

* Update implementation of getKeyValuePropertiesFromServiceAnnotation

* gofmt -w -s ./pkg

* Polish the code and add documentation

---------

Co-authored-by: Ririko Nakamura <ririko.nakamura@outlook.com>
Co-authored-by: kayrus <kay.diam@gmail.com>
stephenfin and others added 28 commits September 7, 2026 10:04
%T prints the type. %t prints the word true/false, which is what we
want. [1]

[1] https://pkg.go.dev/fmt

Conflicts:
	pkg/csi/manila/driver.go

NOTE(stephenfin): Merge conflicts are due to the absence of PR kubernetes#2734,
which we don't want to backport.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This causes issue with vendoring.
…clouds.yaml (kubernetes#2911)

* handle boolean values correctly when reading from secrets

Previously, the validator failed when attempting to parse boolean fields
like `UseClouds` in `AuthOpts` from secrets. This was due to secrets
being stored as strings, leading to a type mismatch.

Added logic to correctly parse string representations of booleans to
match the expected type in the struct.

(cherry picked from commit f3e4fdb)

* Implement clouds.yaml support and make auth params optional

Enables reading credentials/config from clouds.yaml when UseClouds is
set. Mark Region and AuthURL as optional.

(cherry picked from commit 1d66e56)
Co-authored-by: pýrus <kayrus@users.noreply.github.com>
Signed-off-by: moonek <gghonor@naver.com>
Signed-off-by: Carlos da Silva <ces.eduardo98@gmail.com>
* update test deps

* add debug logging on deployment failure, update nfs image

---------

Co-authored-by: Jesse Haka <haka.jesse@gmail.com>
Add Ella and update the cloud team members.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
The ART bot will do this for us eventually: we're just getting a bit
ahead of the curve.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This PR addresses CVE-2026-27136 (golang.org/x/net/html XSS
vulnerability via duplicate HTML attribute mishandling) by updating
golang.org/x/net from v0.53.0 to v0.55.0.

The csi-driver-manila component does not import or use
golang.org/x/net/html parser functions, so the risk is LOW
(transitive dependency only).

Update is applied for compliance with security scanning requirements.

Related: OCPBUGS-96822

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
@shiftstack-merge-bot shiftstack-merge-bot Bot changed the title Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.36 (cd1b27b) into main Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.36 (789ece9) into main Sep 7, 2026
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.