Skip to content

Commit 0de586a

Browse files
Merge pull request #7807 from vincepri/link-capi
CORS-2852: Support installing OpenShift via Cluster API
2 parents e44ef17 + d8351fc commit 0de586a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+354610
-13
lines changed

.yamllint

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ rules:
1414

1515
ignore: |
1616
vendor/
17+
data/data/cluster-api/
1718
data/data/install.openshift.io_installconfigs.yaml
1819
data/data/manifests/openshift/cluster-networkconfig-crd.yaml

cmd/openshift-install/create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ func clusterCreatePostRun(ctx context.Context) (int, error) {
198198
"Warning: this should only be used for debugging purposes, and poses a risk to cluster stability.")
199199
} else {
200200
logrus.Info("Destroying the bootstrap resources...")
201-
err = destroybootstrap.Destroy(command.RootOpts.Dir)
201+
err = destroybootstrap.Destroy(ctx, command.RootOpts.Dir)
202202
if err != nil {
203203
return 0, err
204204
}

cmd/openshift-install/destroy.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"context"
45
"os"
56
"path/filepath"
67

@@ -125,7 +126,7 @@ func newDestroyBootstrapCmd() *cobra.Command {
125126
defer cleanup()
126127

127128
timer.StartTimer(timer.TotalTimeElapsed)
128-
err := bootstrap.Destroy(command.RootOpts.Dir)
129+
err := bootstrap.Destroy(context.TODO(), command.RootOpts.Dir)
129130
if err != nil {
130131
logrus.Fatal(err)
131132
}

data/data/cluster-api/aws-infrastructure-components.yaml

Lines changed: 14039 additions & 0 deletions
Large diffs are not rendered by default.

data/data/cluster-api/azure-infrastructure-components.yaml

Lines changed: 25025 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)