Merge pull request #128 from csrwng/fix_etcd_flakiness

Default to a 1-pod etcd, remove artificial wait
openshift · Feb 27, 2020 · fd74f53 · fd74f53
2 parents bbecf41 + 6ab5458
commit fd74f53
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/assets/etcd/etcd-cluster.yaml b/assets/etcd/etcd-cluster.yaml
@@ -3,7 +3,7 @@ kind: EtcdCluster
 metadata:
   name: etcd
 spec:
-  size: 3
+  size: 1
   version: "3.2.13"
   TLS:
     static:

diff --git a/contrib/pkg/aws/install.go b/contrib/pkg/aws/install.go
@@ -467,14 +467,10 @@ func InstallCluster(name, releaseImage, dhParamsFile string, waitForReady bool)
 	if err != nil {
 		return fmt.Errorf("failed to create a temporary directory for excluded manifests")
 	}
-	initialExclude := append(excludeManifests, "etcd-cluster.yaml")
-	if err = applyManifests(cfg, name, manifestsDir, initialExclude, excludedDir); err != nil {
+	log.Infof("Excluded manifests directory: %s", excludedDir)
+	if err = applyManifests(cfg, name, manifestsDir, excludeManifests, excludedDir); err != nil {
 		return fmt.Errorf("failed to apply manifests: %v", err)
 	}
-	time.Sleep(30 * time.Second)
-	if err = applyManifests(cfg, name, excludedDir, excludeManifests, manifestsDir); err != nil {
-		return fmt.Errorf("failed to apply etcd cluster manifest")
-	}
 	log.Infof("Cluster resources applied")
 
 	if waitForReady {

diff --git a/pkg/assets/bindata.go b/pkg/assets/bindata.go