Skip to content

Commit a13e5e5

Browse files
authored
Merge pull request #8870 from Dean-Coakley/add-ingress-noneDriver-warn
Add warning for ingress addon enabled with driver of none
2 parents 108d2fa + 9c23485 commit a13e5e5

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

Diff for: pkg/addons/addons.go

+8-3
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,20 @@ func enableOrDisableAddon(cc *config.ClusterConfig, name string, val string) err
141141
}
142142
}
143143

144-
// to match both ingress and ingress-dns adons
145-
if strings.HasPrefix(name, "ingress") && enable && driver.IsKIC(cc.Driver) && runtime.GOOS != "linux" {
146-
exit.UsageT(`Due to {{.driver_name}} networking limitations on {{.os_name}}, {{.addon_name}} addon is not supported for this driver.
144+
// to match both ingress and ingress-dns addons
145+
if strings.HasPrefix(name, "ingress") && enable {
146+
if driver.IsKIC(cc.Driver) && runtime.GOOS != "linux" {
147+
exit.UsageT(`Due to networking limitations of driver {{.driver_name}} on {{.os_name}}, {{.addon_name}} addon is not supported.
147148
Alternatively to use this addon you can use a vm-based driver:
148149
149150
'minikube start --vm=true'
150151
151152
To track the update on this work in progress feature please check:
152153
https://github.com/kubernetes/minikube/issues/7332`, out.V{"driver_name": cc.Driver, "os_name": runtime.GOOS, "addon_name": name})
154+
} else if driver.BareMetal(cc.Driver) {
155+
exit.UsageT(`Due to networking limitations of driver {{.driver_name}}, {{.addon_name}} addon is not supported. Try using a different driver.`,
156+
out.V{"driver_name": cc.Driver, "addon_name": name})
157+
}
153158
}
154159

155160
if strings.HasPrefix(name, "istio") && enable {

0 commit comments

Comments
 (0)