Merge pull request #11620 from mbforbes/mcSkipGKE

Remove deprecated master certs test
This commit is contained in:
Vish Kannan 2015-07-22 17:11:49 -07:00
commit d9bb171f8a

View File

@ -1,46 +0,0 @@
/*
Copyright 2015 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package e2e
import (
"fmt"
"os/exec"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
var _ = Describe("MasterCerts", func() {
BeforeEach(func() {
var err error
_, err = loadClient()
Expect(err).NotTo(HaveOccurred())
SkipUnlessProviderIs("gce", "gke")
})
It("should have all expected certs on the master", func() {
for _, certFile := range []string{"kubecfg.key", "kubecfg.crt", "ca.crt"} {
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 output, err := cmd.CombinedOutput(); err != nil {
Failf("Error checking for cert file %s on master: %v\n%s", certFile, err, string(output))
}
}
})
})