New flag to allow option for passing a config file for addon configure command. #20255

panyam · 2025-01-13T20:16:15Z

Minor UI Change (Before and After described in the ticket) but tl;dr:

BEFORE

Currently when configuring addons with the command:

minikube addons configure <addon>

eg:

minikube addons configure registry-creds

The user is prompted to input the values one by one, eg:

Do you want to enable AWS Elastic Container Registry? [y/n]:

and so on. This makes it hard to store/load values in a scripted environemnt. Some times it easier to provide a config file containing so that the values can be read from this.

AFTER

Add a "-f" local flag to the addon configure command, eg:

minikube addons configure registry-creds -f ~/.minikube/configs/registry-creds-config.json
minikube addons configure ingress -f ~/.minikube/configs/ingres-config.json

etc

Fixes #20124

instead of forcing prompts Fixes kubernetes#20124

k8s-ci-robot · 2025-01-13T20:16:26Z

Hi @panyam. 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.

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.

ComradeProgrammer · 2025-01-13T20:20:54Z

/ok-to-test

minikube-bot · 2025-01-13T20:21:02Z

Can one of the admins verify this patch?

cmd/minikube/cmd/config/configure.go

…ance to interfere with other possible user defaults

medyagh

this PR is exciting and its getting closer ! just a few more changes

cmd/minikube/cmd/config/configure.go

medyagh · 2025-01-22T19:30:51Z

cmd/minikube/cmd/config/configure.go

+				fmt.Sprintf("error opening config file: %v", err))
+			return nil, err
+		} else if err = json.Unmarshal(confData, &configFileData); err != nil {
+			exit.Message(reason.Kind{ExitCode: reason.ExProgramConfig, Advice: "provide a valid config file"},


"ensure the json format of the config file is valid"

medyagh · 2025-01-22T19:32:17Z

cmd/minikube/cmd/config/configure.go

+			return nil, err
+		} else if err = json.Unmarshal(confData, &configFileData); err != nil {
+			exit.Message(reason.Kind{ExitCode: reason.ExProgramConfig, Advice: "provide a valid config file"},
+				fmt.Sprintf("error opening config file: %v", err))


error wrap

errors.Wrapf(err, "addon config %s" ... )

medyagh · 2025-01-22T19:32:59Z

cmd/minikube/cmd/config/configure.go

+		} else if err = json.Unmarshal(confData, &configFileData); err != nil {
+			exit.Message(reason.Kind{ExitCode: reason.ExProgramConfig, Advice: "provide a valid config file"},
+				fmt.Sprintf("error opening config file: %v", err))
+			return nil, err


if exit no need to return

medyagh · 2025-01-22T19:34:29Z

cmd/minikube/cmd/config/configure.go

+			return nil, err
+		}
+
+		// Make sure the addon specific config exists and it is a map


make a helper function and put the nested ifs in there

medyagh · 2025-01-22T19:38:31Z

test/integration/addons_test.go

@@ -304,6 +305,64 @@ func validateIngressAddon(ctx context.Context, t *testing.T, profile string) {
 	}
 }

+// validateRegistryCredsAddon tests the registry-creds addon by trying to load its configs
+func validateRegistryCredsAddon(ctx context.Context, t *testing.T, profile string) {


lets use a struct for the regsitry cred addons so it can be typed checked

cmd/minikube/cmd/config/configure.go

cmd/minikube/cmd/config/configure_registry_creds.go

cmd/minikube/cmd/config/configure.go

medyagh · 2025-05-12T17:16:30Z

/ok-to-test

medyagh · 2025-05-12T23:45:13Z

/lgtm

medyagh · 2025-05-12T23:46:51Z

cmd/minikube/cmd/config/configure_registry_creds.go

@@ -0,0 +1,257 @@
+package config


this new files needs copyright boiler plate to be added to the header

k8s-ci-robot · 2025-05-13T00:51:22Z

Keywords which can automatically close issues and at(@) or hashtag(#) mentions are not allowed in commit messages.

The list of commits with invalid commit messages:

d105076 Addon configuration now takes an optional config file to load from

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 · 2025-05-13T02:17:47Z

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 20255) |
+----------------+----------+---------------------+
| minikube start | 51.6s    | 53.5s               |
| enable ingress | 18.0s    | 19.1s               |
+----------------+----------+---------------------+

Times for minikube start: 51.6s 52.0s 50.2s 51.9s 52.2s
Times for minikube (PR 20255) start: 52.5s 52.6s 55.6s 52.8s 54.0s

Times for minikube (PR 20255) ingress: 19.1s 19.1s 19.0s 19.1s 19.0s
Times for minikube ingress: 16.1s 19.1s 19.6s 15.6s 19.6s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 20255) |
+----------------+----------+---------------------+
| minikube start | 24.8s    | 24.3s               |
| enable ingress | 12.9s    | 13.2s               |
+----------------+----------+---------------------+

Times for minikube ingress: 13.3s 13.4s 12.3s 13.3s 12.3s
Times for minikube (PR 20255) ingress: 13.3s 13.3s 13.3s 12.8s 13.3s

