Fix `--extra-config=etcd.*` producing invalid kubeadm config by noamcohen97 · Pull Request #23051 · kubernetes/minikube

noamcohen97 · 2026-05-26T14:37:26Z

TestGenerateKubeadmYAML now verifies that every successful render is parseable YAML, and a new etcd-extra-args case so the bug is caught by the existing test.

The original PR (#22575) addressing this is stale, so opening this as a replacement.

Diff

 etcd:
   local:
-    dataDir: /var/lib/minikube/etcd    extraArgs:
+    dataDir: /var/lib/minikube/etcd
+    extraArgs:
       - name: "listen-metrics-urls"
         value: "http://0.0.0.0:2381"

Fixes #21840

k8s-ci-robot · 2026-05-26T14:37:35Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: noamcohen97
Once this PR has been reviewed and has the lgtm label, please assign comradeprogrammer 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:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

linux-foundation-easycla · 2026-05-26T14:37:36Z

The committers listed above are authorized under a signed CLA.

✅ login: noamcohen97 / name: Noam Cohen (b197243)

k8s-ci-robot · 2026-05-26T14:37:37Z

Welcome @noamcohen97!

It looks like this is your first PR to kubernetes/minikube 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/minikube has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2026-05-26T14:37:38Z

Hi @noamcohen97. Thanks for your PR.

I'm waiting for a kubernetes 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.

minikube-bot · 2026-05-26T14:39:06Z

Can one of the admins verify this patch?

noamcohen97 · 2026-05-26T14:52:06Z

/kind bug

medyagh · 2026-05-26T22:23:01Z

/ok-to-test

Copilot

Pull request overview

Fixes a kubeadm v1beta4 template rendering bug where etcd.local.dataDir and extraArgs could be emitted on the same line, producing invalid YAML when using --extra-config=etcd.*. The PR also strengthens the kubeadm YAML generation tests to ensure all successful renders are syntactically parseable YAML and adds a dedicated regression case for etcd extra args.

Changes:

Adjust ktmpl.V1Beta4 to render etcd.local.extraArgs on a new line (fixing the missing linebreak).
Add assertGeneratedYAML test helper to validate generated output parses as YAML (multi-document) before doing golden-file comparisons.
Add etcd-extra-args golden testdata for v1.31–v1.36 and a matching test case so the regression is covered.

Reviewed changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta4.go	Fixes whitespace trimming/newline placement so `extraArgs` no longer attaches to `dataDir` line.
pkg/minikube/bootstrapper/bsutil/kubeadm_test.go	Adds YAML parse validation via a shared helper and introduces an `etcd-extra-args` test case.
pkg/minikube/bootstrapper/bsutil/testdata/v1.31/etcd-extra-args.yaml	Golden output for the new etcd extra args regression case (v1.31).
pkg/minikube/bootstrapper/bsutil/testdata/v1.32/etcd-extra-args.yaml	Golden output for the new etcd extra args regression case (v1.32).
pkg/minikube/bootstrapper/bsutil/testdata/v1.33/etcd-extra-args.yaml	Golden output for the new etcd extra args regression case (v1.33).
pkg/minikube/bootstrapper/bsutil/testdata/v1.34/etcd-extra-args.yaml	Golden output for the new etcd extra args regression case (v1.34).
pkg/minikube/bootstrapper/bsutil/testdata/v1.35/etcd-extra-args.yaml	Golden output for the new etcd extra args regression case (v1.35).
pkg/minikube/bootstrapper/bsutil/testdata/v1.36/etcd-extra-args.yaml	Golden output for the new etcd extra args regression case (v1.36).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

noamcohen97 · 2026-05-27T05:45:25Z

/test pull-minikube-docker-docker-linux-x86

k8s-ci-robot · 2026-06-02T16:07:36Z

@noamcohen97: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-minikube-kvm-docker-linux-x86	`db1b5cf`	link	true	`/test pull-minikube-kvm-docker-linux-x86`
pull-minikube-kvm-containerd-linux-x86	`db1b5cf`	link	true	`/test pull-minikube-kvm-containerd-linux-x86`
pull-minikube-none-docker-linux-x86	`db1b5cf`	link	true	`/test pull-minikube-none-docker-linux-x86`
pull-minikube-docker-containerd-linux-x86	`db1b5cf`	link	true	`/test pull-minikube-docker-containerd-linux-x86`
pull-minikube-docker-crio-linux-x86	`db1b5cf`	link	false	`/test pull-minikube-docker-crio-linux-x86`
pull-minikube-docker-docker-linux-x86	`db1b5cf`	link	true	`/test pull-minikube-docker-docker-linux-x86`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

minikube-pr-bot · 2026-06-02T16:09:03Z

kvm2 driver with docker runtime

┌────────────────┬──────────┬────────────────────────┐
│    COMMAND     │ MINIKUBE │ MINIKUBE  ( PR 23051 ) │
├────────────────┼──────────┼────────────────────────┤
│ minikube start │ 39.4s    │ 40.0s                  │
│ enable ingress │ 19.2s    │ 19.0s                  │
└────────────────┴──────────┴────────────────────────┘

Details

Times for minikube (PR 23051) start: 40.8s 39.8s 39.8s 39.4s 40.2s
Times for minikube start: 38.3s 41.1s 37.4s 40.9s 39.6s

Times for minikube ingress: 19.3s 19.3s 18.8s 19.3s 19.3s
Times for minikube (PR 23051) ingress: 18.8s 18.8s 19.3s 19.3s 18.8s

docker driver with docker runtime

┌────────────────┬──────────┬────────────────────────┐
│    COMMAND     │ MINIKUBE │ MINIKUBE  ( PR 23051 ) │
├────────────────┼──────────┼────────────────────────┤
│ minikube start │ 21.6s    │ 19.5s                  │
│ enable ingress │ 11.8s    │ 12.6s                  │
└────────────────┴──────────┴────────────────────────┘

Details

Times for minikube ingress: 10.6s 12.7s 12.6s 10.6s 12.7s
Times for minikube (PR 23051) ingress: 12.6s 12.7s 12.6s 12.7s 12.6s

Times for minikube start: 21.0s 21.7s 22.1s 21.8s 21.2s
Times for minikube (PR 23051) start: 21.7s 17.9s 18.3s 18.6s 21.0s

docker driver with containerd runtime

┌────────────────┬──────────┬────────────────────────┐
│    COMMAND     │ MINIKUBE │ MINIKUBE  ( PR 23051 ) │
├────────────────┼──────────┼────────────────────────┤
│ minikube start │ 16.9s    │ 17.6s                  │
│ enable ingress │ 24.7s    │ 26.0s                  │
└────────────────┴──────────┴────────────────────────┘

Details

Times for minikube start: 18.6s 16.1s 17.0s 16.6s 16.1s
Times for minikube (PR 23051) start: 18.8s 16.4s 16.5s 19.2s 17.2s

Times for minikube ingress: 25.1s 24.6s 24.6s 24.6s 24.6s
Times for minikube (PR 23051) ingress: 32.6s 25.1s 25.1s 24.6s 22.6s

k8s-ci-robot requested a review from ComradeProgrammer May 26, 2026 14:37

k8s-ci-robot requested a review from medyagh May 26, 2026 14:37

k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels May 26, 2026

k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label May 26, 2026

Fix v1beta4 etcd extraArgs missing newline

b197243

noamcohen97 force-pushed the fix-v1beta4-etcd-extraargs-newline branch from a81ff70 to b197243 Compare May 26, 2026 14:50

k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels May 26, 2026

medyagh requested a review from Copilot May 26, 2026 22:22

Copilot started reviewing on behalf of medyagh May 26, 2026 22:22 View session

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 26, 2026

Copilot AI reviewed May 26, 2026

View reviewed changes

This comment has been minimized.

Sign in to view

Merge branch 'master' into fix-v1beta4-etcd-extraargs-newline

db1b5cf

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix `--extra-config=etcd.*` producing invalid kubeadm config#23051

Fix `--extra-config=etcd.*` producing invalid kubeadm config#23051
noamcohen97 wants to merge 2 commits into
kubernetes:masterfrom
noamcohen97:fix-v1beta4-etcd-extraargs-newline

noamcohen97 commented May 26, 2026

Uh oh!

k8s-ci-robot commented May 26, 2026

Uh oh!

linux-foundation-easycla Bot commented May 26, 2026 •

edited

Loading

Uh oh!

k8s-ci-robot commented May 26, 2026

Uh oh!

k8s-ci-robot commented May 26, 2026

Uh oh!

minikube-bot commented May 26, 2026

Uh oh!

noamcohen97 commented May 26, 2026

Uh oh!

medyagh commented May 26, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

This comment has been minimized.

noamcohen97 commented May 27, 2026

Uh oh!

k8s-ci-robot commented Jun 2, 2026

Uh oh!

minikube-pr-bot commented Jun 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

noamcohen97 commented May 26, 2026

Diff

Uh oh!

k8s-ci-robot commented May 26, 2026

Uh oh!

linux-foundation-easycla Bot commented May 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented May 26, 2026

Uh oh!

k8s-ci-robot commented May 26, 2026

Uh oh!

minikube-bot commented May 26, 2026

Uh oh!

noamcohen97 commented May 26, 2026

Uh oh!

medyagh commented May 26, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

This comment has been minimized.

noamcohen97 commented May 27, 2026

Uh oh!

k8s-ci-robot commented Jun 2, 2026

Uh oh!

minikube-pr-bot commented Jun 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

linux-foundation-easycla Bot commented May 26, 2026 •

edited

Loading