github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use the kubectl binary rather than the wrapper shell script in the 

kubectl e2e test.
pull/6/head
Robert Bailey 2015-02-27 18:29:28 -08:00
parent cc3c4414f8
commit 3ae85812bd
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/ginkgo-e2e.sh
View File

@ -103,6 +103,8 @@ else
auth_config=() auth_config=()
fi fi
# Use the kubectl binary from the same directory as the e2e binary.
export PATH=$(dirname "${e2e}"):"${PATH}"
"${e2e}" "${auth_config[@]:+${auth_config[@]}}" \ "${e2e}" "${auth_config[@]:+${auth_config[@]}}" \
--host="https://${KUBE_MASTER_IP-}" \ --host="https://${KUBE_MASTER_IP-}" \
--provider="${KUBERNETES_PROVIDER}" \ --provider="${KUBERNETES_PROVIDER}" \

25
test/e2e/kubectl.go
View File

@ -40,7 +40,7 @@ const (
var _ = Describe("kubectl", func() { var _ = Describe("kubectl", func() {
updateDemoRoot := filepath.Join(root, "examples/update-demo") updateDemoRoot := filepath.Join(testContext.repoRoot, "examples/update-demo")
nautilusPath := filepath.Join(updateDemoRoot, "nautilus-rc.yaml") nautilusPath := filepath.Join(updateDemoRoot, "nautilus-rc.yaml")
kittenPath := filepath.Join(updateDemoRoot, "kitten-rc.yaml") kittenPath := filepath.Join(updateDemoRoot, "kitten-rc.yaml")
@ -174,15 +174,22 @@ func getData(hostIP string) (*updateDemoData, error) {
} }
func runKubectl(args ...string) string { func runKubectl(args ...string) string {
// TODO: use kubectl binary directly instead of shell wrapper defaultArgs := []string{"--auth-path=" + testContext.authConfig}
path := filepath.Join(root, "cluster/kubectl.sh") if testContext.certDir != "" {
cmdStr := path + " " + strings.Join(args, " ") defaultArgs = append(defaultArgs,
Logf("Running '%v'", cmdStr) fmt.Sprintf("--certificate-authority=%s", filepath.Join(testContext.certDir, "ca.crt")),
fmt.Sprintf("--client-certificate=%s", filepath.Join(testContext.certDir, "kubecfg.crt")),
cmd := exec.Command(path, args...) fmt.Sprintf("--client-key=%s", filepath.Join(testContext.certDir, "kubecfg.key")))
}
kubectlArgs := append(defaultArgs, args...)
// TODO: Remove this once gcloud writes a proper entry in the kubeconfig file.
if testContext.provider == "gke" {
kubectlArgs = append(kubectlArgs, "--server="+testContext.host)
}
Logf("Running 'kubectl %v'", strings.Join(kubectlArgs, " "))
cmd := exec.Command("kubectl", kubectlArgs...)
var stdout, stderr bytes.Buffer var stdout, stderr bytes.Buffer
cmd.Stdout = &stdout cmd.Stdout, cmd.Stderr = &stdout, &stderr
cmd.Stderr = &stderr
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
Failf("Error running %v:\nCommand stdout:\n%v\nstderr:\n%v\n", cmd, cmd.Stdout, cmd.Stderr) Failf("Error running %v:\nCommand stdout:\n%v\nstderr:\n%v\n", cmd, cmd.Stdout, cmd.Stderr)