Skip to content

Commit 5c52663

Browse files
committed
cmd: destroy: remove redundant ectd data destroy
We are deleting the whole capi artifacts dir which already includes the ectd data store, so no point on doing that separately.
1 parent a9f385a commit 5c52663

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

cmd/openshift-install/destroy.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,8 @@ func runDestroyCmd(directory string, reportQuota bool) error {
109109
}
110110
}
111111

112-
// ensure capi etcd data store is cleaned up
113-
clusterapi.System().CleanEtcd()
114-
115-
capiArtifactsDir := filepath.Join(command.RootOpts.Dir, clusterapi.ArtifactsDir)
112+
// ensure capi etcd data store and capi artifacts are cleaned up
113+
capiArtifactsDir := filepath.Join(directory, clusterapi.ArtifactsDir)
116114
if err := os.RemoveAll(capiArtifactsDir); err != nil {
117115
logrus.Warnf("failed to remove %s: %v", capiArtifactsDir, err)
118116
}

0 commit comments

Comments
 (0)