Skip to content

SPLAT-2651: Added support to mange kube-cloud-config for vSphere in openshift-config-managed #442

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

Draft
vr4manta wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

SPLAT-2651: Added support to mange kube-cloud-config for vSphere in openshift-config-managed #442

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
df3c817
Enhanced operator to own updatingvsphere cloud config in openshift-co…
vr4manta Apr 6, 2026
d4eab68
Added featuregate check logic
vr4manta Apr 8, 2026
da8846e
Moved vSphere cloud config to library-go
vr4manta Apr 24, 2026
6e23108
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
7 changes: 5 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ go 1.25.0
// Upstream release 1.35.0 vendors k8s 1.36-alpha. This is a patched release to vendor k8s 1.35.1
replace k8s.io/cloud-provider-vsphere => github.com/openshift-cloud-team/cloud-provider-vsphere v1.19.1-0.20260317135518-758abc9d59a5

// Temporary while testing: go get github.com/vr4manta/library-go@SPLAT-2651
replace github.com/openshift/library-go => github.com/vr4manta/library-go v0.0.0-20260423150140-79a3161b14ce

Comment on lines +9 to +11
Copy link
Copy Markdown

@coderabbitai coderabbitai Bot Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Remove temporary replace directive before merge.

The comment explicitly states this is temporary for testing. This replace directive pointing to a personal fork (github.com/vr4manta/library-go) must be removed before merging to main. The upstream openshift/library-go should contain the required vSphere cloudprovider package.

Consider tracking this with a TODO or ensuring the dependent library-go PR is merged first.

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@go.mod` around lines 9 - 11, The temporary replace directive that points to
the personal fork (replace github.com/openshift/library-go =>
github.com/vr4manta/library-go v0.0.0-...) must be removed: delete that replace
line from go.mod so the project uses the upstream
github.com/openshift/library-go module; if you need to track the change add a
TODO comment or a repository-level note to reintroduce it only if the upstream
PR for the vSphere cloudprovider hasn't merged yet and ensure go mod tidy/update
runs after removal.

require (
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
github.com/go-logr/logr v1.4.3
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-20260330162214-96f1f5ac7ff2
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
Expand All @@ -22,7 +25,6 @@ require (
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 +322,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,14 @@ 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-20260330162214-96f1f5ac7ff2 h1:q89bR1UvKEH9kNh9me1oqLYszKuhaeghorpkO3+DNwY=
github.com/openshift/api v0.0.0-20260330162214-96f1f5ac7ff2/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/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 Expand Up @@ -613,6 +611,8 @@ github.com/uudashr/gocognit v1.2.1 h1:CSJynt5txTnORn/DkhiB4mZjwPuifyASC8/6Q0I/QS
github.com/uudashr/gocognit v1.2.1/go.mod h1:acaubQc6xYlXFEMb9nWX2dYBzJ/bIjEkc1zzvyIZg5Q=
github.com/uudashr/iface v1.4.1 h1:J16Xl1wyNX9ofhpHmQ9h9gk5rnv2A6lX/2+APLTo0zU=
github.com/uudashr/iface v1.4.1/go.mod h1:pbeBPlbuU2qkNDn0mmfrxP2X+wjPMIQAy+r1MBXSXtg=
github.com/vr4manta/library-go v0.0.0-20260423150140-79a3161b14ce h1:y0Y5iroodk8okaoZsmFOHCPeUQqJrSzQnim3GdU6w1M=
github.com/vr4manta/library-go v0.0.0-20260423150140-79a3161b14ce/go.mod h1:ZFASWm/Uzc/ul5aoB3ql/Xg4d1BEM/hs4bJ/M8nf7pY=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
github.com/xen0n/gosmopolitan v1.3.0 h1:zAZI1zefvo7gcpbCOrPSHJZJYA9ZgLfJqtKzZ5pHqQM=
Expand Down
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 @@ -290,6 +290,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.

2 changes: 1 addition & 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"
Copy link
Copy Markdown

@coderabbitai coderabbitai Bot Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Check if the vSphere cloudprovider package exists in the upstream library-go
# This verifies if the fork changes have been merged

echo "Checking if the vsphere cloudprovider package exists in upstream library-go..."
curl -s -o /dev/null -w "%{http_code}" "https://api.github.com/repos/openshift/library-go/contents/pkg/cloudprovider/vsphere"
echo ""

# Also check for any open PRs from vr4manta to openshift/library-go
echo "Checking for related PRs..."
gh pr list --repo openshift/library-go --author vr4manta --state all --limit 5

Repository: openshift/cluster-cloud-controller-manager-operator

Length of output: 419

Resolve the temporary library-go fork dependency before merge.

The import path github.com/openshift/library-go/pkg/cloudprovider/vsphere does not exist in the upstream openshift/library-go repository. The code currently relies on a temporary replace directive in go.mod pointing to github.com/vr4manta/library-go. An open PR (#2175: "SPLAT-2651: Added vSphere cloud config modules from 3CMO") exists to add this package to upstream, but it remains unmerged. Either merge the upstream PR and remove the replace directive, or delay this PR until the fork changes are upstream.

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@pkg/cloud/vsphere/vsphere_config_transformer.go` at line 10, The code imports
the non-upstream package alias ccmConfig from
"github.com/openshift/library-go/pkg/cloudprovider/vsphere" which currently only
exists in a temporary fork referenced via a replace in go.mod; resolve this by
removing the temporary dependency: either wait until the upstream PR is merged
then update go.mod to remove the replace and ensure the import path
"github.com/openshift/library-go/pkg/cloudprovider/vsphere" is valid, or change
the import back to the fork's module path used in go.mod (e.g.,
"github.com/vr4manta/library-go/…") consistently and keep the replace until
upstream merges; update any references to ccmConfig in
vsphere_config_transformer.go accordingly and run go mod tidy to verify the
module graph.

"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
)

Expand Down
Loading