Skip to content

Conversation

@xoxys
Copy link
Member

@xoxys xoxys commented Dec 18, 2025

How to categorize this PR?

/kind enhancement

What this PR does / why we need it:

Instead of using two different config formats (YAML and INI) the code was reworked to use the same YAML config for both CCM and CSI.

Special notes for your reviewer:

Breaking changes:

/hold

This change is breaking. Users must migrate their deployments for both CCM and CSI to the new YAML configuration. Even with the existing YAML configuration, the structure and names of the options have changed and must be adjusted.

@ske-prow ske-prow bot added do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 18, 2025
@xoxys xoxys added enhancement New feature or request do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Dec 18, 2025
@xoxys xoxys requested a review from a team December 18, 2025 09:09
@xoxys xoxys added kind/enhancement Enhancement, improvement, extension and removed enhancement New feature or request labels Dec 18, 2025
@ske-prow ske-prow bot removed the do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. label Dec 18, 2025
@breuerfelix
Copy link
Member

/lgtm

@ske-prow ske-prow bot added the lgtm Indicates that a PR is ready to be merged. label Dec 19, 2025
@ske-prow
Copy link

ske-prow bot commented Dec 19, 2025

LGTM label has been added.

DetailsGit tree hash: 489dd538c55e6d1ccab62eaad56d6688914f958e

@ske-prow ske-prow bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 22, 2025
@ske-prow ske-prow bot requested a review from breuerfelix December 22, 2025 08:11
@ske-prow ske-prow bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 22, 2025
@xoxys xoxys requested a review from nschad January 12, 2026 07:24
@ske-prow ske-prow bot added the lgtm Indicates that a PR is ready to be merged. label Jan 12, 2026
@ske-prow
Copy link

ske-prow bot commented Jan 12, 2026

LGTM label has been added.

DetailsGit tree hash: b0003c0867e94e1085fb9ca30a01a3deff440e5c

@breuerfelix
Copy link
Member

/lgtm

@ske-prow ske-prow bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 19, 2026
@ske-prow ske-prow bot requested a review from breuerfelix January 19, 2026 11:12
@ske-prow ske-prow bot added the lgtm Indicates that a PR is ready to be merged. label Jan 20, 2026
@ske-prow
Copy link

ske-prow bot commented Jan 20, 2026

LGTM label has been added.

DetailsGit tree hash: 7f660042fd86f23ae8d48f7ee292de42e354affe

@ske-prow ske-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 20, 2026
@ske-prow ske-prow bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 20, 2026
@ske-prow ske-prow bot requested a review from dergeberl January 20, 2026 14:58
@ftl
Copy link
Contributor

ftl commented Jan 21, 2026

/lgtm

@ske-prow ske-prow bot assigned ftl Jan 21, 2026
@ske-prow ske-prow bot added the lgtm Indicates that a PR is ready to be merged. label Jan 21, 2026
@ske-prow
Copy link

ske-prow bot commented Jan 21, 2026

LGTM label has been added.

DetailsGit tree hash: 5f21561f43a74564b504bbb0fbccf1ba085add66

@xoxys
Copy link
Member Author

xoxys commented Jan 21, 2026

/approve
/unhold

@ske-prow ske-prow bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 21, 2026
@ske-prow
Copy link

ske-prow bot commented Jan 21, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: breuerfelix, dergeberl, xoxys

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

The pull request process is described 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

@ske-prow ske-prow bot merged commit 7bf8560 into main Jan 21, 2026
3 checks passed
@ske-prow ske-prow bot deleted the yaml-config branch January 21, 2026 09:25
@xoxys
Copy link
Member Author

xoxys commented Jan 21, 2026

/cherry-pick release-v1.31
/cherry-pick release-v1.32
/cherry-pick release-v1.33
/cherry-pick release-v1.34

@stackit-ske
Copy link

@xoxys: #352 failed to apply on top of branch "release-v1.31":

Applying: Unify config files for ccm and csi
Using index info to reconstruct a base tree...
M	deploy/csi-plugin/controllerplugin.yaml
M	deploy/csi-plugin/nodeplugin.yaml
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
Auto-merging go.mod
Auto-merging deploy/csi-plugin/nodeplugin.yaml
Auto-merging deploy/csi-plugin/controllerplugin.yaml
Applying: switch back to separate configs for ccm and csi
Using index info to reconstruct a base tree...
M	pkg/ccm/loadbalancer.go
M	pkg/ccm/loadbalancer_spec.go
M	pkg/ccm/loadbalancer_spec_test.go
M	pkg/ccm/loadbalancer_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/ccm/loadbalancer_test.go
CONFLICT (content): Merge conflict in pkg/ccm/loadbalancer_test.go
Auto-merging pkg/ccm/loadbalancer_spec_test.go
CONFLICT (content): Merge conflict in pkg/ccm/loadbalancer_spec_test.go
Auto-merging pkg/ccm/loadbalancer_spec.go
CONFLICT (content): Merge conflict in pkg/ccm/loadbalancer_spec.go
Auto-merging pkg/ccm/loadbalancer.go
CONFLICT (content): Merge conflict in pkg/ccm/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 set advice.mergeConflict false"
Patch failed at 0002 switch back to separate configs for ccm and csi

Details

In response to this:

/cherry-pick release-v1.31
/cherry-pick release-v1.32
/cherry-pick release-v1.33
/cherry-pick release-v1.34

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.

@xoxys
Copy link
Member Author

xoxys commented Jan 21, 2026

/cherry-pick release-v1.31
/cherry-pick release-v1.32
/cherry-pick release-v1.33
/cherry-pick release-v1.34

@stackit-ske
Copy link

@xoxys: new pull request created: #480

Details

In response to this:

/cherry-pick release-v1.31
/cherry-pick release-v1.32
/cherry-pick release-v1.33
/cherry-pick release-v1.34

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.

@stackit-ske
Copy link

@xoxys: new pull request created: #481

Details

In response to this:

/cherry-pick release-v1.31
/cherry-pick release-v1.32
/cherry-pick release-v1.33
/cherry-pick release-v1.34

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.

@stackit-ske
Copy link

@xoxys: new pull request created: #482

Details

In response to this:

/cherry-pick release-v1.31
/cherry-pick release-v1.32
/cherry-pick release-v1.33
/cherry-pick release-v1.34

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.

@stackit-ske
Copy link

@xoxys: new pull request created: #483

Details

In response to this:

/cherry-pick release-v1.31
/cherry-pick release-v1.32
/cherry-pick release-v1.33
/cherry-pick release-v1.34

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. kind/enhancement Enhancement, improvement, extension lgtm Indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants