Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

virtualbox: change default host-only-cidr #12811

Merged
merged 1 commit into from
Nov 2, 2021
Merged

virtualbox: change default host-only-cidr #12811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/minikube/cmd/start_flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ func initDriverFlags() {
startCmd.Flags().Int(kvmNUMACount, 1, "Simulate numa node count in minikube, supported numa node count range is 1-8 (kvm2 driver only)")

// virtualbox
startCmd.Flags().String(hostOnlyCIDR, "192.168.99.1/24", "The CIDR to be used for the minikube VM (virtualbox driver only)")
startCmd.Flags().String(hostOnlyCIDR, "192.168.59.1/24", "The CIDR to be used for the minikube VM (virtualbox driver only)")
startCmd.Flags().Bool(dnsProxy, false, "Enable proxy for NAT DNS requests (virtualbox driver only)")
startCmd.Flags().Bool(hostDNSResolver, true, "Enable host resolver for NAT DNS requests (virtualbox driver only)")
startCmd.Flags().Bool(noVTXCheck, false, "Disable checking for the availability of hardware virtualization before the vm is started (virtualbox driver only)")
Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/config/profile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ func TestGetPrimaryControlPlane(t *testing.T) {
expectedName string
}{
{"old style", "p1", "192.168.64.75", 8443, "minikube"},
{"new style", "p2_newformat", "192.168.99.136", 8443, "m01"},
{"new style", "p2_newformat", "192.168.59.136", 8443, "m01"},
}

