Merge pull request #37019 from pipejakob/e2e-anywhere-pr

Automatic merge from submit-queue

Add kubernetes-anywhere as a new e2e deployment option.

This change adds support for using `kubernetes-anywhere` as a deployment option for hack/e2e.go. This work is toward the larger goal of being able to run e2e tests against `kubeadm` clusters, which `kubernetes-anywhere` supports.

**Release note**:
```release-note
Add kubernetes-anywhere as a new e2e deployment option
```

The configuration in `getConfig()` comes mostly from the defaults in `kubernetes-anywhere`. In the future, we can add more plumbing to override them via CLI flags.

CC @mikedanese
This commit is contained in:
Kubernetes Submit Queue
2016-12-02 08:45:00 -08:00
committed by GitHub
3 changed files with 180 additions and 22 deletions

View File

@@ -85,6 +85,9 @@ federation/deploy/config.json.sample: "cluster_name": "cluster3-kubernetes"
federation/deploy/config.json.sample: "num_nodes": 3,
federation/deploy/config.json.sample: "num_nodes": 3,
federation/deploy/config.json.sample: "num_nodes": 3,
hack/e2e.go:.phase1.cloud_provider="gce"
hack/e2e.go:.phase1.cluster_name="{{.Cluster}}"
hack/e2e.go:.phase1.num_nodes=4
hack/local-up-cluster.sh: advertise_address="--advertise_address=${API_HOST_IP}"
hack/local-up-cluster.sh: runtime_config="--runtime-config=${RUNTIME_CONFIG}"
hack/local-up-cluster.sh: advertise_address=""

View File

@@ -336,6 +336,10 @@ kubelet-read-only-port
kubelet-root-dir
kubelet-sync-frequency
kubelet-timeout
kubernetes-anywhere-cluster
kubernetes-anywhere-path
kubernetes-anywhere-phase2-provider
kubernetes-anywhere-up-timeout
kubernetes-service-node-port
label-columns
large-cluster-size-threshold