Skip to content
This repository has been archived by the owner on Nov 23, 2021. It is now read-only.

Default to a 1-pod etcd, remove artificial wait #128

Merged
merged 1 commit into from
Feb 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/etcd/etcd-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: EtcdCluster
metadata:
name: etcd
spec:
size: 3
size: 1
version: "3.2.13"
TLS:
static:
Expand Down
8 changes: 2 additions & 6 deletions contrib/pkg/aws/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/assets/bindata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.