mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-13 05:02:50 +00:00
Fix merge problems
This commit is contained in:
@@ -38,8 +38,8 @@ var _ = Describe("MasterCerts", func() {
|
||||
}
|
||||
|
||||
for _, certFile := range []string{"kubecfg.key", "kubecfg.crt", "ca.crt"} {
|
||||
cmd := exec.Command("gcloud", "compute", "ssh", "--project", testContext.GCEConfig.ProjectID,
|
||||
"--zone", testContext.GCEConfig.Zone, testContext.GCEConfig.MasterName,
|
||||
cmd := exec.Command("gcloud", "compute", "ssh", "--project", testContext.CloudConfig.ProjectID,
|
||||
"--zone", testContext.CloudConfig.Zone, testContext.CloudConfig.MasterName,
|
||||
"--command", fmt.Sprintf("ls /srv/kubernetes/%s", certFile))
|
||||
if _, err := cmd.CombinedOutput(); err != nil {
|
||||
Fail(fmt.Sprintf("Error checking for cert file %s on master: %v", certFile, err))
|
||||
|
Reference in New Issue
Block a user