kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup OpenStackOptionsBuilder

This commit is contained in:
John Gardiner Myers 2022-04-07 14:52:25 -07:00
parent aff5f587f3
commit 6a621fcde5
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/model/components/openstack.go
View File

@ -22,17 +22,18 @@ import (
"k8s.io/kops/upup/pkg/fi/loader"
)
// OpenStackOptionsBulder adds options for OpenStack to the model
type OpenStackOptionsBulder struct {
// OpenStackOptionsBuilder adds options for OpenStack to the model
type OpenStackOptionsBuilder struct {
Context *OptionsContext
}
var _ loader.OptionsBuilder = &OpenStackOptionsBulder{}
var _ loader.OptionsBuilder = &OpenStackOptionsBuilder{}
func (b *OpenStackOptionsBulder) BuildOptions(o interface{}) error {
func (b *OpenStackOptionsBuilder) BuildOptions(o interface{}) error {
clusterSpec := o.(*kops.ClusterSpec)
openstack := clusterSpec.CloudProvider.Openstack
if clusterSpec.CloudProvider.Openstack == nil {
if openstack == nil {
return nil
}
@ -40,19 +41,19 @@ func (b *OpenStackOptionsBulder) BuildOptions(o interface{}) error {
clusterSpec.CloudConfig = &kops.CloudConfiguration{}
}
if clusterSpec.CloudProvider.Openstack.BlockStorage == nil {
clusterSpec.CloudProvider.Openstack.BlockStorage = &kops.OpenstackBlockStorageConfig{}
if openstack.BlockStorage == nil {
openstack.BlockStorage = &kops.OpenstackBlockStorageConfig{}
}
if clusterSpec.CloudProvider.Openstack.BlockStorage.CreateStorageClass == nil {
clusterSpec.CloudProvider.Openstack.BlockStorage.CreateStorageClass = fi.Bool(true)
if openstack.BlockStorage.CreateStorageClass == nil {
openstack.BlockStorage.CreateStorageClass = fi.Bool(true)
}
if clusterSpec.CloudProvider.Openstack.Metadata == nil {
clusterSpec.CloudProvider.Openstack.Metadata = &kops.OpenstackMetadata{}
if openstack.Metadata == nil {
openstack.Metadata = &kops.OpenstackMetadata{}
}
if clusterSpec.CloudProvider.Openstack.Metadata.ConfigDrive == nil {
clusterSpec.CloudProvider.Openstack.Metadata.ConfigDrive = fi.Bool(false)
if openstack.Metadata.ConfigDrive == nil {
openstack.Metadata.ConfigDrive = fi.Bool(false)
}
if clusterSpec.ExternalCloudControllerManager == nil {

2
upup/pkg/fi/cloudup/populate_cluster_spec.go
View File

@ -275,7 +275,7 @@ func (c *populateClusterSpec) run(clientset simple.Clientset) error {
codeModels = append(codeModels, &components.CloudConfigurationOptionsBuilder{Context: optionsContext})
codeModels = append(codeModels, &components.CalicoOptionsBuilder{Context: optionsContext})
codeModels = append(codeModels, &components.CiliumOptionsBuilder{Context: optionsContext})
codeModels = append(codeModels, &components.OpenStackOptionsBulder{Context: optionsContext})
codeModels = append(codeModels, &components.OpenStackOptionsBuilder{Context: optionsContext})
codeModels = append(codeModels, &components.DiscoveryOptionsBuilder{OptionsContext: optionsContext})
codeModels = append(codeModels, &components.ClusterAutoscalerOptionsBuilder{OptionsContext: optionsContext})
codeModels = append(codeModels, &components.NodeTerminationHandlerOptionsBuilder{OptionsContext: optionsContext})