for _, tc := range tests {
Expand Down
4 changes: 2 additions & 2 deletions pkg/minikube/config/testdata/.minikube/profiles/p1/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down Expand Up @@ -47,4 +47,4 @@
"ShouldLoadCachedImages": true,
"EnableDefaultCNI": false
}
}
}
6 changes: 3 additions & 3 deletions pkg/minikube/config/testdata/.minikube/profiles/p2_newformat/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down Expand Up @@ -46,11 +46,11 @@
"Nodes": [
{
"Name": "m01",
"IP": "192.168.99.136",
"IP": "192.168.59.136",
"Port": 8443,
"KubernetesVersion": "v1.15.0",
"ControlPlane": true,
"Worker": true
}
]
}
}
4 changes: 2 additions & 2 deletions pkg/minikube/config/testdata/.minikube/profiles/p5_partial_config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down Expand Up @@ -44,4 +44,4 @@
"ShouldLoadCachedImages": true,
"EnableDefaultCNI": false
}
}
}
4 changes: 2 additions & 2 deletions pkg/minikube/config/testdata/delete-all/.minikube/profiles/p1/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down Expand Up @@ -46,4 +46,4 @@
"ShouldLoadCachedImages": true,
"EnableDefaultCNI": false
}
}
}
4 changes: 2 additions & 2 deletions ...ikube/config/testdata/delete-all/.minikube/profiles/p4_partial_profile_config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down Expand Up @@ -44,4 +44,4 @@
"ShouldLoadCachedImages": true,
"EnableDefaultCNI": false
}
}
}
4 changes: 2 additions & 2 deletions ...ikube/config/testdata/delete-all/.minikube/profiles/p5_missing_machine_config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down Expand Up @@ -46,4 +46,4 @@
"ShouldLoadCachedImages": true,
"EnableDefaultCNI": false
}
}
}
4 changes: 2 additions & 2 deletions ...inikube/config/testdata/delete-all/.minikube/profiles/p6_empty_machine_config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down Expand Up @@ -46,4 +46,4 @@
"ShouldLoadCachedImages": true,
"EnableDefaultCNI": false
}
}
}
4 changes: 2 additions & 2 deletions ...ikube/config/testdata/delete-all/.minikube/profiles/p7_invalid_machine_config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down Expand Up @@ -46,4 +46,4 @@
"ShouldLoadCachedImages": true,
"EnableDefaultCNI": false
}
}
}
2 changes: 1 addition & 1 deletion ...ikube/config/testdata/delete-all/.minikube/profiles/p8_partial_machine_config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down
4 changes: 2 additions & 2 deletions pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down Expand Up @@ -46,4 +46,4 @@
"ShouldLoadCachedImages": true,
"EnableDefaultCNI": false
}
}
}
4 changes: 2 additions & 2 deletions ...be/config/testdata/delete-single/.minikube/profiles/p4_partial_profile_config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down Expand Up @@ -44,4 +44,4 @@
"ShouldLoadCachedImages": true,
"EnableDefaultCNI": false
}
}
}
4 changes: 2 additions & 2 deletions ...be/config/testdata/delete-single/.minikube/profiles/p5_missing_machine_config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down Expand Up @@ -46,4 +46,4 @@
"ShouldLoadCachedImages": true,
"EnableDefaultCNI": false
}
}
}
4 changes: 2 additions & 2 deletions ...kube/config/testdata/delete-single/.minikube/profiles/p6_empty_machine_config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down Expand Up @@ -46,4 +46,4 @@
"ShouldLoadCachedImages": true,
"EnableDefaultCNI": false
}
}
}
4 changes: 2 additions & 2 deletions ...be/config/testdata/delete-single/.minikube/profiles/p7_invalid_machine_config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down Expand Up @@ -46,4 +46,4 @@
"ShouldLoadCachedImages": true,
"EnableDefaultCNI": false
}
}
}
2 changes: 1 addition & 1 deletion ...be/config/testdata/delete-single/.minikube/profiles/p8_partial_machine_config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down
4 changes: 2 additions & 2 deletions pkg/minikube/config/testdata/profile/.minikube/profiles/p1/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down Expand Up @@ -46,4 +46,4 @@
"ShouldLoadCachedImages": true,
"EnableDefaultCNI": false
}
}
}
6 changes: 3 additions & 3 deletions pkg/minikube/config/testdata/profile/.minikube/profiles/p2_newformat/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down Expand Up @@ -45,11 +45,11 @@
"Nodes": [
{
"Name": "m01",
"IP": "192.168.99.136",
"IP": "192.168.59.136",
"Port": 8443,
"KubernetesVersion": "v1.15.0",
"ControlPlane": true,
"Worker": true
}
]
}
}
4 changes: 2 additions & 2 deletions pkg/minikube/config/testdata/profile/.minikube/profiles/p5_partial_config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"DockerEnv": null,
"InsecureRegistry": null,
"RegistryMirror": null,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HypervVirtualSwitch": "",
"KVMNetwork": "default",
"KVMQemuURI": "qemu:///system",
Expand Down Expand Up @@ -42,4 +42,4 @@
"ShouldLoadCachedImages": true,
"EnableDefaultCNI": false
}
}
}
2 changes: 1 addition & 1 deletion pkg/minikube/kubeconfig/kubeconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ func minikubeConfig(config *api.Config) {
// cluster
clusterName := "minikube"
cluster := api.NewCluster()
cluster.Server = "https://192.168.99.100:" + strconv.Itoa(constants.APIServerPort)
cluster.Server = "https://192.168.59.100:" + strconv.Itoa(constants.APIServerPort)
cluster.CertificateAuthority = "/home/tux/.minikube/apiserver.crt"
config.Clusters[clusterName] = cluster

Expand Down
4 changes: 2 additions & 2 deletions pkg/minikube/machine/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (

const vboxConfig = `
{
"IPAddress": "192.168.99.101",
"IPAddress": "192.168.59.101",
"MachineName": "minikube",
"SSHUser": "docker",
"SSHPort": 33627,
Expand All @@ -50,7 +50,7 @@ const vboxConfig = `
"Boot2DockerURL": "file:///home/sundarp/.minikube/cache/iso/minikube-v1.0.6.iso",
"Boot2DockerImportVM": "",
"HostDNSResolver": false,
"HostOnlyCIDR": "192.168.99.1/24",
"HostOnlyCIDR": "192.168.59.1/24",
"HostOnlyNicType": "82540EM",
"HostOnlyPromiscMode": "deny",
"UIType": "headless",
Expand Down
10 changes: 5 additions & 5 deletions pkg/minikube/service/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,9 +364,9 @@ func TestOptionallyHttpsFormattedUrlString(t *testing.T) {
}{
{
description: "no https for http schemed with no https option",
bareURLString: "http://192.168.99.100:30563",
bareURLString: "http://192.168.59.100:30563",
https: false,
expectedHTTPSFormattedURLString: "http://192.168.99.100:30563",
expectedHTTPSFormattedURLString: "http://192.168.59.100:30563",
expectedIsHTTPSchemedURL: true,
},
{
Expand All @@ -378,9 +378,9 @@ func TestOptionallyHttpsFormattedUrlString(t *testing.T) {
},
{
description: "https for http schemed with https option",
bareURLString: "http://192.168.99.100:30563",
bareURLString: "http://192.168.59.100:30563",
https: true,
expectedHTTPSFormattedURLString: "https://192.168.99.100:30563",
expectedHTTPSFormattedURLString: "https://192.168.59.100:30563",
expectedIsHTTPSchemedURL: true,
},
{
Expand Down Expand Up @@ -568,7 +568,7 @@ func TestGetCoreClient(t *testing.T) {
mockK8sConfig := `apiVersion: v1
clusters:
- cluster:
server: https://192.168.99.102:8443
server: https://192.168.59.102:8443
name: minikube
contexts:
- context:
Expand Down
10 changes: 5 additions & 5 deletions pkg/minikube/tunnel/route_windows_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,18 +119,18 @@ Network Destination Netmask Gateway Interface Metric
192.168.56.0 255.255.255.0 On-link 192.168.56.1 281
192.168.56.1 255.255.255.255 On-link 192.168.56.1 281
192.168.56.255 255.255.255.255 On-link 192.168.56.1 281
192.168.99.0 255.255.255.0 On-link 192.168.99.1 281
192.168.99.1 255.255.255.255 On-link 192.168.99.1 281
192.168.59.0 255.255.255.0 On-link 192.168.59.1 281
192.168.59.1 255.255.255.255 On-link 192.168.59.1 281
10.211.55.0 255.255.255.0 192.168.1.2 10.211.55.3 281
192.168.99.255 255.255.255.255 On-link 192.168.99.1 281
192.168.59.255 255.255.255.255 On-link 192.168.59.1 281
224.0.0.0 240.0.0.0 On-link 127.0.0.1 331
224.0.0.0 240.0.0.0 On-link 10.211.55.3 281
224.0.0.0 240.0.0.0 On-link 192.168.56.1 281
224.0.0.0 240.0.0.0 On-link 192.168.99.1 281
224.0.0.0 240.0.0.0 On-link 192.168.59.1 281
255.255.255.255 255.255.255.255 On-link 127.0.0.1 331
255.255.255.255 255.255.255.255 On-link 10.211.55.3 281
255.255.255.255 255.255.255.255 On-link 192.168.56.1 281
255.255.255.255 255.255.255.255 On-link 192.168.99.1 281
255.255.255.255 255.255.255.255 On-link 192.168.59.1 281
===========================================================================
Persistent Routes:
None`
Expand Down
Loading