Times for minikube start: 26.2s 22.2s 26.9s 25.6s 23.2s
Times for minikube (PR 20255) start: 24.4s 27.0s 21.5s 22.7s 25.9s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 20255) |
+----------------+----------+---------------------+
| minikube start | 22.9s    | 23.6s               |
| enable ingress | 30.0s    | 26.0s               |
+----------------+----------+---------------------+

Times for minikube ingress: 26.8s 38.8s 22.8s 38.8s 22.8s
Times for minikube (PR 20255) ingress: 22.8s 22.8s 22.8s 38.8s 22.8s

Times for minikube start: 22.2s 23.1s 22.4s 24.4s 22.3s
Times for minikube (PR 20255) start: 21.9s 24.2s 22.6s 23.2s 25.9s

medyagh · 2025-05-13T17:10:44Z

/lgtm

medyagh · 2025-05-13T18:05:45Z

/lgtm

k8s-ci-robot · 2025-05-13T18:05:53Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: medyagh, panyam

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [medyagh]

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

Addon configuration now takes an optional config file to load from

d105076

instead of forcing prompts Fixes kubernetes#20124

k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 13, 2025

k8s-ci-robot requested review from ComradeProgrammer and prezha January 13, 2025 20:16

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jan 13, 2025

k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jan 13, 2025

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 Jan 13, 2025

panyam changed the title ~~Addon configuration now takes an optional config file to load from~~ New flag to allow option for passing a config file for addon configure command. Jan 13, 2025

This comment has been minimized.

Sign in to view

medyagh requested changes Jan 17, 2025

View reviewed changes

cmd/minikube/cmd/config/configure.go Outdated Show resolved Hide resolved

panyam added 2 commits January 17, 2025 11:43

Using a rarer value for default instead of changeme so it has less ch…

5cbc860

…ance to interfere with other possible user defaults

Merge branch 'kubernetes:master' into addon-cfg-from-file

0f0c407

This comment has been minimized.

Sign in to view

Fixing expected values of test cases

1485c75

This comment has been minimized.

Sign in to view

making addonConfigFile private

f5776e7

medyagh requested changes Jan 22, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

Merge branch 'kubernetes:master' into addon-cfg-from-file

966e8b9

This comment has been minimized.

Sign in to view

Merge branch 'kubernetes:master' into addon-cfg-from-file

5a169eb

nirs reviewed May 5, 2025

View reviewed changes

cmd/minikube/cmd/config/configure.go Show resolved Hide resolved

cmd/minikube/cmd/config/configure.go Show resolved Hide resolved

panyam commented May 7, 2025

View reviewed changes

cmd/minikube/cmd/config/configure_registry_creds.go Show resolved Hide resolved

cmd/minikube/cmd/config/configure.go Outdated Show resolved Hide resolved

Making registry creds structs private and other PR feedback cleanups

49b651d

This comment has been minimized.

Sign in to view

medyagh self-requested a review May 8, 2025 17:58

panyam added 4 commits May 12, 2025 08:46

Changing default value back to 'changeme'

3adcb9b

Merge branch 'kubernetes:master' into addon-cfg-from-file

27a9403

Simplifying duplicate consts

7150b83

Adding missed comma

423be4d

lint fixes

0a7f10c

This comment has been minimized.

Sign in to view

Generating docs

3e5176e

This comment has been minimized.

Sign in to view

k8s-ci-robot assigned medyagh May 12, 2025

k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 12, 2025

medyagh requested changes May 12, 2025

View reviewed changes

k8s-ci-robot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 12, 2025

Copyright for new file

f083400

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 13, 2025

k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 13, 2025

medyagh merged commit 7b97f42 into kubernetes:master May 13, 2025
28 of 37 checks passed

New flag to allow option for passing a config file for addon configure command. #20255

New flag to allow option for passing a config file for addon configure command. #20255

Uh oh!

Conversation

panyam commented Jan 13, 2025

BEFORE

AFTER

Uh oh!

k8s-ci-robot commented Jan 13, 2025

Uh oh!

ComradeProgrammer commented Jan 13, 2025

Uh oh!

minikube-bot commented Jan 13, 2025

Uh oh!

This comment has been minimized.

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

medyagh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

medyagh Jan 22, 2025

Choose a reason for hiding this comment

Uh oh!

medyagh Jan 22, 2025

Choose a reason for hiding this comment

Uh oh!

medyagh Jan 22, 2025

Choose a reason for hiding this comment

Uh oh!

medyagh Jan 22, 2025

Choose a reason for hiding this comment

Uh oh!

medyagh Jan 22, 2025

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

medyagh commented May 12, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

medyagh commented May 12, 2025

Uh oh!

medyagh May 12, 2025

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented May 13, 2025

Uh oh!

minikube-pr-bot commented May 13, 2025

Uh oh!

medyagh commented May 13, 2025

Uh oh!

medyagh commented May 13, 2025

Uh oh!

Uh oh!

k8s-ci-robot commented May 13, 2025

Uh oh!

Uh oh!