Skip to content

Commit cc76099

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #361 from shiftstack/merge-bot-main
Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.12 into main
2 parents a494031 + 02f3774 commit cc76099

File tree

13 files changed

+106
-74
lines changed

13 files changed

+106
-74
lines changed

‎controllers/openstackcluster_controller.go‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,18 @@ func (r *OpenStackClusterReconciler) deleteBastion(ctx context.Context, scope *s
248248
return err
249249
}
250250

251+
var statusFloatingIP *string
252+
var specFloatingIP *string
251253
if openStackCluster.Status.Bastion != nil && openStackCluster.Status.Bastion.FloatingIP != "" {
254+
statusFloatingIP = &openStackCluster.Status.Bastion.FloatingIP
255+
}
256+
if openStackCluster.Spec.Bastion != nil && openStackCluster.Spec.Bastion.FloatingIP != nil {
257+
specFloatingIP = openStackCluster.Spec.Bastion.FloatingIP
258+
}
259+
260+
// We only remove the bastion's floating IP if it exists and if it's not the same value defined both in the spec and in status.
261+
// This decision was made so if a user specifies a pre-created floating IP that is intended to only be used for the bastion, the floating IP won't get removed once the bastion is destroyed.
262+
if statusFloatingIP != nil && (specFloatingIP == nil || *statusFloatingIP != *specFloatingIP) {
252263
if err = networkingService.DeleteFloatingIP(openStackCluster, openStackCluster.Status.Bastion.FloatingIP); err != nil {
253264
handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete floating IP: %w", err), false)
254265
return fmt.Errorf("failed to delete floating IP: %w", err)
@@ -274,6 +285,11 @@ func (r *OpenStackClusterReconciler) deleteBastion(ctx context.Context, scope *s
274285

275286
for _, address := range addresses {
276287
if address.Type == corev1.NodeExternalIP {
288+
// If a floating IP retrieved is the same as what is set in the bastion spec, skip deleting it.
289+
// This decision was made so if a user specifies a pre-created floating IP that is intended to only be used for the bastion, the floating IP won't get removed once the bastion is destroyed.
290+
if specFloatingIP != nil && address.Address == *specFloatingIP {
291+
continue
292+
}
277293
// Floating IP may not have properly saved in bastion status (thus not deleted above), delete any remaining floating IP
278294
if err = networkingService.DeleteFloatingIP(openStackCluster, address.Address); err != nil {
279295
handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete floating IP: %w", err), false)

‎controllers/openstackserver_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func (r *OpenStackServerReconciler) Reconcile(ctx context.Context, req ctrl.Requ
106106
}
107107
if cluster != nil {
108108
if annotations.IsPaused(cluster, openStackServer) {
109-
scope.Logger().Info("OpenStackServer %s/%s linked to a Cluster that is paused. Won't reconcile", openStackServer.Namespace, openStackServer.Name)
109+
scope.Logger().Info("OpenStackServer linked to a Cluster that is paused. Won't reconcile")
110110
return reconcile.Result{}, nil
111111
}
112112
}

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ require (
2020
golang.org/x/crypto v0.36.0
2121
golang.org/x/text v0.23.0
2222
gopkg.in/ini.v1 v1.67.0
23-
k8s.io/api v0.31.6
24-
k8s.io/apiextensions-apiserver v0.31.6
25-
k8s.io/apimachinery v0.31.6
26-
k8s.io/client-go v0.31.6
27-
k8s.io/code-generator v0.31.6
28-
k8s.io/component-base v0.31.6
23+
k8s.io/api v0.31.7
24+
k8s.io/apiextensions-apiserver v0.31.7
25+
k8s.io/apimachinery v0.31.7
26+
k8s.io/client-go v0.31.7
27+
k8s.io/code-generator v0.31.7
28+
k8s.io/component-base v0.31.7
2929
k8s.io/klog/v2 v2.130.1
3030
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
3131
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
@@ -150,7 +150,7 @@ require (
150150
gopkg.in/inf.v0 v0.9.1 // indirect
151151
gopkg.in/yaml.v2 v2.4.0 // indirect
152152
gopkg.in/yaml.v3 v3.0.1 // indirect
153-
k8s.io/apiserver v0.31.6 // indirect
153+
k8s.io/apiserver v0.31.7 // indirect
154154
k8s.io/cluster-bootstrap v0.31.3 // indirect
155155
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
156156
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -414,22 +414,22 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
414414
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
415415
gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
416416
gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
417-
k8s.io/api v0.31.6 h1:ocWG/UhC9Mqp5oEfYWy9wCddbZiZyBAFTlBt0LVlhDg=
418-
k8s.io/api v0.31.6/go.mod h1:i16xSiKMgVIVhsJMxfWq0mJbXA+Z7KhjPgYmwT41hl4=
419-
k8s.io/apiextensions-apiserver v0.31.6 h1:v9sqyWlrgFZpAPdEb/bEiXfM98TfSppwRF0X/uWKXh0=
420-
k8s.io/apiextensions-apiserver v0.31.6/go.mod h1:QVH3CFwqzGZtwsxPYzJlA/Qiwgb5FXmRMGls3CjzvbI=
421-
k8s.io/apimachinery v0.31.6 h1:Pn96A0wHD0X8+l7QTdAzdLQPrpav1s8rU6A+v2/9UEY=
422-
k8s.io/apimachinery v0.31.6/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
423-
k8s.io/apiserver v0.31.6 h1:FEhEGLsz1PbMOHeQZDbOUlMh36zRZbjgKwJCoMhdGmw=
424-
k8s.io/apiserver v0.31.6/go.mod h1:dpFh+xqFQ02O8vLYCIqoiV7sJIpZsUULeNuag6Y9HGo=
425-
k8s.io/client-go v0.31.6 h1:51HT40qVIZ13BrHKeWxFuU52uoPnFhxTYJnv4+LTgp4=
426-
k8s.io/client-go v0.31.6/go.mod h1:MEq7JQJelUQ0/4fMoPEUrc/OOFyGo/9LmGA38H6O6xY=
417+
k8s.io/api v0.31.7 h1:wSo59nXpVXmaB6hgNVJCrdnKtyYoutIgpNNBbROBd2U=
418+
k8s.io/api v0.31.7/go.mod h1:vLUha4nXRUGtQdayzsmjur0lQApK/sJSxyR/fwuujcU=
419+
k8s.io/apiextensions-apiserver v0.31.7 h1:FujQQl6iKuCF5nX4GIQy3ClvftU8MqadAyi9oQ6ZeAw=
420+
k8s.io/apiextensions-apiserver v0.31.7/go.mod h1:YmNzYECWFYy8n9R0oxtVAD9JYILZnZCNziYrpUQhKeI=
421+
k8s.io/apimachinery v0.31.7 h1:fpV8yLerIZFAkj0of66+i1ArPv/Btf9KO6Aulng7RRw=
422+
k8s.io/apimachinery v0.31.7/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
423+
k8s.io/apiserver v0.31.7 h1:L1JQgfdQfvSZNBhXJljv9ekc/JirAZAmR3B2Np5mSKk=
424+
k8s.io/apiserver v0.31.7/go.mod h1:IAHYtQWod93amFVHuFlPJAZkYF+aC5qblgDNsSvP9mQ=
425+
k8s.io/client-go v0.31.7 h1:2+LFJc6Xw6rhmpDbN1NSmhoFLWBh62cPG/P+IfaTSGY=
426+
k8s.io/client-go v0.31.7/go.mod h1:hrrMorBQ17LqzoKIxKg5cSWvmWl94EwA/MUF0Mkf+Zw=
427427
k8s.io/cluster-bootstrap v0.31.3 h1:O1Yxk1bLaxZvmQCXLaJjj5iJD+lVMfJdRUuKgbUHPlA=
428428
k8s.io/cluster-bootstrap v0.31.3/go.mod h1:TI6TCsQQB4FfcryWgNO3SLXSKWBqHjx4DfyqSFwixj8=
429-
k8s.io/code-generator v0.31.6 h1:CX4/NGV5UIdt7+nYG/G4+eGHOvcXAlKWswUhPPOtPtc=
430-
k8s.io/code-generator v0.31.6/go.mod h1:vbqDrvP5hJJ5S/jzBtyMJoH5kJBWZMo/DZwMYiOQniE=
431-
k8s.io/component-base v0.31.6 h1:FgI25PuZtCp2n7AFpOaDpMQOLieFdrpAbpeoZu7VhDI=
432-
k8s.io/component-base v0.31.6/go.mod h1:aVRrh8lAI1kSShFmwcKLhc3msQoUcmFWPBDf0sXaISM=
429+
k8s.io/code-generator v0.31.7 h1:8BU7n+pK8td2600IiqH6EgxuiWbwVA1+uTOwIJ/nTUA=
430+
k8s.io/code-generator v0.31.7/go.mod h1:1oSRo6cJxwSCghcOFGsh53TKkUQ5ZgYoK7LBCFbhHDg=
431+
k8s.io/component-base v0.31.7 h1:HLGy3757F1xfidwYzrsrL6gqAML4jKiT1rfNTRv1vhw=
432+
k8s.io/component-base v0.31.7/go.mod h1:OzaImRFsLuWLA/KyahAjR/pmG0dhxciGB9Rb1vTgdJ0=
433433
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=
434434
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
435435
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

‎hack/tools/go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/itchyny/gojq v0.12.17
99
github.com/onsi/ginkgo/v2 v2.23.0
1010
go.uber.org/mock v0.5.0
11-
k8s.io/code-generator v0.31.6
11+
k8s.io/code-generator v0.31.7
1212
sigs.k8s.io/cluster-api-provider-openstack v0.0.0
1313
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221129083400-679ae3e9e6b6
1414
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230926180527-c93e2abcb28e
@@ -118,13 +118,13 @@ require (
118118
gopkg.in/inf.v0 v0.9.1 // indirect
119119
gopkg.in/yaml.v2 v2.4.0 // indirect
120120
gopkg.in/yaml.v3 v3.0.1 // indirect
121-
k8s.io/api v0.31.6 // indirect
122-
k8s.io/apiextensions-apiserver v0.31.6 // indirect
123-
k8s.io/apimachinery v0.31.6 // indirect
124-
k8s.io/apiserver v0.31.6 // indirect
125-
k8s.io/client-go v0.31.6 // indirect
121+
k8s.io/api v0.31.7 // indirect
122+
k8s.io/apiextensions-apiserver v0.31.7 // indirect
123+
k8s.io/apimachinery v0.31.7 // indirect
124+
k8s.io/apiserver v0.31.7 // indirect
125+
k8s.io/client-go v0.31.7 // indirect
126126
k8s.io/cluster-bootstrap v0.31.3 // indirect
127-
k8s.io/component-base v0.31.6 // indirect
127+
k8s.io/component-base v0.31.7 // indirect
128128
k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9 // indirect
129129
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 // indirect
130130
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
@@ -434,22 +434,22 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
434434
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
435435
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
436436
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
437-
k8s.io/api v0.31.6 h1:ocWG/UhC9Mqp5oEfYWy9wCddbZiZyBAFTlBt0LVlhDg=
438-
k8s.io/api v0.31.6/go.mod h1:i16xSiKMgVIVhsJMxfWq0mJbXA+Z7KhjPgYmwT41hl4=
439-
k8s.io/apiextensions-apiserver v0.31.6 h1:v9sqyWlrgFZpAPdEb/bEiXfM98TfSppwRF0X/uWKXh0=
440-
k8s.io/apiextensions-apiserver v0.31.6/go.mod h1:QVH3CFwqzGZtwsxPYzJlA/Qiwgb5FXmRMGls3CjzvbI=
441-
k8s.io/apimachinery v0.31.6 h1:Pn96A0wHD0X8+l7QTdAzdLQPrpav1s8rU6A+v2/9UEY=
442-
k8s.io/apimachinery v0.31.6/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
443-
k8s.io/apiserver v0.31.6 h1:FEhEGLsz1PbMOHeQZDbOUlMh36zRZbjgKwJCoMhdGmw=
444-
k8s.io/apiserver v0.31.6/go.mod h1:dpFh+xqFQ02O8vLYCIqoiV7sJIpZsUULeNuag6Y9HGo=
445-
k8s.io/client-go v0.31.6 h1:51HT40qVIZ13BrHKeWxFuU52uoPnFhxTYJnv4+LTgp4=
446-
k8s.io/client-go v0.31.6/go.mod h1:MEq7JQJelUQ0/4fMoPEUrc/OOFyGo/9LmGA38H6O6xY=
437+
k8s.io/api v0.31.7 h1:wSo59nXpVXmaB6hgNVJCrdnKtyYoutIgpNNBbROBd2U=
438+
k8s.io/api v0.31.7/go.mod h1:vLUha4nXRUGtQdayzsmjur0lQApK/sJSxyR/fwuujcU=
439+
k8s.io/apiextensions-apiserver v0.31.7 h1:FujQQl6iKuCF5nX4GIQy3ClvftU8MqadAyi9oQ6ZeAw=
440+
k8s.io/apiextensions-apiserver v0.31.7/go.mod h1:YmNzYECWFYy8n9R0oxtVAD9JYILZnZCNziYrpUQhKeI=
441+
k8s.io/apimachinery v0.31.7 h1:fpV8yLerIZFAkj0of66+i1ArPv/Btf9KO6Aulng7RRw=
442+
k8s.io/apimachinery v0.31.7/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
443+
k8s.io/apiserver v0.31.7 h1:L1JQgfdQfvSZNBhXJljv9ekc/JirAZAmR3B2Np5mSKk=
444+
k8s.io/apiserver v0.31.7/go.mod h1:IAHYtQWod93amFVHuFlPJAZkYF+aC5qblgDNsSvP9mQ=
445+
k8s.io/client-go v0.31.7 h1:2+LFJc6Xw6rhmpDbN1NSmhoFLWBh62cPG/P+IfaTSGY=
446+
k8s.io/client-go v0.31.7/go.mod h1:hrrMorBQ17LqzoKIxKg5cSWvmWl94EwA/MUF0Mkf+Zw=
447447
k8s.io/cluster-bootstrap v0.31.3 h1:O1Yxk1bLaxZvmQCXLaJjj5iJD+lVMfJdRUuKgbUHPlA=
448448
k8s.io/cluster-bootstrap v0.31.3/go.mod h1:TI6TCsQQB4FfcryWgNO3SLXSKWBqHjx4DfyqSFwixj8=
449-
k8s.io/code-generator v0.31.6 h1:CX4/NGV5UIdt7+nYG/G4+eGHOvcXAlKWswUhPPOtPtc=
450-
k8s.io/code-generator v0.31.6/go.mod h1:vbqDrvP5hJJ5S/jzBtyMJoH5kJBWZMo/DZwMYiOQniE=
451-
k8s.io/component-base v0.31.6 h1:FgI25PuZtCp2n7AFpOaDpMQOLieFdrpAbpeoZu7VhDI=
452-
k8s.io/component-base v0.31.6/go.mod h1:aVRrh8lAI1kSShFmwcKLhc3msQoUcmFWPBDf0sXaISM=
449+
k8s.io/code-generator v0.31.7 h1:8BU7n+pK8td2600IiqH6EgxuiWbwVA1+uTOwIJ/nTUA=
450+
k8s.io/code-generator v0.31.7/go.mod h1:1oSRo6cJxwSCghcOFGsh53TKkUQ5ZgYoK7LBCFbhHDg=
451+
k8s.io/component-base v0.31.7 h1:HLGy3757F1xfidwYzrsrL6gqAML4jKiT1rfNTRv1vhw=
452+
k8s.io/component-base v0.31.7/go.mod h1:OzaImRFsLuWLA/KyahAjR/pmG0dhxciGB9Rb1vTgdJ0=
453453
k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9 h1:1bLA4Agvs1DILmc+q2Bbcqjx6jOHO7YEFA+G+0aTZoc=
454454
k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
455455
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=

‎hack/tools/vendor/modules.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ gopkg.in/yaml.v2
658658
# gopkg.in/yaml.v3 v3.0.1
659659
## explicit
660660
gopkg.in/yaml.v3
661-
# k8s.io/api v0.31.6
661+
# k8s.io/api v0.31.7
662662
## explicit; go 1.22.0
663663
k8s.io/api/admission/v1
664664
k8s.io/api/admission/v1beta1
@@ -717,12 +717,12 @@ k8s.io/api/storage/v1
717717
k8s.io/api/storage/v1alpha1
718718
k8s.io/api/storage/v1beta1
719719
k8s.io/api/storagemigration/v1alpha1
720-
# k8s.io/apiextensions-apiserver v0.31.6
720+
# k8s.io/apiextensions-apiserver v0.31.7
721721
## explicit; go 1.22.0
722722
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
723723
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
724724
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1
725-
# k8s.io/apimachinery v0.31.6
725+
# k8s.io/apimachinery v0.31.7
726726
## explicit; go 1.22.0
727727
k8s.io/apimachinery/pkg/api/apitesting
728728
k8s.io/apimachinery/pkg/api/apitesting/fuzzer
@@ -786,7 +786,7 @@ k8s.io/apimachinery/pkg/version
786786
k8s.io/apimachinery/pkg/watch
787787
k8s.io/apimachinery/third_party/forked/golang/json
788788
k8s.io/apimachinery/third_party/forked/golang/reflect
789-
# k8s.io/apiserver v0.31.6
789+
# k8s.io/apiserver v0.31.7
790790
## explicit; go 1.22.0
791791
k8s.io/apiserver/pkg/admission
792792
k8s.io/apiserver/pkg/apis/apiserver
@@ -847,7 +847,7 @@ k8s.io/apiserver/pkg/warning
847847
k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
848848
k8s.io/apiserver/plugin/pkg/authorizer/webhook
849849
k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics
850-
# k8s.io/client-go v0.31.6
850+
# k8s.io/client-go v0.31.7
851851
## explicit; go 1.22.0
852852
k8s.io/client-go/applyconfigurations/admissionregistration/v1
853853
k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1
@@ -1117,7 +1117,7 @@ k8s.io/client-go/util/workqueue
11171117
## explicit; go 1.22.0
11181118
k8s.io/cluster-bootstrap/token/api
11191119
k8s.io/cluster-bootstrap/token/util
1120-
# k8s.io/code-generator v0.31.6
1120+
# k8s.io/code-generator v0.31.7
11211121
## explicit; go 1.22.0
11221122
k8s.io/code-generator
11231123
k8s.io/code-generator/cmd/applyconfiguration-gen
@@ -1153,7 +1153,7 @@ k8s.io/code-generator/cmd/register-gen/generators
11531153
k8s.io/code-generator/pkg/namer
11541154
k8s.io/code-generator/pkg/util
11551155
k8s.io/code-generator/third_party/forked/golang/reflect
1156-
# k8s.io/component-base v0.31.6
1156+
# k8s.io/component-base v0.31.7
11571157
## explicit; go 1.22.0
11581158
k8s.io/component-base/cli/flag
11591159
k8s.io/component-base/featuregate

‎hack/tools/vendor/sigs.k8s.io/cluster-api-provider-openstack/controllers/openstackcluster_controller.go‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎hack/tools/vendor/sigs.k8s.io/cluster-api-provider-openstack/controllers/openstackserver_controller.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.

‎openshift/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ require (
99
github.com/onsi/gomega v1.36.2
1010
github.com/openshift/api v0.0.0-20231003083825-c3f7566f6ef6
1111
github.com/openshift/cluster-capi-operator/e2e v0.0.0-20250123104340-ddf11cf94960
12-
k8s.io/api v0.31.6
13-
k8s.io/apimachinery v0.31.6
14-
k8s.io/client-go v0.31.6
12+
k8s.io/api v0.31.7
13+
k8s.io/apimachinery v0.31.7
14+
k8s.io/client-go v0.31.7
1515
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
1616
sigs.k8s.io/cluster-api v1.9.5
1717
sigs.k8s.io/cluster-api-provider-openstack v0.8.0
@@ -77,7 +77,7 @@ require (
7777
gopkg.in/inf.v0 v0.9.1 // indirect
7878
gopkg.in/yaml.v2 v2.4.0 // indirect
7979
gopkg.in/yaml.v3 v3.0.1 // indirect
80-
k8s.io/apiextensions-apiserver v0.31.6 // indirect
80+
k8s.io/apiextensions-apiserver v0.31.7 // indirect
8181
k8s.io/klog/v2 v2.130.1 // indirect
8282
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
8383
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

0 commit comments

Comments
 (0)