Fix dangling format issues.
Thomas Stromberg
parent
e0080c074c
commit
3706b3b8ac
|
|
@ -47,10 +47,10 @@ var configTestCases = []configTestCase{
|
|||
"vm-driver": "kvm"
|
||||
}`,
|
||||
config: map[string]interface{}{
|
||||
"vm-driver": "kvm",
|
||||
"cpus": 4,
|
||||
"disk-size": "20g",
|
||||
"v": 5,
|
||||
"vm-driver": "kvm",
|
||||
"cpus": 4,
|
||||
"disk-size": "20g",
|
||||
"v": 5,
|
||||
"show-libmachine-logs": true,
|
||||
"log_dir": "/etc/hosts",
|
||||
"ReminderWaitPeriodInHours": 99,
|
||||
|
|
|
|||
|
|
@ -105,8 +105,8 @@ var addonsConfigureCmd = &cobra.Command{
|
|||
"aws-assume-role": awsRole,
|
||||
},
|
||||
map[string]string{
|
||||
"app": "registry-creds",
|
||||
"cloud": "ecr",
|
||||
"app": "registry-creds",
|
||||
"cloud": "ecr",
|
||||
"kubernetes.io/minikube-addons": "registry-creds",
|
||||
})
|
||||
|
||||
|
|
@ -120,11 +120,11 @@ var addonsConfigureCmd = &cobra.Command{
|
|||
"registry-creds-gcr",
|
||||
map[string]string{
|
||||
"application_default_credentials.json": gcrApplicationDefaultCredentials,
|
||||
"gcrurl": gcrURL,
|
||||
"gcrurl": gcrURL,
|
||||
},
|
||||
map[string]string{
|
||||
"app": "registry-creds",
|
||||
"cloud": "gcr",
|
||||
"app": "registry-creds",
|
||||
"cloud": "gcr",
|
||||
"kubernetes.io/minikube-addons": "registry-creds",
|
||||
})
|
||||
|
||||
|
|
@ -142,8 +142,8 @@ var addonsConfigureCmd = &cobra.Command{
|
|||
"DOCKER_PRIVATE_REGISTRY_PASSWORD": dockerPass,
|
||||
},
|
||||
map[string]string{
|
||||
"app": "registry-creds",
|
||||
"cloud": "dpr",
|
||||
"app": "registry-creds",
|
||||
"cloud": "dpr",
|
||||
"kubernetes.io/minikube-addons": "registry-creds",
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -374,7 +374,7 @@ func (d *Driver) cleanupNfsExports() {
|
|||
}
|
||||
|
||||
if err := nfsexports.ReloadDaemon(); err != nil {
|
||||
log.Errorf("failed to reload the nfs daemon: %v", err
|
||||
log.Errorf("failed to reload the nfs daemon: %v", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -356,7 +356,7 @@ func (d *Driver) Stop() error {
|
|||
|
||||
}
|
||||
|
||||
return fmt.Errorf("Could not stop VM, current state %s", s.String()
|
||||
return fmt.Errorf("Could not stop VM, current state %s", s.String())
|
||||
}
|
||||
|
||||
func (d *Driver) Remove() error {
|
||||
|
|
|
|||
|
|
@ -47,10 +47,10 @@ var configTestCases = []configTestCase{
|
|||
"vm-driver": "kvm"
|
||||
}`,
|
||||
config: map[string]interface{}{
|
||||
"vm-driver": "kvm",
|
||||
"cpus": 4,
|
||||
"disk-size": "20g",
|
||||
"v": 5,
|
||||
"vm-driver": "kvm",
|
||||
"cpus": 4,
|
||||
"disk-size": "20g",
|
||||
"v": 5,
|
||||
"show-libmachine-logs": true,
|
||||
"log_dir": "/etc/hosts",
|
||||
"ReminderWaitPeriodInHours": 99,
|
||||
|
|
|
|||
|
|
@ -296,30 +296,30 @@ func TestOptionallyHttpsFormattedUrlString(t *testing.T) {
|
|||
expectedIsHttpSchemedURL bool
|
||||
}{
|
||||
{
|
||||
description: "no https for http schemed with no https option",
|
||||
bareUrlString: "http://192.168.99.100:30563",
|
||||
https: false,
|
||||
description: "no https for http schemed with no https option",
|
||||
bareUrlString: "http://192.168.99.100:30563",
|
||||
https: false,
|
||||
expectedHttpsFormattedUrlString: "http://192.168.99.100:30563",
|
||||
expectedIsHttpSchemedURL: true,
|
||||
},
|
||||
{
|
||||
description: "no https for non-http schemed with no https option",
|
||||
bareUrlString: "xyz.http.myservice:30563",
|
||||
https: false,
|
||||
description: "no https for non-http schemed with no https option",
|
||||
bareUrlString: "xyz.http.myservice:30563",
|
||||
https: false,
|
||||
expectedHttpsFormattedUrlString: "xyz.http.myservice:30563",
|
||||
expectedIsHttpSchemedURL: false,
|
||||
},
|
||||
{
|
||||
description: "https for http schemed with https option",
|
||||
bareUrlString: "http://192.168.99.100:30563",
|
||||
https: true,
|
||||
description: "https for http schemed with https option",
|
||||
bareUrlString: "http://192.168.99.100:30563",
|
||||
https: true,
|
||||
expectedHttpsFormattedUrlString: "https://192.168.99.100:30563",
|
||||
expectedIsHttpSchemedURL: true,
|
||||
},
|
||||
{
|
||||
description: "no https for non-http schemed with https option and http substring",
|
||||
bareUrlString: "xyz.http.myservice:30563",
|
||||
https: true,
|
||||
description: "no https for non-http schemed with https option and http substring",
|
||||
bareUrlString: "xyz.http.myservice:30563",
|
||||
https: true,
|
||||
expectedHttpsFormattedUrlString: "xyz.http.myservice:30563",
|
||||
expectedIsHttpSchemedURL: false,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ func GenerateCACert(certPath, keyPath string, name string) error {
|
|||
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
|
||||
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth},
|
||||
BasicConstraintsValid: true,
|
||||
IsCA: true,
|
||||
IsCA: true,
|
||||
}
|
||||
|
||||
return writeCertsAndKeys(&template, certPath, priv, keyPath, &template, priv)
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ func waitForDNS(t *testing.T, c kubernetes.Interface) {
|
|||
func busyBoxPod(t *testing.T, c kubernetes.Interface, kr *util.KubectlRunner) string {
|
||||
if _, err := kr.RunCommand([]string{"create", "-f", filepath.Join(*testdataDir, "busybox.yaml")}); err != nil {
|
||||
t.Fatalf("creating busybox pod: %v", err)
|
||||
- }
|
||||
}
|
||||
// TODO(tstromberg): Refactor WaitForBusyboxRunning to return name of pod.
|
||||
if err := util.WaitForBusyboxRunning(t, "default"); err != nil {
|
||||
t.Fatalf("Waiting for busybox pod to be up: %v", err)
|
||||
|
|
|
|||
Loading…
Reference in New Issue