Establish default CloudConfiguration values

This commit is contained in:
Steven E. Harris 2021-02-03 13:00:48 -05:00
parent 4a7b970011
commit d1432bf1d4
3 changed files with 50 additions and 0 deletions

View File

@ -6,6 +6,7 @@ go_library(
"apiserver.go", "apiserver.go",
"calico.go", "calico.go",
"cilium.go", "cilium.go",
"cloudconfiguration.go",
"clusterautoscaler.go", "clusterautoscaler.go",
"containerd.go", "containerd.go",
"context.go", "context.go",

View File

@ -0,0 +1,48 @@
/*
Copyright 2021 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package components
import (
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/loader"
)
// CloudConfigurationOptionsBuilder prepares settings related to the backing cloud provider.
type CloudConfigurationOptionsBuilder struct {
Context *OptionsContext
}
var _ loader.OptionsBuilder = &CloudConfigurationOptionsBuilder{}
func (b *CloudConfigurationOptionsBuilder) BuildOptions(o interface{}) error {
clusterSpec := o.(*kops.ClusterSpec)
c := clusterSpec.CloudConfig
if c == nil {
c = &kops.CloudConfiguration{}
clusterSpec.CloudConfig = c
}
if c.ManageStorageClasses == nil {
c.ManageStorageClasses = fi.Bool(true)
}
// NB: See file openstack.go for establishing default values for the CloudConfig.Openstack
// field.
return nil
}

View File

@ -273,6 +273,7 @@ func (c *populateClusterSpec) run(clientset simple.Clientset) error {
codeModels = append(codeModels, &components.KubeControllerManagerOptionsBuilder{OptionsContext: optionsContext}) codeModels = append(codeModels, &components.KubeControllerManagerOptionsBuilder{OptionsContext: optionsContext})
codeModels = append(codeModels, &components.KubeSchedulerOptionsBuilder{OptionsContext: optionsContext}) codeModels = append(codeModels, &components.KubeSchedulerOptionsBuilder{OptionsContext: optionsContext})
codeModels = append(codeModels, &components.KubeProxyOptionsBuilder{Context: optionsContext}) codeModels = append(codeModels, &components.KubeProxyOptionsBuilder{Context: optionsContext})
codeModels = append(codeModels, &components.CloudConfigurationOptionsBuilder{Context: optionsContext})
codeModels = append(codeModels, &components.CalicoOptionsBuilder{Context: optionsContext}) codeModels = append(codeModels, &components.CalicoOptionsBuilder{Context: optionsContext})
codeModels = append(codeModels, &components.CiliumOptionsBuilder{Context: optionsContext}) codeModels = append(codeModels, &components.CiliumOptionsBuilder{Context: optionsContext})
codeModels = append(codeModels, &components.OpenStackOptionsBulder{Context: optionsContext}) codeModels = append(codeModels, &components.OpenStackOptionsBulder{Context: optionsContext})