Skip to content

Commit 4e96c36

Browse files
stuggistuggi
committed
Migrate to gophercloud v2
Update swift-operator to use gophercloud v2.8.0. Changes: - Update go.mod to use gophercloud/v2 v2.8.0 - Update import paths in pkg/swiftproxy/barbican.go to use v2 - Add context.Context parameter to Barbican API calls: - secrets.List().AllPages(ctx) - orders.Create(ctx, ...) Jira: OSPRH-18162 Depends-On: openstack-k8s-operators/lib-common#645 Depends-On: openstack-k8s-operators/keystone-operator#635 AssistedBy: cloude-4-sonnet Signed-off-by: Martin Schuppert <[email protected]>
1 parent c0eab4b commit 4e96c36

File tree

5 files changed

+74
-87
lines changed

5 files changed

+74
-87
lines changed

‎api/go.mod‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ require (
77
github.com/onsi/gomega v1.34.1
88
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182
99
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250922082314-c83d83092a04
10-
k8s.io/api v0.31.12
11-
k8s.io/apimachinery v0.31.12
12-
k8s.io/client-go v0.31.12
10+
k8s.io/api v0.31.13
11+
k8s.io/apimachinery v0.31.13
12+
k8s.io/client-go v0.31.13
1313
sigs.k8s.io/controller-runtime v0.19.7
1414
)
1515

