Merge pull request #21786 from nirs/registry-creds-fix

medyagh · web-flow · commit 5ca02f9f576d · 2025-10-23T11:15:11.000-07:00
registry-creds: Fix segfault without config file
diff --git a/cmd/minikube/cmd/config/configure.go b/cmd/minikube/cmd/config/configure.go
@@ -156,10 +156,9 @@ func loadAddonConfigFile(addon, configFilePath string) (ac *addonConfig) {
 			exit.Message(reason.Kind{ExitCode: reason.ExProgramConfig, Advice: "provide a valid config file"},
 				fmt.Sprintf("error reading config file: %v", err))
 		}
-
-		return &cf.Addons
 	}
-	return nil
+
+	return &cf.Addons
 }
 
 // Processes metallb addon config from configFile if it exists otherwise resorts to default behavior

Original file line number	Diff line number	Diff line change
`@@ -156,10 +156,9 @@ func loadAddonConfigFile(addon, configFilePath string) (ac *addonConfig) {`
`156`	`156`	`exit.Message(reason.Kind{ExitCode: reason.ExProgramConfig, Advice: "provide a valid config file"},`
`157`	`157`	`fmt.Sprintf("error reading config file: %v", err))`
`158`	`158`	`}`
`159`		`-`
`160`		`- return &cf.Addons`
`161`	`159`	`}`
`162`		`- return nil`
	`160`	`+`
	`161`	`+ return &cf.Addons`
`163`	`162`	`}`
`164`	`163`
`165`	`164`	`// Processes metallb addon config from configFile if it exists otherwise resorts to default behavior`