Skip to content

Commit 76e5851

Browse files
Madhu-1Madhu-1
authored
Merge pull request #32 from rchikatw/fix
api: removing dependency on hardcoded value when onboarding consumer
2 parents 0624163 + 0396293 commit 76e5851

File tree

765 files changed

+47840
-32823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

765 files changed

+47840
-32823
lines changed

‎controllers/storageclassclaim_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828

2929
"github.com/go-logr/logr"
3030
snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
31-
providerclient "github.com/red-hat-storage/ocs-operator/services/provider/client"
31+
providerclient "github.com/red-hat-storage/ocs-operator/v4/services/provider/client"
3232
corev1 "k8s.io/api/core/v1"
3333
storagev1 "k8s.io/api/storage/v1"
3434
"k8s.io/apimachinery/pkg/api/errors"

‎controllers/storageclient_controller.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/red-hat-storage/ocs-client-operator/pkg/utils"
3030

3131
configv1 "github.com/openshift/api/config/v1"
32-
providerClient "github.com/red-hat-storage/ocs-operator/services/provider/client"
32+
providerClient "github.com/red-hat-storage/ocs-operator/v4/services/provider/client"
3333
"google.golang.org/grpc/codes"
3434
"google.golang.org/grpc/status"
3535
batchv1 "k8s.io/api/batch/v1"
@@ -268,9 +268,8 @@ func (s *StorageClientReconciler) onboardConsumer(instance *v1alpha1.StorageClie
268268
}
269269

