Skip to content

Bug 1825948: cloudConfig: read cloud Config from openshift-config-managed/kube-cloud-config ConfigMap #1658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Apr 24, 2020
Merged

Bug 1825948: cloudConfig: read cloud Config from openshift-config-managed/kube-cloud-config ConfigMap #1658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/controller/template/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ func cloudConfigFlag(cfg RenderConfig) interface{} {
}
flag := "--cloud-config=/etc/kubernetes/cloud.conf"
switch cfg.Platform {
case platformAzure, platformOpenStack:
case platformAWS, platformAzure, platformBaremetal, platformGCP, platformOpenStack, platformOvirt, platformVSphere:
return flag
default:
return ""
Expand Down
11 changes: 11 additions & 0 deletions pkg/controller/template/render_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,22 @@ func TestCloudConfigFlag(t *testing.T) {
platform: "azure",
content: "",
res: "",
}, {
platform: "libvirt",
content: "",
res: "",
}, {
platform: "aws",
content: `
[dummy-config]
option = a
`,
res: "--cloud-config=/etc/kubernetes/cloud.conf",
}, {
platform: "libvirt",
content: `
[dummy-config]
option = a
`,
res: "",
}, {
Expand Down
58 changes: 46 additions & 12 deletions pkg/operator/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,50 @@ func (optr *Operator) syncAll(syncFuncs []syncFunc) error {
return syncErr.err
}

// Return true if cloud config is required on a platform.
func isCloudConfigRequired(infra *configv1.Infrastructure) bool {
if infra.Spec.CloudConfig.Name != "" {
return true
}
for _, platform := range []configv1.PlatformType{configv1.AzurePlatformType, configv1.BareMetalPlatformType, configv1.GCPPlatformType, configv1.OpenStackPlatformType,
configv1.OvirtPlatformType, configv1.VSpherePlatformType} {
if platform == infra.Status.PlatformStatus.Type {
return true
}
}
return false
}

// Sync cloud config on supported platform from cloud.conf available in openshift-config-managed/kube-cloud-config ConfigMap.
func (optr *Operator) syncCloudConfig(spec *mcfgv1.ControllerConfigSpec, infra *configv1.Infrastructure) error {
if _, err := optr.clusterCmLister.ConfigMaps("openshift-config-managed").Get("kube-cloud-config"); err != nil {
if apierrors.IsNotFound(err) {
if isCloudConfigRequired(infra) {
// Return error only if cloud config is required, otherwise prceeds further.
return fmt.Errorf("%s/%s configmap is required on platform %s but not found: %v",
"openshift-config-managed", "kube-cloud-config", infra.Status.PlatformStatus.Type, err)
}
} else {
return err
}

} else {
// Read cloud.conf from openshift-config-managed/kube-cloud-config ConfigMap.
cc, err := optr.getCloudConfigFromConfigMap("openshift-config-managed", "kube-cloud-config", "cloud.conf")
if err != nil {
return err
}

spec.CloudProviderConfig = cc

caCert, err := optr.getCAsFromConfigMap("openshift-config-managed", "kube-cloud-config", "ca-bundle.pem")
if err == nil {
spec.CloudProviderCAData = caCert
}
}
return nil
}

func (optr *Operator) syncRenderConfig(_ *renderConfig) error {
if err := optr.syncCustomResourceDefinitions(); err != nil {
return err
Expand Down Expand Up @@ -206,18 +250,8 @@ func (optr *Operator) syncRenderConfig(_ *renderConfig) error {
}
spec.AdditionalTrustBundle = trustBundle

// if the cloudConfig is set in infra read the cloud config reference
if infra.Spec.CloudConfig.Name != "" {
cc, err := optr.getCloudConfigFromConfigMap("openshift-config", infra.Spec.CloudConfig.Name, infra.Spec.CloudConfig.Key)
if err != nil {
return err
}
spec.CloudProviderConfig = cc

caCert, err := optr.getCAsFromConfigMap("openshift-config", infra.Spec.CloudConfig.Name, "ca-bundle.pem")
if err == nil {
spec.CloudProviderCAData = caCert
}
if err := optr.syncCloudConfig(spec, infra); err != nil {
return err
}

//TODO: alaypatel07 remove after cluster-etcd-operator deployed via CVO as Managed
Expand Down