mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 06:27:05 +00:00
e2e.go/kops: Make up timeout configurable, bump to 20m
Along the way: Fix ginkgo-e2e.sh. This change got dropped in the original PR, but it was meant to allow a conformance-style kubectl-auth test and still have a legit cloud provider.
This commit is contained in:
parent
33c1c93863
commit
02ec4c373b
@ -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.).")
|
||||
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.")
|
||||
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.
|
||||
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
|
||||
// added to kops and not here, but this is a fine place to loop
|
||||
// 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)
|
||||
if err != nil {
|
||||
log.Printf("Can't get cluster size, sleeping: %v", err)
|
||||
|
@ -49,7 +49,7 @@ source "${KUBE_ROOT}/cluster/kube-util.sh"
|
||||
# ---- Do cloud-provider-specific setup
|
||||
if [[ -n "${KUBERNETES_CONFORMANCE_TEST:-}" ]]; then
|
||||
echo "Conformance test: not doing test setup."
|
||||
KUBERNETES_PROVIDER="skeleton"
|
||||
KUBERNETES_PROVIDER=${KUBERNETES_CONFORMANCE_PROVIDER:-"skeleton"}
|
||||
|
||||
detect-master-from-kubeconfig
|
||||
|
||||
|
@ -287,6 +287,7 @@ kops-kubernetes-version
|
||||
kops-nodes
|
||||
kops-ssh-key
|
||||
kops-state
|
||||
kops-up-timeout
|
||||
kops-zones
|
||||
kube-api-burst
|
||||
kube-api-content-type
|
||||
|
Loading…
Reference in New Issue
Block a user