270270
name := fmt.Sprintf("storageconsumer-%s", clusterVersion.Spec.ClusterID)
271-
// TODO: remove hardcoding of the capacity
272271
response, err := externalClusterClient.OnboardConsumer(
273-
s.ctx, instance.Spec.OnboardingTicket, name, "1T")
272+
s.ctx, instance.Spec.OnboardingTicket, name)
274273
if err != nil {
275274
if st, ok := status.FromError(err); ok {
276275
s.logGrpcErrorAndReportEvent(instance, OnboardConsumer, err, st.Code())

‎go.mod

+40-43
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,46 @@ module github.com/red-hat-storage/ocs-client-operator
22

33
go 1.18
44

5-
replace k8s.io/client-go => k8s.io/client-go v0.25.2
5+
replace (
6+
github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3 // required by Rook v1.12
7+
k8s.io/client-go => k8s.io/client-go v0.26.4
8+
vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787
9+
)
10+
11+
exclude github.com/kubernetes-incubator/external-storage v0.20.4-openstorage-rc2
612

713
require (
814
github.com/go-logr/logr v1.2.3
915
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.2.0
1016
github.com/onsi/ginkgo v1.16.5
11-
github.com/onsi/gomega v1.24.1
17+
github.com/onsi/gomega v1.27.1
1218
github.com/openshift/api v0.0.0-20230217170555-ab002e9c06da
1319
github.com/pkg/errors v0.9.1
14-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.58.0
15-
github.com/red-hat-storage/ocs-operator v0.0.1-master.0.20230116143559-099b2ff54606
16-
github.com/stretchr/testify v1.8.0
17-
google.golang.org/grpc v1.49.0
20+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.63.0
21+
github.com/red-hat-storage/ocs-operator/v4 v4.0.0-20230720152055-bdf5b8abb7c0
22+
github.com/stretchr/testify v1.8.2
23+
google.golang.org/grpc v1.53.0
1824
gopkg.in/yaml.v2 v2.4.0
19-
k8s.io/api v0.26.1
20-
k8s.io/apimachinery v0.26.1
25+
k8s.io/api v0.26.4
26+
k8s.io/apimachinery v0.26.4
2127
k8s.io/client-go v12.0.0+incompatible
22-
k8s.io/klog/v2 v2.80.1
23-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
24-
sigs.k8s.io/controller-runtime v0.13.1
28+
k8s.io/klog/v2 v2.90.0
29+
k8s.io/utils v0.0.0-20230209194617-a36077c30491
30+
sigs.k8s.io/controller-runtime v0.14.5
2531
)
2632

2733
require (
28-
cloud.google.com/go v0.97.0 // indirect
29-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
30-
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
31-
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
32-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
33-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
34-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
3534
github.com/beorn7/perks v1.0.1 // indirect
36-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
37-
github.com/davecgh/go-spew v1.1.1 // indirect
38-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
35+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
36+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
37+
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
3938
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
4039
github.com/fsnotify/fsnotify v1.6.0 // indirect
4140
github.com/go-logr/zapr v1.2.3 // indirect
42-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
43-
github.com/go-openapi/jsonreference v0.20.0 // indirect
41+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
42+
github.com/go-openapi/jsonreference v0.20.2 // indirect
4443
github.com/go-openapi/swag v0.22.3 // indirect
4544
github.com/gogo/protobuf v1.3.2 // indirect
46-
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
4745
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4846
github.com/golang/protobuf v1.5.2 // indirect
4947
github.com/google/gnostic v0.6.9 // indirect
@@ -55,39 +53,38 @@ require (
5553
github.com/json-iterator/go v1.1.12 // indirect
5654
github.com/kr/pretty v0.3.0 // indirect
5755
github.com/mailru/easyjson v0.7.7 // indirect
58-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
56+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
5957
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6058
github.com/modern-go/reflect2 v1.0.2 // indirect
6159
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6260
github.com/nxadm/tail v1.4.8 // indirect
63-
github.com/pmezard/go-difflib v1.0.0 // indirect
61+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6462
github.com/prometheus/client_golang v1.14.0 // indirect
6563
github.com/prometheus/client_model v0.3.0 // indirect
66-
github.com/prometheus/common v0.37.0 // indirect
67-
github.com/prometheus/procfs v0.8.0 // indirect
68-
github.com/rogpeppe/go-internal v1.6.2 // indirect
64+
github.com/prometheus/common v0.40.0 // indirect
65+
github.com/prometheus/procfs v0.9.0 // indirect
66+
github.com/rogpeppe/go-internal v1.9.0 // indirect
6967
github.com/spf13/pflag v1.0.5 // indirect
70-
go.uber.org/atomic v1.9.0 // indirect
71-
go.uber.org/multierr v1.8.0 // indirect
68+
go.uber.org/atomic v1.10.0 // indirect
69+
go.uber.org/multierr v1.9.0 // indirect
7270
go.uber.org/zap v1.24.0 // indirect
73-
golang.org/x/crypto v0.1.0 // indirect
74-
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
75-
golang.org/x/oauth2 v0.0.0-20220808172628-8227340efae7 // indirect
76-
golang.org/x/sys v0.3.0 // indirect
77-
golang.org/x/term v0.3.0 // indirect
78-
golang.org/x/text v0.5.0 // indirect
71+
golang.org/x/net v0.8.0 // indirect
72+
golang.org/x/oauth2 v0.6.0 // indirect
73+
golang.org/x/sys v0.6.0 // indirect
74+
golang.org/x/term v0.6.0 // indirect
75+
golang.org/x/text v0.8.0 // indirect
7976
golang.org/x/time v0.3.0 // indirect
8077
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
8178
google.golang.org/appengine v1.6.7 // indirect
82-
google.golang.org/genproto v0.0.0-20220808145710-bf34ca4dd83a // indirect
83-
google.golang.org/protobuf v1.28.1 // indirect
79+
google.golang.org/genproto v0.0.0-20230320184635-7606e756e683 // indirect
80+
google.golang.org/protobuf v1.29.1 // indirect
8481
gopkg.in/inf.v0 v0.9.1 // indirect
8582
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8683
gopkg.in/yaml.v3 v3.0.1 // indirect
87-
k8s.io/apiextensions-apiserver v0.26.0 // indirect
88-
k8s.io/component-base v0.26.0 // indirect
89-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
90-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
84+
k8s.io/apiextensions-apiserver v0.26.4 // indirect
85+
k8s.io/component-base v0.26.4 // indirect
86+
k8s.io/kube-openapi v0.0.0-20230217203603-ff9a8e8fa21d // indirect
87+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
9188
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
9289
sigs.k8s.io/yaml v1.3.0 // indirect
9390
)

0 commit comments

Comments
 (0)