Skip to content

[backport v2.11] Preserves kube-apiserver-arg, webhook prepends PSACT mount path if needed #1123

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Oct 6, 2025
Merged

[backport v2.11] Preserves kube-apiserver-arg, webhook prepends PSACT mount path if needed #1123

merged 1 commit into from
Oct 6, 2025

Conversation

@apoorvajagtap
Copy link
Contributor

@apoorvajagtap apoorvajagtap commented Oct 1, 2025 •
edited
Loading

Backport of: #1096

Issue: rancher/rancher#51953

Problem

Per the changes introduces with #913, the kube-apiserver-arg are deduplicated. This causes issues for k8s-specific flags that are allowed to be specified multiple times.

Solution

This commit instead of maintaining a keyValueArg{} struct:

  • Parses the arguments as a []string.
  • Deletes/Prepends the kubeAPIAdmissionConfigOption key-value pair as per the condition.
  • Sets the arguments back as is (ensuring no modification to the user-specified args).

CheckList

  • Test
  • Docs

@apoorvajagtap apoorvajagtap requested a review from a team as a code owner October 1, 2025 09:00
@apoorvajagtap apoorvajagtap marked this pull request as draft October 1, 2025 09:01
@apoorvajagtap apoorvajagtap force-pushed the backport11-deduplicate-51942 branch 2 times, most recently from 5e73b8c to f7dd6b3 Compare October 1, 2025 12:34
@apoorvajagtap apoorvajagtap force-pushed the backport11-deduplicate-51942 branch from f7dd6b3 to dafc60e Compare October 1, 2025 12:37
@apoorvajagtap apoorvajagtap marked this pull request as ready for review October 1, 2025 12:40
@apoorvajagtap apoorvajagtap merged commit 168d987 into rancher:release/v0.7 Oct 6, 2025
2 checks passed
This was referenced Oct 6, 2025
Merged
Merged
This was referenced Oct 17, 2025
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@crobby crobby crobby approved these changes

@jiaqiluo jiaqiluo jiaqiluo approved these changes

@jakefhyde jakefhyde jakefhyde approved these changes

@brandond brandond Awaiting requested review from brandond

@tomleb tomleb Awaiting requested review from tomleb

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@apoorvajagtap @crobby @jiaqiluo @jakefhyde