Skip to content

Commit b98329e

Browse files
author
shiftstack-merge-bot
committed
2 parents ce2c2d1 + c9b797f commit b98329e

21 files changed

+78
-94
lines changed

‎.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
env:
3838
GH_TOKEN: ${{ github.token }}
3939
- name: Release
40-
uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # tag=v2.2.2
40+
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # tag=v2.3.2
4141
with:
4242
draft: true
4343
files: out/*

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ unexport GOPATH
2727
TRACE ?= 0
2828

2929
# Go
30-
GO_VERSION ?= 1.23.8
30+
GO_VERSION ?= 1.23.10
3131

3232
# Directories.
3333
ARTIFACTS ?= $(REPO_ROOT)/_artifacts

‎go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ require (
2121
golang.org/x/crypto v0.33.0
2222
golang.org/x/text v0.22.0
2323
gopkg.in/ini.v1 v1.67.0
24-
k8s.io/api v0.30.13
25-
k8s.io/apiextensions-apiserver v0.30.13
26-
k8s.io/apimachinery v0.30.13
27-
k8s.io/client-go v0.30.13
28-
k8s.io/component-base v0.30.13
24+
k8s.io/api v0.30.14
25+
k8s.io/apiextensions-apiserver v0.30.14
26+
k8s.io/apimachinery v0.30.14
27+
k8s.io/client-go v0.30.14
28+
k8s.io/component-base v0.30.14
2929
k8s.io/klog/v2 v2.130.1
3030
k8s.io/utils v0.0.0-20231127182322-b307cd553661
3131
sigs.k8s.io/cluster-api v1.8.12
@@ -144,7 +144,7 @@ require (
144144
gopkg.in/inf.v0 v0.9.1 // indirect
145145
gopkg.in/yaml.v2 v2.4.0 // indirect
146146
gopkg.in/yaml.v3 v3.0.1 // indirect
147-
k8s.io/apiserver v0.30.13 // indirect
147+
k8s.io/apiserver v0.30.14 // indirect
148148
k8s.io/cluster-bootstrap v0.30.3 // indirect
149149
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
150150
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 // indirect

‎go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -430,20 +430,20 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
430430
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
431431
gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
432432
gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
433-
k8s.io/api v0.30.13 h1:sMd35sT564/4WbYC6zgd647T8BCFd/RQ/grjZ/SRILQ=
434-
k8s.io/api v0.30.13/go.mod h1:zC1tsa1wA83tgU2TvmNPDhoma8sdPZUSMybXXKXlV9Y=
435-
k8s.io/apiextensions-apiserver v0.30.13 h1:kOdHt09yVtHYtUPmY2EVpq3yropPFW+LEsp4fepQtWE=
436-
k8s.io/apiextensions-apiserver v0.30.13/go.mod h1:o84TU4UcbG7oT+2aUjsihUDH3GyRk0Ix65ppux5oTF0=
437-
k8s.io/apimachinery v0.30.13 h1:k/GhLdHZZcmjsJNnSSPpTcwh+JObsCrKcZpHUbUolhU=
438-
k8s.io/apimachinery v0.30.13/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
439-
k8s.io/apiserver v0.30.13 h1:xsvh/FGHA/hlT+eL5cSMTz3ZmNPo5aLz8oCO7YRNVQQ=
440-
k8s.io/apiserver v0.30.13/go.mod h1:uDJ1vHq25ZZDcmp4g6O8bIZFmYyurGgTxlpZop/LDRY=
441-
k8s.io/client-go v0.30.13 h1:yCO7SUSdra5oDvtiQOZSVbUePpmSIa1CuqOBucfLJOQ=
442-
k8s.io/client-go v0.30.13/go.mod h1:EC2CFt174JSlnAAYxmwFNLPCiczbZaZMNdgQlLxvOAg=
433+
k8s.io/api v0.30.14 h1:iPq9YNOz1vHcSuN9YTmRUt8iPpB1cYPxxjgbY25xfS4=
434+
k8s.io/api v0.30.14/go.mod h1:IdrH4AiKc2bqDDb1FAfwcP1pPRmDdyRIqNk4K8KkEoc=
435+
k8s.io/apiextensions-apiserver v0.30.14 h1:7hi4CMq9EVT4vjdFpDZ/E1yOqhfU5IDHl2M8bexjA4s=
436+
k8s.io/apiextensions-apiserver v0.30.14/go.mod h1:NHLlcx7YmhxktP+eBfjxYPmsfnmsBU2Ue3/ytHzAHJE=
437+
k8s.io/apimachinery v0.30.14 h1:2OvEYwWoWeb25+xzFGP/8gChu+MfRNv24BlCQdnfGzQ=
438+
k8s.io/apimachinery v0.30.14/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
439+
k8s.io/apiserver v0.30.14 h1:3iafln8nzOOShuTogncNiIM83FXxfqy3EaZMENjNn2o=
440+
k8s.io/apiserver v0.30.14/go.mod h1:X1LOQEPPmPQ4pGg3wWRz4euhDK96gE2mzX3enFE+8PE=
441+
k8s.io/client-go v0.30.14 h1:D81QZvBtv897JU4HRsx4YoaCDnzeZSvB8eApgmbtXVA=
442+
k8s.io/client-go v0.30.14/go.mod h1:9ytP3kKzrz3ZWavlWih4NB0mTdYA0DB1ElBHimq+JqQ=
443443
k8s.io/cluster-bootstrap v0.30.3 h1:MgxyxMkpaC6mu0BKWJ8985XCOnKU+eH3Iy+biwtDXRk=
444444
k8s.io/cluster-bootstrap v0.30.3/go.mod h1:h8BoLDfdD7XEEIXy7Bx9FcMzxHwz29jsYYi34bM5DKU=
445-
k8s.io/component-base v0.30.13 h1:EjCd4/k+/MeU7hNS1vVRTTCZySJcHS2Ud2FRN+ImD0c=
446-
k8s.io/component-base v0.30.13/go.mod h1:Wd5RRRSP3NYotwO1zJwOOmXXX7YXUd/wQDvs5cBmSnE=
445+
k8s.io/component-base v0.30.14 h1:kDevqj2uEZLJTh8wCsEkpELPUwSRHV64h0zA7N0fe38=
446+
k8s.io/component-base v0.30.14/go.mod h1:1MHb4dOuyJe0u61RO6xQYvZTtFaDg231WdC1agri2TE=
447447
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
448448
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
449449
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=

‎hack/codegen/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module sigs.k8s.io/cluster-api-provider-openstack/hack/codegen
33
go 1.22.2
44

55
require (
6-
k8s.io/apimachinery v0.30.13
7-
k8s.io/code-generator v0.30.13
6+
k8s.io/apimachinery v0.30.14
7+
k8s.io/code-generator v0.30.14
88
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
99
sigs.k8s.io/cluster-api v1.8.12
1010
)
@@ -42,8 +42,8 @@ require (
4242
gopkg.in/inf.v0 v0.9.1 // indirect
4343
gopkg.in/yaml.v2 v2.4.0 // indirect
4444
gopkg.in/yaml.v3 v3.0.1 // indirect
45-
k8s.io/api v0.30.13 // indirect
46-
k8s.io/apiextensions-apiserver v0.30.13 // indirect
45+
k8s.io/api v0.30.14 // indirect
46+
k8s.io/apiextensions-apiserver v0.30.14 // indirect
4747
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
4848
k8s.io/klog/v2 v2.130.1 // indirect
4949
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect

‎hack/codegen/go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,14 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
125125
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
126126
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
127127
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
128-
k8s.io/api v0.30.13 h1:sMd35sT564/4WbYC6zgd647T8BCFd/RQ/grjZ/SRILQ=
129-
k8s.io/api v0.30.13/go.mod h1:zC1tsa1wA83tgU2TvmNPDhoma8sdPZUSMybXXKXlV9Y=
130-
k8s.io/apiextensions-apiserver v0.30.13 h1:kOdHt09yVtHYtUPmY2EVpq3yropPFW+LEsp4fepQtWE=
131-
k8s.io/apiextensions-apiserver v0.30.13/go.mod h1:o84TU4UcbG7oT+2aUjsihUDH3GyRk0Ix65ppux5oTF0=
132-
k8s.io/apimachinery v0.30.13 h1:k/GhLdHZZcmjsJNnSSPpTcwh+JObsCrKcZpHUbUolhU=
133-
k8s.io/apimachinery v0.30.13/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
134-
k8s.io/code-generator v0.30.13 h1:82BUpqBe6zzK+se5+5gGyVQGCFGrQEaLVVpfoHoOm4c=
135-
k8s.io/code-generator v0.30.13/go.mod h1:evQLGOArW+ZyLyWR+59il/zSfavJ6MnycwcUHng13/E=
128+
k8s.io/api v0.30.14 h1:iPq9YNOz1vHcSuN9YTmRUt8iPpB1cYPxxjgbY25xfS4=
129+
k8s.io/api v0.30.14/go.mod h1:IdrH4AiKc2bqDDb1FAfwcP1pPRmDdyRIqNk4K8KkEoc=
130+
k8s.io/apiextensions-apiserver v0.30.14 h1:7hi4CMq9EVT4vjdFpDZ/E1yOqhfU5IDHl2M8bexjA4s=
131+
k8s.io/apiextensions-apiserver v0.30.14/go.mod h1:NHLlcx7YmhxktP+eBfjxYPmsfnmsBU2Ue3/ytHzAHJE=
132+
k8s.io/apimachinery v0.30.14 h1:2OvEYwWoWeb25+xzFGP/8gChu+MfRNv24BlCQdnfGzQ=
133+
k8s.io/apimachinery v0.30.14/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
134+
k8s.io/code-generator v0.30.14 h1:/y9zHj7j/JWSYWGu6cnOfyTs91ikH/HmGT+9HNqnHDg=
135+
k8s.io/code-generator v0.30.14/go.mod h1:Wc44RY8LMr7oaSxEc/bjWBaxO1HRppIHA4t+Dw7CT6k=
136136
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=
137137
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
138138
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

‎hack/codegen/go.work.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ k8s.io/kms v0.30.10/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4=
224224
k8s.io/kms v0.30.11/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4=
225225
k8s.io/kms v0.30.12/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4=
226226
k8s.io/kms v0.30.13/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4=
227+
k8s.io/kms v0.30.14/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4=
227228
k8s.io/kubectl v0.29.3 h1:RuwyyIU42MAISRIePaa8Q7A3U74Q9P4MoJbDFz9o3us=
228229
k8s.io/kubectl v0.29.3/go.mod h1:yCxfY1dbwgVdEt2zkJ6d5NNLOhhWgTyrqACIoFhpdd4=
229230
k8s.io/kubectl v0.30.3/go.mod h1:IcR0I9RN2+zzTRUa1BzZCm4oM0NLOawE6RzlDvd1Fpo=

‎hack/tools/go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/itchyny/gojq v0.12.17
1111
github.com/onsi/ginkgo/v2 v2.22.2
1212
go.uber.org/mock v0.5.1
13-
k8s.io/code-generator v0.31.9
13+
k8s.io/code-generator v0.31.10
1414
sigs.k8s.io/cluster-api-provider-openstack v0.0.0
1515
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221129083400-679ae3e9e6b6
1616
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230926180527-c93e2abcb28e
@@ -120,13 +120,13 @@ require (
120120
gopkg.in/inf.v0 v0.9.1 // indirect
121121
gopkg.in/yaml.v2 v2.4.0 // indirect
122122
gopkg.in/yaml.v3 v3.0.1 // indirect
123-
k8s.io/api v0.31.9 // indirect
124-
k8s.io/apiextensions-apiserver v0.31.9 // indirect
125-
k8s.io/apimachinery v0.31.9 // indirect
126-
k8s.io/apiserver v0.31.9 // indirect
127-
k8s.io/client-go v0.31.9 // indirect
123+
k8s.io/api v0.31.10 // indirect
124+
k8s.io/apiextensions-apiserver v0.31.10 // indirect
125+
k8s.io/apimachinery v0.31.10 // indirect
126+
k8s.io/apiserver v0.31.10 // indirect
127+
k8s.io/client-go v0.31.10 // indirect
128128
k8s.io/cluster-bootstrap v0.30.3 // indirect
129-
k8s.io/component-base v0.31.9 // indirect
129+
k8s.io/component-base v0.31.10 // indirect
130130
k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9 // indirect
131131
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 // indirect
132132
k8s.io/klog v0.2.0 // indirect

‎hack/tools/go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -432,22 +432,22 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
432432
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
433433
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
434434
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
435-
k8s.io/api v0.31.9 h1:+gN4iZNccfr6y2EX28ZgcAq4yUKNZMhg2Jl72+2hoxQ=
436-
k8s.io/api v0.31.9/go.mod h1:+rao9hnuB9AHXVoqqwxPh493H91pte1ZhfJ6oz1qLJA=
437-
k8s.io/apiextensions-apiserver v0.31.9 h1:5U+Y7vvV+lVqOBjNmmTO42PxoQrp44yzXTHievxEhdY=
438-
k8s.io/apiextensions-apiserver v0.31.9/go.mod h1:tx/XA+SO6HhoXhXqvaeF5+iHlL7dF3wWACB6plC23M8=
439-
k8s.io/apimachinery v0.31.9 h1:sLGkHzsAfWVp55os8PlKw+eeIsB3IeVU1QLb3XKHyg8=
440-
k8s.io/apimachinery v0.31.9/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
441-
k8s.io/apiserver v0.31.9 h1:Ebc8HTjGjkkiW7c2I1yK3WCv2V37P1oikVEOiw14ZeE=
442-
k8s.io/apiserver v0.31.9/go.mod h1:Nl/v7YIM6KDVDFtJDdLWQZu2Px+75vrxlMntZSU7b74=
443-
k8s.io/client-go v0.31.9 h1:SZr3xiDPdGwKeVR+jMYYubk1gJXA/go3obJeG/1Q/to=
444-
k8s.io/client-go v0.31.9/go.mod h1:ZwfOkKABRm2zSNR3s9OkADeyt0zhF9F78tJNupZM8zM=
435+
k8s.io/api v0.31.10 h1:hR39mlD3fxAMVotfj1aAEUOZhNMf+pL/XpL2zKvfLMk=
436+
k8s.io/api v0.31.10/go.mod h1:UwhlGlhYzRQuDudTdvUZ6bZZAKp0Zs82m+qEw/BZxCU=
437+
k8s.io/apiextensions-apiserver v0.31.10 h1:Scl+8yOqpbO/6eilafV7F1cpjVmobFWu8EJ3Y2TIKt4=
438+
k8s.io/apiextensions-apiserver v0.31.10/go.mod h1:0VbuO1j4eft+aMYjVy0piM+A+aITSvamJwOYRYJyHMw=
439+
k8s.io/apimachinery v0.31.10 h1:fKQxHMu8IFRsC5wsiA7ySL9Z/dw9LOmVs3cifAx1cXk=
440+
k8s.io/apimachinery v0.31.10/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
441+
k8s.io/apiserver v0.31.10 h1:oMK+nnYVh2+D7nujjeEbtBl/kbG9CyqrX06wjkFytdE=
442+
k8s.io/apiserver v0.31.10/go.mod h1:nzEhw+jN3NdDq8b+/uUqL5s4AFRmSkRv5ZJJs8eVuAc=
443+
k8s.io/client-go v0.31.10 h1:2WvGOFKKggxmx6kB6DP1NjdvLPyI6z+CtDWcQsyHpTI=
444+
k8s.io/client-go v0.31.10/go.mod h1:zRlFekIgyvhAEb8osZ6ar1//EqqGgW9C/j5jGVFNMXI=
445445
k8s.io/cluster-bootstrap v0.30.3 h1:MgxyxMkpaC6mu0BKWJ8985XCOnKU+eH3Iy+biwtDXRk=
446446
k8s.io/cluster-bootstrap v0.30.3/go.mod h1:h8BoLDfdD7XEEIXy7Bx9FcMzxHwz29jsYYi34bM5DKU=
447-
k8s.io/code-generator v0.31.9 h1:BHGXw8ZDNsZk0xAiBOmYxvLfSSayz1oSaBs4q3iWYkM=
448-
k8s.io/code-generator v0.31.9/go.mod h1:W7iHkUd4fWSs3lK39ab8T2Vy22HzRMkgjuS1mCW4KA8=
449-
k8s.io/component-base v0.31.9 h1:trlYOQMxtaSdEcGfQQ9BukKUS7wSIWqOrq4Jnk21hSk=
450-
k8s.io/component-base v0.31.9/go.mod h1:OKZS6U9o/vzKVcwv2zPdMiAWHWhyv5/wwv3aWB5eesI=
447+
k8s.io/code-generator v0.31.10 h1:Jd8PlF7KV3qbBZmyRPbp4ILxIX5an1/wTPad0/yWydw=
448+
k8s.io/code-generator v0.31.10/go.mod h1:jvgG+pPpGNJgAj0sC2sRrVeIyW9sYNf6dEpOI1GUYGw=
449+
k8s.io/component-base v0.31.10 h1:8daIQBYMhcnuXMD1otGkjpx4d4b0UIcg18xieLTAGA0=
450+
k8s.io/component-base v0.31.10/go.mod h1:qoSFFg2SO854XgeCJwFL/LPY/oJU1vqJHhNCEgI6xhA=
451451
k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9 h1:1bLA4Agvs1DILmc+q2Bbcqjx6jOHO7YEFA+G+0aTZoc=
452452
k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
453453
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=

‎kustomize/v1beta1/default/cluster-template.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ spec:
7373
cloud-provider: external
7474
provider-id: "openstack:///'{{ instance_id }}'"
7575
clusterConfiguration:
76-
apiServer:
77-
extraArgs:
78-
cloud-provider: external
7976
controllerManager:
8077
extraArgs:
8178
cloud-provider: external

0 commit comments

Comments
 (0)