openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 15:47:14 +01:00
Code Issues Releases Activity

Merge pull request #993 from crawford/cleanups

Browse Source 
asset/cluster: various cleanups
This commit is contained in:
OpenShift Merge Robot
2019-01-04 11:11:16 -08:00
committed by GitHub
parent 9a710427c0 1bc5744681
commit b9cd189bc4
2 changed files with 568 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1098
docs/design/resource_dep.svg
View File

File diff suppressed because it is too large Load Diff
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 80 KiB

6
pkg/asset/cluster/cluster.go
View File

@@ -15,7 +15,6 @@ import (
"github.com/openshift/installer/pkg/asset/cluster/libvirt" "github.com/openshift/installer/pkg/asset/cluster/libvirt"
"github.com/openshift/installer/pkg/asset/cluster/openstack" "github.com/openshift/installer/pkg/asset/cluster/openstack"
"github.com/openshift/installer/pkg/asset/installconfig" "github.com/openshift/installer/pkg/asset/installconfig"
"github.com/openshift/installer/pkg/asset/kubeconfig"
"github.com/openshift/installer/pkg/asset/password" "github.com/openshift/installer/pkg/asset/password"
"github.com/openshift/installer/pkg/terraform" "github.com/openshift/installer/pkg/terraform"
"github.com/openshift/installer/pkg/types" "github.com/openshift/installer/pkg/types"
@@ -50,7 +49,6 @@ func (c *Cluster) Dependencies() []asset.Asset {
return []asset.Asset{ return []asset.Asset{
&installconfig.InstallConfig{}, &installconfig.InstallConfig{},
&TerraformVariables{}, &TerraformVariables{},
&kubeconfig.Admin{},
&password.KubeadminPassword{}, &password.KubeadminPassword{},
} }
} }
@@ -59,9 +57,8 @@ func (c *Cluster) Dependencies() []asset.Asset {
func (c *Cluster) Generate(parents asset.Parents) (err error) { func (c *Cluster) Generate(parents asset.Parents) (err error) {
installConfig := &installconfig.InstallConfig{} installConfig := &installconfig.InstallConfig{}
terraformVariables := &TerraformVariables{} terraformVariables := &TerraformVariables{}
adminKubeconfig := &kubeconfig.Admin{}
kubeadminPassword := &password.KubeadminPassword{} kubeadminPassword := &password.KubeadminPassword{}
parents.Get(installConfig, terraformVariables, adminKubeconfig, kubeadminPassword) parents.Get(installConfig, terraformVariables, kubeadminPassword)
if installConfig.Config.Platform.None != nil { if installConfig.Config.Platform.None != nil {
return errors.New("cluster cannot be created with platform set to 'none'") return errors.New("cluster cannot be created with platform set to 'none'")
@@ -135,7 +132,6 @@ func (c *Cluster) Generate(parents asset.Parents) (err error) {
} }
} }
// TODO(yifan): Use the kubeconfig to verify the cluster is up.
return err return err
} }