Skip to content
This repository was archived by the owner on Dec 16, 2025. It is now read-only.

Commit 87d8ab2

Browse files
cluster-stack-bot[bot]chess-knight
cluster-stack-bot[bot]
and
chess-knight
authored
🌱 Update Golang Dependencies group to b57aefb (#140)
* 🌱 Update Golang Dependencies group to b57aefb * Update go.mod Signed-off-by: Roman Hros <[email protected]> * Update gophercloud/utils to v2 Signed-off-by: Roman Hros <[email protected]> * Update gophercloud/gophercloud to v2 Signed-off-by: Roman Hros <[email protected]> --------- Signed-off-by: Roman Hros <[email protected]> Co-authored-by: cluster-stack-bot[bot] <143188378+cluster-stack-bot[bot]@users.noreply.github.com> Co-authored-by: Roman Hros <[email protected]>
1 parent e73ef8e commit 87d8ab2

File tree

124 files changed

+6178
-476
lines changed

Some content is hidden

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

124 files changed

+6178
-476
lines changed

‎.builder-image-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.0
1+
0.1.1

‎api/v1alpha1/openstacknodeimagerelease_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1alpha1
1818

1919
import (
20-
"github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
20+
"github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/images"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
apiv1alpha7 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7"
2323
clusterv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"

‎api/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
module github.com/sovereignCloudStack/cluster-stack-provider-openstack
22

3-
go 1.21
3+
go 1.21.6
4+
5+
toolchain go1.22.1
46

57
require (
68
github.com/SovereignCloudStack/cluster-stack-operator v0.1.0-alpha.5
79
github.com/google/go-github/v52 v52.0.0
8-
github.com/gophercloud/gophercloud v1.11.0
9-
github.com/gophercloud/utils v0.0.0-20231010081019-80377eca5d56
10+
github.com/gophercloud/gophercloud/v2 v2.0.0-beta.2
11+
github.com/gophercloud/utils/v2 v2.0.0-20240305212012-b57aefba4cdb
1012
github.com/onsi/ginkgo/v2 v2.17.1
1113
github.com/onsi/gomega v1.32.0
1214
github.com/stretchr/testify v1.9.0
@@ -47,6 +49,7 @@ require (
4749
github.com/google/gofuzz v1.2.0 // indirect
4850
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
4951
github.com/google/uuid v1.3.1 // indirect
52+
github.com/gophercloud/gophercloud v1.11.0 // indirect
5053
github.com/hashicorp/go-uuid v1.0.3 // indirect
5154
github.com/imdario/mergo v0.3.15 // indirect
5255
github.com/josharian/intern v1.0.0 // indirect
@@ -67,13 +70,13 @@ require (
6770
github.com/stretchr/objx v0.5.2 // indirect
6871
go.uber.org/multierr v1.11.0 // indirect
6972
go.uber.org/zap v1.25.0 // indirect
70-
golang.org/x/crypto v0.18.0 // indirect
73+
golang.org/x/crypto v0.20.0 // indirect
7174
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
7275
golang.org/x/mod v0.14.0 // indirect
73-
golang.org/x/net v0.20.0 // indirect
76+
golang.org/x/net v0.21.0 // indirect
7477
golang.org/x/oauth2 v0.14.0 // indirect
75-
golang.org/x/sys v0.16.0 // indirect
76-
golang.org/x/term v0.16.0 // indirect
78+
golang.org/x/sys v0.18.0 // indirect
79+
golang.org/x/term v0.17.0 // indirect
7780
golang.org/x/text v0.14.0 // indirect
7881
golang.org/x/time v0.3.0 // indirect
7982
golang.org/x/tools v0.17.0 // indirect

‎go.sum‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,12 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJY
9393
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
9494
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
9595
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
96-
github.com/gophercloud/gophercloud v1.3.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
9796
github.com/gophercloud/gophercloud v1.11.0 h1:ls0O747DIq1D8SUHc7r2vI8BFbMLeLFuENaAIfEx7OM=
9897
github.com/gophercloud/gophercloud v1.11.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
99-
github.com/gophercloud/utils v0.0.0-20231010081019-80377eca5d56 h1:sH7xkTfYzxIEgzq1tDHIMKRh1vThOEOGNsettdEeLbE=
100-
github.com/gophercloud/utils v0.0.0-20231010081019-80377eca5d56/go.mod h1:VSalo4adEk+3sNkmVJLnhHoOyOYYS8sTWLG4mv5BKto=
98+
github.com/gophercloud/gophercloud/v2 v2.0.0-beta.2 h1:JWv6L7eg3+aIS57n11YlVvtn1pVCKpVlMo24ANj/OVc=
99+
github.com/gophercloud/gophercloud/v2 v2.0.0-beta.2/go.mod h1:Sy5GHwY4iazyaRf94rzL/VxJToVWn8WnIH+1cXqoAks=
100+
github.com/gophercloud/utils/v2 v2.0.0-20240305212012-b57aefba4cdb h1:Mh5JdhNBmS9UPOsZdB3Vf09McFVumONpQzNGTXfKDxs=
101+
github.com/gophercloud/utils/v2 v2.0.0-20240305212012-b57aefba4cdb/go.mod h1:lnmaqFj6tCRbGAvvda4DIs6Aryii/1ETsDTOi+1hAs8=
101102
github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
102103
github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
103104
github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU=
@@ -181,7 +182,6 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8
181182
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
182183
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
183184
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
184-
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
185185
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
186186
go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
187187
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -197,15 +197,14 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
197197
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
198198
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
199199
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
200-
golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
201-
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
200+
golang.org/x/crypto v0.20.0 h1:jmAMJJZXr5KiCw05dfYK9QnqaqKLYXijU23lsEdcQqg=
201+
golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ=
202202
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
203203
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
204204
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
205205
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
206206
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
207207
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
208-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
209208
golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
210209
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
211210
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -217,17 +216,15 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
217216
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
218217
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
219218
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
220-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
221-
golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
222-
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
219+
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
220+
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
223221
golang.org/x/oauth2 v0.14.0 h1:P0Vrf/2538nmC0H+pEQ3MNFRRnVR7RlqyVw+bvm26z0=
224222
golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM=
225223
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
226224
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
227225
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
228226
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
229227
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
230-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
231228
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
232229
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
233230
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -240,22 +237,16 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
240237
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
241238
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
242239
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
243-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
244-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
245240
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
246-
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
247-
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
248-
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
241+
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
242+
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
249243
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
250-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
251-
golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
252-
golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
244+
golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=
245+
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
253246
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
254247
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
255248
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
256249
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
257-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
258-
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
259250
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
260251
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
261252
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
@@ -266,7 +257,6 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
266257
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
267258
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
268259
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
269-
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
270260
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
271261
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
272262
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎internal/controller/openstackclusterstackrelease_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
githubmocks "github.com/SovereignCloudStack/cluster-stack-operator/pkg/github/client/mocks"
2828
"github.com/google/go-github/v52/github"
29-
"github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
29+
"github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/images"
3030
. "github.com/onsi/ginkgo/v2"
3131
. "github.com/onsi/gomega"
3232
apiv1alpha1 "github.com/sovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1"

‎internal/controller/openstacknodeimagerelease_controller.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import (
2222
"fmt"
2323
"time"
2424

25-
"github.com/gophercloud/gophercloud"
26-
"github.com/gophercloud/gophercloud/openstack"
27-
"github.com/gophercloud/gophercloud/openstack/imageservice/v2/imageimport"
28-
"github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
29-
"github.com/gophercloud/utils/openstack/clientconfig"
25+
"github.com/gophercloud/gophercloud/v2"
26+
"github.com/gophercloud/gophercloud/v2/openstack"
27+
"github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/imageimport"
28+
"github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/images"
29+
"github.com/gophercloud/utils/v2/openstack/clientconfig"
3030
apiv1alpha1 "github.com/sovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1"
3131
corev1 "k8s.io/api/core/v1"
3232
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -124,7 +124,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
124124

125125
// Create an OpenStack provider client
126126
opts := &clientconfig.ClientOpts{AuthInfo: cloud.AuthInfo}
127-
providerClient, err := clientconfig.AuthenticatedClient(opts)
127+
providerClient, err := clientconfig.AuthenticatedClient(ctx, opts)
128128
if err != nil {
129129
record.Warnf(openstacknodeimagerelease, "OpenStackProviderClientNotSet", err.Error())
130130
logger.Error(err, "failed to create a provider client")
@@ -147,7 +147,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
147147

148148
conditions.MarkTrue(openstacknodeimagerelease, apiv1alpha1.OpenStackImageServiceClientAvailableCondition)
149149

150-
imageID, err := getImageID(imageClient, openstacknodeimagerelease.Spec.Image.CreateOpts)
150+
imageID, err := getImageID(ctx, imageClient, openstacknodeimagerelease.Spec.Image.CreateOpts)
151151
if err != nil {
152152
conditions.MarkFalse(openstacknodeimagerelease,
153153
apiv1alpha1.OpenStackImageReadyCondition,
@@ -167,7 +167,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
167167
openstacknodeimagerelease.Status.Ready = false
168168

169169
imageCreateOpts := openstacknodeimagerelease.Spec.Image.CreateOpts
170-
imageCreated, err := createImage(imageClient, imageCreateOpts)
170+
imageCreated, err := createImage(ctx, imageClient, imageCreateOpts)
171171
if err != nil {
172172
conditions.MarkFalse(openstacknodeimagerelease,
173173
apiv1alpha1.OpenStackImageReadyCondition,
@@ -185,7 +185,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
185185
Name: imageimport.WebDownloadMethod,
186186
URI: openstacknodeimagerelease.Spec.Image.URL,
187187
}
188-
err = importImage(imageClient, imageCreated.ID, imageImportOpts)
188+
err = importImage(ctx, imageClient, imageCreated.ID, imageImportOpts)
189189
if err != nil {
190190
conditions.MarkFalse(openstacknodeimagerelease,
191191
apiv1alpha1.OpenStackImageReadyCondition,
@@ -206,7 +206,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
206206
}
207207

208208
// Check if image is active
209-
image, err := images.Get(imageClient, imageID).Extract()
209+
image, err := images.Get(ctx, imageClient, imageID).Extract()
210210
if err != nil {
211211
conditions.MarkFalse(openstacknodeimagerelease,
212212
apiv1alpha1.OpenStackImageReadyCondition,
@@ -331,7 +331,7 @@ func (r *OpenStackNodeImageReleaseReconciler) getCloudFromSecret(ctx context.Con
331331
return cloud, nil
332332
}
333333

334-
func getImageID(imagesClient *gophercloud.ServiceClient, imageCreateOps *apiv1alpha1.CreateOpts) (string, error) {
334+
func getImageID(ctx context.Context, imagesClient *gophercloud.ServiceClient, imageCreateOps *apiv1alpha1.CreateOpts) (string, error) {
335335
var listOpts images.ListOpts
336336

337337
if imageCreateOps.ID != "" {
@@ -345,7 +345,7 @@ func getImageID(imagesClient *gophercloud.ServiceClient, imageCreateOps *apiv1al
345345
}
346346
}
347347

348-
allPages, err := images.List(imagesClient, listOpts).AllPages()
348+
allPages, err := images.List(imagesClient, listOpts).AllPages(ctx)
349349
if err != nil {
350350
return "", fmt.Errorf("failed to list images with name %s: %w", imageCreateOps.Name, err)
351351
}
@@ -365,17 +365,17 @@ func getImageID(imagesClient *gophercloud.ServiceClient, imageCreateOps *apiv1al
365365
}
366366
}
367367

368-
func createImage(imageClient *gophercloud.ServiceClient, createOpts *apiv1alpha1.CreateOpts) (*images.Image, error) {
369-
image, err := images.Create(imageClient, (*images.CreateOpts)(createOpts)).Extract()
368+
func createImage(ctx context.Context, imageClient *gophercloud.ServiceClient, createOpts *apiv1alpha1.CreateOpts) (*images.Image, error) {
369+
image, err := images.Create(ctx, imageClient, (*images.CreateOpts)(createOpts)).Extract()
370370
if err != nil {
371371
return nil, fmt.Errorf("failed to create image with name %s: %w", createOpts.Name, err)
372372
}
373373

374374
return image, nil
375375
}
376376

377-
func importImage(imageClient *gophercloud.ServiceClient, imageID string, createOpts imageimport.CreateOpts) error {
378-
err := imageimport.Create(imageClient, imageID, createOpts).ExtractErr()
377+
func importImage(ctx context.Context, imageClient *gophercloud.ServiceClient, imageID string, createOpts imageimport.CreateOpts) error {
378+
err := imageimport.Create(ctx, imageClient, imageID, createOpts).ExtractErr()
379379
if err != nil {
380380
return fmt.Errorf("failed to import image with ID %s: %w", imageID, err)
381381
}

0 commit comments

Comments
 (0)