@@ -31,7 +31,7 @@ require (
3131
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3232
github.com/golang/protobuf v1.5.4 // indirect
3333
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
34-
github.com/google/go-cmp v0.6.0 // indirect
34+
github.com/google/go-cmp v0.7.0 // indirect
3535
github.com/google/gofuzz v1.2.0 // indirect
3636
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
3737
github.com/google/uuid v1.6.0 // indirect
@@ -52,19 +52,19 @@ require (
5252
go.uber.org/multierr v1.11.0 // indirect
5353
go.uber.org/zap v1.27.0 // indirect
5454
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
55-
golang.org/x/net v0.28.0 // indirect
55+
golang.org/x/net v0.43.0 // indirect
5656
golang.org/x/oauth2 v0.21.0 // indirect
57-
golang.org/x/sys v0.23.0 // indirect
58-
golang.org/x/term v0.23.0 // indirect
59-
golang.org/x/text v0.17.0 // indirect
57+
golang.org/x/sys v0.35.0 // indirect
58+
golang.org/x/term v0.34.0 // indirect
59+
golang.org/x/text v0.28.0 // indirect
6060
golang.org/x/time v0.5.0 // indirect
61-
golang.org/x/tools v0.24.0 // indirect
61+
golang.org/x/tools v0.35.0 // indirect
6262
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
63-
google.golang.org/protobuf v1.34.2 // indirect
63+
google.golang.org/protobuf v1.36.7 // indirect
6464
gopkg.in/inf.v0 v0.9.1 // indirect
6565
gopkg.in/yaml.v2 v2.4.0 // indirect
6666
gopkg.in/yaml.v3 v3.0.1 // indirect
67-
k8s.io/apiextensions-apiserver v0.31.12 // indirect
67+
k8s.io/apiextensions-apiserver v0.31.13 // indirect
6868
k8s.io/klog/v2 v2.130.1 // indirect
6969
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
7070
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect

‎api/go.sum‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6
3737
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 h1:0VpGH+cDhbDtdcweoyCVsF3fhN8kejK6rFe/2FFX2nU=
3838
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49/go.mod h1:BkkQ4L1KS1xMt2aWSPStnn55ChGC0DPOn2FQYj+f25M=
3939
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
40-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
41-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
40+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
4241
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
4342
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
4443
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -117,8 +116,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
117116
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
118117
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
119118
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
120-
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
121-
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
119+
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
122120
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
123121
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
124122
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -127,30 +125,25 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
127125
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
128126
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
129127
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
130-
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
131-
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
132-
golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
133-
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
128+
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
129+
golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
134130
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
135131
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
136-
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
137-
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
132+
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
138133
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
139134
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
140135
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
141136
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
142137
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
143138
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
144-
golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
145-
golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
139+
golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
146140
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
147141
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
148142
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
149143
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
150144
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
151145
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
152-
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
153-
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
146+
google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
154147
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
155148
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
156149
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -163,14 +156,10 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
163156
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
164157
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
165158
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
166-
k8s.io/api v0.31.12 h1:yysm83xHIoKAwfm2w0dT6Yz7vfWzl841AEMI7Y8wDa8=
167-
k8s.io/api v0.31.12/go.mod h1:f/srhhI7aDs9K4s0W1GX4/zb+cIf5uWrBjGyoO/XgJc=
168-
k8s.io/apiextensions-apiserver v0.31.12 h1:d32I3VReAly5Qoc9ZXhO4/iObYmm7Jk6VvAeRAbg/MA=
169-
k8s.io/apiextensions-apiserver v0.31.12/go.mod h1:KcBI/Z/WQmbffBwfqQmqHhALhvun5JNJJh8Y29CJwUo=
170-
k8s.io/apimachinery v0.31.12 h1:y34W8rNKc+jDxUvEXarjahqM6vOV5iqgZPuRqRuyEh8=
171-
k8s.io/apimachinery v0.31.12/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
172-
k8s.io/client-go v0.31.12 h1:JJhouOoU1bKdPWplkZ2CpYA74+lxj3Zsn15aoGLX6Hk=
173-
k8s.io/client-go v0.31.12/go.mod h1:kjQ5WSec9ShP3T1auTDFW4bTqgmJdBuZPsjq5FqeuYE=
159+
k8s.io/api v0.31.13 h1:sco9Cq2pY4Ysv9qZiWzcR97MmA/35nwYQ/VCTzOcWmc=
160+
k8s.io/apiextensions-apiserver v0.31.13 h1:8xtWKVpV/YbYX0UX2k6w+cgxfxKhX0UNGuo/VXAdg8g=
161+
k8s.io/apimachinery v0.31.13 h1:rkG0EiBkBkEzURo/8dKGx/oBF202Z2LqHuSD8Cm3bG4=
162+
k8s.io/client-go v0.31.13 h1:Q0LG51uFbzNd9fzIj5ilA0Sm1wUholHvDaNwVKzqdCA=
174163
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
175164
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
176165
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 h1:qVoMaQV5t62UUvHe16Q3eb2c5HPzLHYzsi0Tu/xLndo=

‎go.mod‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24
44

55
require (
66
github.com/go-logr/logr v1.4.3
7-
github.com/gophercloud/gophercloud v1.14.1
7+
github.com/gophercloud/gophercloud/v2 v2.8.0
88
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.7
99
github.com/onsi/ginkgo/v2 v2.20.1
1010
github.com/onsi/gomega v1.34.1
@@ -15,9 +15,9 @@ require (
1515
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250922082314-c83d83092a04
1616
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250922082314-c83d83092a04
1717
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240523121736-379011b2cfac
18-
k8s.io/api v0.31.12
19-
k8s.io/apimachinery v0.31.12
20-
k8s.io/client-go v0.31.12
18+
k8s.io/api v0.31.13
19+
k8s.io/apimachinery v0.31.13
20+
k8s.io/client-go v0.31.13
2121
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
2222
sigs.k8s.io/controller-runtime v0.19.7
2323
)
@@ -39,7 +39,7 @@ require (
3939
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4040
github.com/golang/protobuf v1.5.4 // indirect
4141
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
42-
github.com/google/go-cmp v0.6.0 // indirect
42+
github.com/google/go-cmp v0.7.0 // indirect
4343
github.com/google/gofuzz v1.2.0 // indirect
4444
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
4545
github.com/google/uuid v1.6.0 // indirect
@@ -63,19 +63,19 @@ require (
6363
go.uber.org/multierr v1.11.0 // indirect
6464
go.uber.org/zap v1.27.0 // indirect
6565
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
66-
golang.org/x/net v0.28.0 // indirect
66+
golang.org/x/net v0.43.0 // indirect
6767
golang.org/x/oauth2 v0.21.0 // indirect
68-
golang.org/x/sys v0.23.0 // indirect
69-
golang.org/x/term v0.23.0 // indirect
70-
golang.org/x/text v0.17.0 // indirect
68+
golang.org/x/sys v0.35.0 // indirect
69+
golang.org/x/term v0.34.0 // indirect
70+
golang.org/x/text v0.28.0 // indirect
7171
golang.org/x/time v0.5.0 // indirect
72-
golang.org/x/tools v0.24.0 // indirect
72+
golang.org/x/tools v0.35.0 // indirect
7373
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
74-
google.golang.org/protobuf v1.34.2 // indirect
74+
google.golang.org/protobuf v1.36.7 // indirect
7575
gopkg.in/inf.v0 v0.9.1 // indirect
7676
gopkg.in/yaml.v2 v2.4.0 // indirect
7777
gopkg.in/yaml.v3 v3.0.1 // indirect
78-
k8s.io/apiextensions-apiserver v0.31.12 // indirect
78+
k8s.io/apiextensions-apiserver v0.31.13 // indirect
7979
k8s.io/klog/v2 v2.130.1 // indirect
8080
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
8181
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
@@ -91,3 +91,7 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202507112000
9191

9292
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.6.0_patches_tag)
9393
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
94+
95+
replace github.com/openstack-k8s-operators/lib-common/modules/openstack => github.com/stuggi/lib-common/modules/openstack v0.0.0-20250930155844-c46eba0df5b5
96+
97+
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/stuggi/keystone-operator/api v0.0.0-20251001052249-b8abbe99eaf8

0 commit comments

Comments
 (0)