Skip to content

Commit

Permalink
Merge pull request #2548 from vrutkovs/okd
Browse files Browse the repository at this point in the history
[fcos] Support Ignition3 and FCOS
  • Loading branch information
openshift-merge-robot authored Nov 12, 2019
2 parents 36ca119 + e5a58b3 commit 23f4029
Show file tree
Hide file tree
Showing 15,000 changed files with 2,063,529 additions and 5,857,280 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1,486 changes: 0 additions & 1,486 deletions Gopkg.lock

This file was deleted.

134 changes: 0 additions & 134 deletions Gopkg.toml

This file was deleted.

1 change: 0 additions & 1 deletion cmd/openshift-install/destroy.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
assetstore "github.com/openshift/installer/pkg/asset/store"
"github.com/openshift/installer/pkg/destroy"
_ "github.com/openshift/installer/pkg/destroy/aws"
_ "github.com/openshift/installer/pkg/destroy/azure"
_ "github.com/openshift/installer/pkg/destroy/baremetal"
"github.com/openshift/installer/pkg/destroy/bootstrap"
_ "github.com/openshift/installer/pkg/destroy/gcp"
Expand Down
11 changes: 0 additions & 11 deletions cmd/openshift-install/gather.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ import (
"github.com/openshift/installer/pkg/gather/ssh"
"github.com/openshift/installer/pkg/terraform"
gatheraws "github.com/openshift/installer/pkg/terraform/gather/aws"
gatherazure "github.com/openshift/installer/pkg/terraform/gather/azure"
gathergcp "github.com/openshift/installer/pkg/terraform/gather/gcp"
gatherlibvirt "github.com/openshift/installer/pkg/terraform/gather/libvirt"
gatheropenstack "github.com/openshift/installer/pkg/terraform/gather/openstack"
"github.com/openshift/installer/pkg/types"
awstypes "github.com/openshift/installer/pkg/types/aws"
azuretypes "github.com/openshift/installer/pkg/types/azure"
gcptypes "github.com/openshift/installer/pkg/types/gcp"
libvirttypes "github.com/openshift/installer/pkg/types/libvirt"
openstacktypes "github.com/openshift/installer/pkg/types/openstack"
Expand Down Expand Up @@ -146,15 +144,6 @@ func extractHostAddresses(config *types.InstallConfig, tfstate *terraform.State)
if err != nil {
logrus.Error(err)
}
case azuretypes.Name:
bootstrap, err = gatherazure.BootstrapIP(tfstate)
if err != nil {
return bootstrap, port, masters, err
}
masters, err = gatherazure.ControlPlaneIPs(tfstate)
if err != nil {
logrus.Error(err)
}
case gcptypes.Name:
bootstrap, err = gathergcp.BootstrapIP(tfstate)
if err != nil {
Expand Down
166 changes: 0 additions & 166 deletions data/data/azure/bootstrap/main.tf

This file was deleted.

Loading

0 comments on commit 23f4029

Please sign in to comment.