Skip to content

Commit

Permalink
Merge pull request #14499 from inifares23lab/master
Browse files Browse the repository at this point in the history
add VerifiedMaintainer field to Addons and display a warning if empty
  • Loading branch information
spowelljr authored Jul 26, 2022
2 parents e3704e4 + 7dfe7e6 commit 0d274d5
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 46 deletions.
17 changes: 17 additions & 0 deletions cmd/minikube/cmd/config/enable.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"k8s.io/minikube/pkg/addons"
"k8s.io/minikube/pkg/minikube/assets"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/constants"
"k8s.io/minikube/pkg/minikube/exit"
Expand Down Expand Up @@ -54,6 +55,22 @@ var addonsEnableCmd = &cobra.Command{
if addon == "olm" {
out.Styled(style.Warning, "The OLM addon has stopped working, for more details visit: https://github.com/operator-framework/operator-lifecycle-manager/issues/2534")
}
addonBundle, ok := assets.Addons[addon]
if ok {
maintainer := addonBundle.Maintainer
if maintainer == "Google" || maintainer == "Kubernetes" {
out.Styled(style.Tip, `{{.addon}} is an addon maintained by {{.maintainer}}. For any concerns contact minikube on GitHub.
You can view the list of minikube maintainers at: https://github.com/kubernetes/minikube/blob/master/OWNERS`,
out.V{"addon": addon, "maintainer": maintainer})
} else {
out.Styled(style.Warning, `{{.addon}} is a 3rd party addon and not maintained or verified by minikube maintainers, enable at your own risk.`,
out.V{"addon": addon})
if addonBundle.VerifiedMaintainer != "" {
out.Styled(style.Tip, `{{.addon}} is maintained by {{.maintainer}} for any concerns contact {{.verifiedMaintainer}} on GitHub.`,
out.V{"addon": addon, "maintainer": maintainer, "verifiedMaintainer": addonBundle.VerifiedMaintainer})
}
}
}
viper.Set(config.AddonImages, images)
viper.Set(config.AddonRegistries, registries)
err := addons.SetAndSave(ClusterFlagValue(), addon, "true")
Expand Down
Loading

0 comments on commit 0d274d5

Please sign in to comment.