kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make sure to look for KIC before using oci port

pull/13639/head
Anders F Björklund 2022-04-05 20:01:50 +02:00
parent e7495ab779
commit d21342c69f
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/minikube/cmd/service.go
View File

@ -140,8 +140,10 @@ You may select another namespace by using 'minikube service {{.service}} -n <nam
}
}
if driver.NeedsPortForward(co.Config.Driver) && services != nil {
if driver.NeedsPortForward(co.Config.Driver) && driver.IsKIC(co.Config.Driver) && services != nil {
startKicServiceTunnel(services, cname, co.Config.Driver)
} else if driver.NeedsPortForward(co.Config.Driver) && driver.IsQEMU(co.Config.Driver) && services != nil {
startQemuServiceTunnel(services, cname, co.Config.Driver)
} else if !serviceURLMode {
openURLs(data)
}
@ -214,6 +216,9 @@ func startKicServiceTunnel(services service.URLs, configName, driverName string)
<-ctrlC
}
func startQemuServiceTunnel(services service.URLs, configName, driverName string) {
}
func mutateURLs(serviceName string, urls []string) ([]string, error) {
formattedUrls := make([]string, 0)
for _, rawURL := range urls {

3
cmd/minikube/cmd/tunnel.go
View File

@ -79,8 +79,7 @@ var tunnelCmd = &cobra.Command{
cancel()
}()
if driver.NeedsPortForward(co.Config.Driver) {
if driver.NeedsPortForward(co.Config.Driver) && driver.IsKIC(co.Config.Driver) {
port, err := oci.ForwardedPort(co.Config.Driver, cname, 22)
if err != nil {
exit.Error(reason.DrvPortForward, "error getting ssh port", err)

2
pkg/addons/addons.go
View File

@ -250,7 +250,7 @@ func addonSpecificChecks(cc *config.ClusterConfig, name string, enable bool, run
}
if name == "registry" {
if driver.NeedsPortForward(cc.Driver) {
if driver.NeedsPortForward(cc.Driver) && driver.IsKIC(cc.Driver) {
port, err := oci.ForwardedPort(cc.Driver, cc.Name, constants.RegistryAddonPort)
if err != nil {
return false, errors.Wrap(err, "registry port")

2
pkg/addons/addons_autopause.go
View File

@ -51,7 +51,7 @@ func enableOrDisableAutoPause(cc *config.ClusterConfig, name, val string) error
port := co.CP.Port // API server port
if enable { // if enable, calculate the forwarded port
port = constants.AutoPauseProxyPort
if driver.NeedsPortForward(cc.Driver) {
if driver.NeedsPortForward(cc.Driver) && driver.IsKIC(cc.Driver) {
port, err = oci.ForwardedPort(cc.Driver, cc.Name, port)
if err != nil {
klog.ErrorS(err, "failed to get forwarded port for", "auto-pause port", port)