github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36005 from zmerlynn/kops-configurable-timeout

Browse Source 
Automatic merge from submit-queue

e2e.go/kops: Bump timeout to 20m, fix KUBERNETES_PROVIDER

**What this PR does / why we need it**: I don't have a ton of proof, but I think https://k8s-testgrid.appspot.com/google-aws#kops-aws-updown builds 4045-4047 are just AWS and DNS slowness.

In addition, my original PR was meant to change `KUBERNETES_PROVIDER` based on `KUBERNETES_CONFORMANCE_PROVIDER`.
This commit is contained in:
Kubernetes Submit Queue 2016-11-01 15:56:57 -07:00 committed by GitHub
commit 21c0743c71
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/e2e.go
View File

@ -60,6 +60,7 @@ var (
kopsKubeVersion = flag.String("kops-kubernetes-version", "", "(kops only) If set, the version of Kubernetes to deploy (can be a URL to a GCS path where the release is stored) (Defaults to kops default, latest stable release.).") kopsKubeVersion = flag.String("kops-kubernetes-version", "", "(kops only) If set, the version of Kubernetes to deploy (can be a URL to a GCS path where the release is stored) (Defaults to kops default, latest stable release.).")
kopsZones = flag.String("kops-zones", "us-west-2a", "(kops AWS only) AWS zones for kops deployment, comma delimited.") kopsZones = flag.String("kops-zones", "us-west-2a", "(kops AWS only) AWS zones for kops deployment, comma delimited.")
kopsNodes = flag.Int("kops-nodes", 2, "(kops only) Number of nodes to create.") kopsNodes = flag.Int("kops-nodes", 2, "(kops only) Number of nodes to create.")
kopsUpTimeout = flag.Duration("kops-up-timeout", 20*time.Minute, "(kops only) Time limit between 'kops config / kops update' and a response from the Kubernetes API.")
// Deprecated flags. // Deprecated flags.
deprecatedPush = flag.Bool("push", false, "Deprecated. Does nothing.") deprecatedPush = flag.Bool("push", false, "Deprecated. Does nothing.")
@ -524,7 +525,7 @@ func (k kops) Up() error {
// TODO(zmerlynn): More cluster validation. This should perhaps be // TODO(zmerlynn): More cluster validation. This should perhaps be
// added to kops and not here, but this is a fine place to loop // added to kops and not here, but this is a fine place to loop
// for now. // for now.
for stop := time.Now().Add(10 * time.Minute); time.Now().Before(stop); time.Sleep(30 * time.Second) { for stop := time.Now().Add(*kopsUpTimeout); time.Now().Before(stop); time.Sleep(30 * time.Second) {
n, err := clusterSize(k) n, err := clusterSize(k)
if err != nil { if err != nil {
log.Printf("Can't get cluster size, sleeping: %v", err) log.Printf("Can't get cluster size, sleeping: %v", err)

2
hack/ginkgo-e2e.sh
View File

@ -49,7 +49,7 @@ source "${KUBE_ROOT}/cluster/kube-util.sh"
# ---- Do cloud-provider-specific setup # ---- Do cloud-provider-specific setup
if [[ -n "${KUBERNETES_CONFORMANCE_TEST:-}" ]]; then if [[ -n "${KUBERNETES_CONFORMANCE_TEST:-}" ]]; then
echo "Conformance test: not doing test setup." echo "Conformance test: not doing test setup."
KUBERNETES_PROVIDER="skeleton" KUBERNETES_PROVIDER=${KUBERNETES_CONFORMANCE_PROVIDER:-"skeleton"}
detect-master-from-kubeconfig detect-master-from-kubeconfig

1
hack/verify-flags/known-flags.txt
View File

@ -287,6 +287,7 @@ kops-kubernetes-version
kops-nodes kops-nodes
kops-ssh-key kops-ssh-key
kops-state kops-state
kops-up-timeout
kops-zones kops-zones
kube-api-burst kube-api-burst
kube-api-content-type kube-api-content-type