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

asset/cluster: various cleanups

Browse Source 
This removes an inaccurate comment and an unused variable/dependency.
This commit is contained in:
Alex Crawford
2018-12-20 15:17:58 -08:00
parent 15937bee9a
commit be3e4e94d9
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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/openstack"
"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/terraform"
"github.com/openshift/installer/pkg/types"
@@ -50,7 +49,6 @@ func (c *Cluster) Dependencies() []asset.Asset {
return []asset.Asset{
&installconfig.InstallConfig{},
&TerraformVariables{},
&kubeconfig.Admin{},
&password.KubeadminPassword{},
}
}
@@ -59,9 +57,8 @@ func (c *Cluster) Dependencies() []asset.Asset {
func (c *Cluster) Generate(parents asset.Parents) (err error) {
installConfig := &installconfig.InstallConfig{}
terraformVariables := &TerraformVariables{}
adminKubeconfig := &kubeconfig.Admin{}
kubeadminPassword := &password.KubeadminPassword{}
parents.Get(installConfig, terraformVariables, adminKubeconfig, kubeadminPassword)
parents.Get(installConfig, terraformVariables, kubeadminPassword)
// Copy the terraform.tfvars to a temp directory where the terraform will be invoked within.
tmpDir, err := ioutil.TempDir("", "openshift-install-")
@@ -131,7 +128,6 @@ func (c *Cluster) Generate(parents asset.Parents) (err error) {
}
}
// TODO(yifan): Use the kubeconfig to verify the cluster is up.
return err
}