Skip to content

Syncing latest changes from main for ocs-client-operator #491

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-bot merged 4 commits into from
Oct 28, 2025
Merged

Syncing latest changes from main for ocs-client-operator #491

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
36f3a5d
godeps: update go version to 1.24.6
leelavg Oct 15, 2025
58fb618
Merge pull request #488 from leelavg/bump-go
openshift-merge-bot[bot] Oct 17, 2025
059ce8a
controllers: allow deleting a not onboarded client
leelavg Oct 24, 2025
f92bc76
Merge pull request #490 from leelavg/remove-non-onboard
openshift-merge-bot[bot] Oct 24, 2025
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 api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/red-hat-storage/ocs-client-operator/api

go 1.23.0
go 1.24.6

require k8s.io/apimachinery v0.31.0

Expand Down
4 changes: 1 addition & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/red-hat-storage/ocs-client-operator

go 1.24.3

toolchain go1.24.5
go 1.24.6

replace (
github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3 // required by Rook v1.12
Expand Down
4 changes: 4 additions & 0 deletions internal/controller/storageclient_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,10 @@ func (r *storageClientReconcile) onboardConsumer(externalClusterClient *provider

// offboardConsumer makes an API call to the external storage provider cluster for offboarding
func (r *storageClientReconcile) offboardConsumer(externalClusterClient *providerClient.OCSProviderClient) error {
// the client wasn't onboarded at all
if r.storageClient.Status.ConsumerID == "" {
return nil
}
if _, err := externalClusterClient.OffboardConsumer(r.ctx, r.storageClient.Status.ConsumerID); err != nil {
return fmt.Errorf("failed to offboard consumer: %v", err)
}
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ github.com/ramendr/ramen/api/v1alpha1
## explicit; go 1.22.0
github.com/red-hat-storage/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta1
# github.com/red-hat-storage/ocs-client-operator/api v0.0.0-00010101000000-000000000000 => ./api
## explicit; go 1.23.0
## explicit; go 1.24.6
github.com/red-hat-storage/ocs-client-operator/api/v1alpha1
# github.com/red-hat-storage/ocs-operator/services/provider/api/v4 v4.0.0-20251009102644-5727239a7b48
## explicit; go 1.24.3
Expand Down