Skip to content

[release-4.22] SPLAT-2865: Added support to manage kube-cloud-config for vSphere in openshift-config-managed #498

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

Open
vr4manta wants to merge 4 commits into
base: release-4.22
Choose a base branch
from
Open

[release-4.22] SPLAT-2865: Added support to manage kube-cloud-config for vSphere in openshift-config-managed #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
423bb72
Enhanced operator to own updatingvsphere cloud config in openshift-co…
vr4manta Apr 6, 2026
444a2eb
Moved vSphere cloud config to library-go
vr4manta Apr 24, 2026
a388c80
Fixed issue where old vCenters not removed from new cloud config
vr4manta Jun 4, 2026
954ed4c
Vendor updates
vr4manta Apr 8, 2026
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
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,16 @@ require (
github.com/golangci/golangci-lint/v2 v2.11.1
github.com/onsi/ginkgo/v2 v2.28.1
github.com/onsi/gomega v1.39.1
github.com/openshift/api v0.0.0-20260317165824-54a3998d81eb
github.com/openshift/api v0.0.0-20260916094138-1a69e30ec990
github.com/openshift/client-go v0.0.0-20260317180604-743f664b82d1
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20260310144400-bec013a007a8
github.com/openshift/controller-runtime-common v0.0.0-20260318085703-1812aed6dbd2
github.com/openshift/library-go v0.0.0-20260318142011-72bf34f474bc
github.com/openshift/library-go v0.0.0-20260909144031-8fc95c63c590
github.com/spf13/cobra v1.10.2
github.com/spf13/pflag v1.0.10
github.com/stretchr/testify v1.11.1
gopkg.in/gcfg.v1 v1.2.3
gopkg.in/ini.v1 v1.67.1
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.35.2
k8s.io/apiextensions-apiserver v0.35.1
k8s.io/apimachinery v0.35.2
Expand Down Expand Up @@ -320,6 +319,7 @@ require (
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
honnef.co/go/tools v0.7.0 // indirect
k8s.io/apiserver v0.35.1 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,16 +466,16 @@ github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=
github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg=
github.com/openshift-cloud-team/cloud-provider-vsphere v1.19.1-0.20260317135518-758abc9d59a5 h1:Mayj50dtdLPzUVmJNHJpM4GpFWq7fcy9FDIoYUfngQ4=
github.com/openshift-cloud-team/cloud-provider-vsphere v1.19.1-0.20260317135518-758abc9d59a5/go.mod h1:3uaiy47HteyMlDjJankjteem/s1hnbRBU1FgbekLMKU=
github.com/openshift/api v0.0.0-20260317165824-54a3998d81eb h1:iwBR3mzmyE3EMFx7R3CQ9lOccTS0dNht8TW82aGITg0=
github.com/openshift/api v0.0.0-20260317165824-54a3998d81eb/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
github.com/openshift/api v0.0.0-20260916094138-1a69e30ec990 h1:08zVkF7iCvsGhEAFK83jyvg7jS7pSy/wfFp3Ja1x/Mo=
github.com/openshift/api v0.0.0-20260916094138-1a69e30ec990/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
github.com/openshift/client-go v0.0.0-20260317180604-743f664b82d1 h1:Hr/R38eg5ZJXfbiaHumjJIN1buDZwhsm4ys4npVCXH0=
github.com/openshift/client-go v0.0.0-20260317180604-743f664b82d1/go.mod h1:Za51LlH76ALiQ/aKGBYJXmyJNkA//IDJ+I///30CA2M=
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20260310144400-bec013a007a8 h1:x62h16RetnB1ZP+zjSM9fsoMz98g95zte+DXeUDF34o=
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20260310144400-bec013a007a8/go.mod h1:n8RwIitgr5SAfvisrU0Ps+Szrn545DBU7nqtwATZphw=
github.com/openshift/controller-runtime-common v0.0.0-20260318085703-1812aed6dbd2 h1:GrZlVichOCE/lz8fg1+eNrAtkM0VSlqa9buuzN0vnb0=
github.com/openshift/controller-runtime-common v0.0.0-20260318085703-1812aed6dbd2/go.mod h1:XGabTMnNbz0M5Oa7IbscZp/jmcc7aHobvOCUWwkzKvM=
github.com/openshift/library-go v0.0.0-20260318142011-72bf34f474bc h1:a+rVRzEdFIwgDQLTbhiG3MEVuBXjLb/6HJRikTob+nY=
github.com/openshift/library-go v0.0.0-20260318142011-72bf34f474bc/go.mod h1:3bi4pLpYRdVd1aEhsHfRTJkwxwPLfRZ+ZePn3RmJd2k=
github.com/openshift/library-go v0.0.0-20260909144031-8fc95c63c590 h1:PwCbVsfAqoxCPmgIzrHiyDJNXIy9JC7MQU3YvjajruA=
github.com/openshift/library-go v0.0.0-20260909144031-8fc95c63c590/go.mod h1:jnC7fncyNlp9wu20ElexbQvZBnXXZ7NbejCOvU7UqWU=
github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
Expand Down
335 changes: 335 additions & 0 deletions go.work.sum
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions manifests/0000_26_cloud-controller-manager-operator_02_rbac_operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,9 @@ rules:
- get
- list
- watch
- create
- update
- patch
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand Down
181 changes: 0 additions & 181 deletions pkg/cloud/vsphere/vsphere_cloud_config/config_test.go
View file
Open in desktop

This file was deleted.

9 changes: 8 additions & 1 deletion pkg/cloud/vsphere/vsphere_config_transformer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
configv1 "github.com/openshift/api/config/v1"
"k8s.io/utils/net"

ccmConfig "github.com/openshift/cluster-cloud-controller-manager-operator/pkg/cloud/vsphere/vsphere_cloud_config"
ccmConfig "github.com/openshift/library-go/pkg/cloudprovider/vsphere"
"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
)

Expand Down Expand Up @@ -52,6 +52,10 @@ func CloudConfigTransformer(source string, infra *configv1.Infrastructure, netwo
// labels should only be applied if length of failuredomains is
// greater than one so existing single (or non-zonal) installs function.
if len(infra.Spec.PlatformSpec.VSphere.FailureDomains) > 1 {
// Initialize Labels if it's nil (happens when the input config doesn't have a labels: section)
if cpiCfg.Labels == nil {
cpiCfg.Labels = &ccmConfig.Labels{}
}
cpiCfg.Labels.Zone = zoneLabelValue
cpiCfg.Labels.Region = regionLabelValue
}
Expand All @@ -73,6 +77,9 @@ func setNodes(cfg *ccmConfig.CPIConfig, nodeNetworking *configv1.VSpherePlatform

// setVirtualCenters sets vcenter server sections according passed VSpherePlatformSpec
func setVirtualCenters(cfg *ccmConfig.CPIConfig, vSphereSpec *configv1.VSpherePlatformSpec) {
// Clear existing vcenters to ensure removed vcenters are not carried over
cfg.Vcenter = make(map[string]*ccmConfig.VirtualCenterConfig)

for _, vcenter := range vSphereSpec.VCenters {
cfg.Vcenter[vcenter.Server] = &ccmConfig.VirtualCenterConfig{
VCenterIP: vcenter.Server,
Expand Down
Loading