Skip to content

Commit 59a1678

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #519 from openstack-k8s-operators/openstack-dependency-bump/main
openstack-k8s-operators dependency bump branch: main
2 parents 8a83f3f + 7b810da commit 59a1678

File tree

4 files changed

+54
-52
lines changed

4 files changed

+54
-52
lines changed

‎api/go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.24.4
55
require (
66
github.com/onsi/ginkgo/v2 v2.25.3
77
github.com/onsi/gomega v1.38.2
8-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182
9-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250922082314-c83d83092a04
8+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20251002120642-c2d58c6fc03e
9+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250929092825-4c2402451077
1010
k8s.io/api v0.31.13
1111
k8s.io/apimachinery v0.31.13
1212
k8s.io/client-go v0.31.13
@@ -22,7 +22,7 @@ require (
2222
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
2323
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
2424
github.com/fsnotify/fsnotify v1.9.0 // indirect
25-
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
25+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
2626
github.com/go-logr/logr v1.4.3 // indirect
2727
github.com/go-logr/zapr v1.3.0 // indirect
2828
github.com/go-openapi/jsonpointer v0.21.1 // indirect
@@ -42,15 +42,15 @@ require (
4242
github.com/json-iterator/go v1.1.12 // indirect
4343
github.com/mailru/easyjson v0.9.0 // indirect
4444
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
45-
github.com/modern-go/reflect2 v1.0.2 // indirect
45+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
4646
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4747
github.com/pkg/errors v0.9.1 // indirect
4848
github.com/prometheus/client_golang v1.22.0 // indirect
4949
github.com/prometheus/client_model v0.6.2 // indirect
5050
github.com/prometheus/common v0.65.0 // indirect
5151
github.com/prometheus/procfs v0.16.1 // indirect
5252
github.com/rogpeppe/go-internal v1.13.1 // indirect
53-
github.com/spf13/pflag v1.0.6 // indirect
53+
github.com/spf13/pflag v1.0.7 // indirect
5454
github.com/x448/float16 v0.8.4 // indirect
5555
go.uber.org/automaxprocs v1.6.0 // indirect
5656
go.uber.org/multierr v1.11.0 // indirect
@@ -71,12 +71,12 @@ require (
7171
gopkg.in/yaml.v3 v3.0.1 // indirect
7272
k8s.io/apiextensions-apiserver v0.33.2 // indirect
7373
k8s.io/klog/v2 v2.130.1 // indirect
74-
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
74+
k8s.io/kube-openapi v0.0.0-20250902184714-7fc278399c7f // indirect
7575
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
7676
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
7777
sigs.k8s.io/randfill v1.0.0 // indirect
7878
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
79-
sigs.k8s.io/yaml v1.5.0 // indirect
79+
sigs.k8s.io/yaml v1.6.0 // indirect
8080
)
8181

8282
// mschuppert: map to latest commit from release-4.18 tag

‎api/go.sum‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjT
1616
github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
1717
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
1818
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
19-
github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
20-
github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
19+
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
20+
github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
2121
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
2222
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
2323
github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
@@ -69,18 +69,19 @@ github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUt
6969
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
7070
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
7171
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
72-
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
7372
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
73+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
74+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
7475
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
7576
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
7677
github.com/onsi/ginkgo/v2 v2.25.3 h1:Ty8+Yi/ayDAGtk4XxmmfUy4GabvM+MegeB4cDLRi6nw=
7778
github.com/onsi/ginkgo/v2 v2.25.3/go.mod h1:43uiyQC4Ed2tkOzLsEYm7hnrb7UJTWHYNsuy3bG/snE=
7879
github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
7980
github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
80-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182 h1:Ea+FZQOW0Eha1jorgSECFeqI9UrKz8TZlGnSM7X8Yf4=
81-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182/go.mod h1:3Im8PFiRKPaOZpOuqYShJRN2O2pfjUuhDTUpW4KMHZw=
82-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250922082314-c83d83092a04 h1:JqJd39rF8rD9KIHmOEFbHP8UyYgttfuouj+kAFNtymU=
83-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250922082314-c83d83092a04/go.mod h1:SmKRclrynSSRCXSLOoWlETalJPvt62ObHsfW8iPvtDA=
81+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20251002120642-c2d58c6fc03e h1:5q47hHT53v0PnNj2pwHHQ1+ZWC3kQLu1jtulTUrJ2cE=
82+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20251002120642-c2d58c6fc03e/go.mod h1:LfqzznghLpo+b9jVgyvqUoOZMcc3Ff0gXSmLLtFsj9w=
83+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250929092825-4c2402451077 h1:missBxDwEfOdkHVKd6zyCyaQjSObw9Ge1O4A7WU5EuM=
84+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250929092825-4c2402451077/go.mod h1:CjsYQ/dUr4eUmBEvM3UFUxvYvl2bAhGfGflaD+N4fWA=
8485
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
8586
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
8687
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -98,8 +99,8 @@ github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzM
9899
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
99100
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
100101
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
101-
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
102-
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
102+
github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
103+
github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
103104
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
104105
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
105106
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
@@ -198,5 +199,5 @@ sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxO
198199
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
199200
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
200201
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
201-
sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
202-
sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=
202+
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
203+
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

‎go.mod‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ require (
88
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.7
99
github.com/onsi/ginkgo/v2 v2.25.3
1010
github.com/onsi/gomega v1.38.2
11-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182
12-
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250916093250-82a76386143d
13-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250922082314-c83d83092a04
14-
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250922082314-c83d83092a04
15-
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250922154138-e032ee393bab
11+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20251002120642-c2d58c6fc03e
12+
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20251002084815-17073bbaef03
13+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250929092825-4c2402451077
14+
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250929092825-4c2402451077
15+
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20251002102126-84fdf59cb2fb
1616
github.com/openstack-k8s-operators/octavia-operator/api v0.0.0-00010101000000-000000000000
17-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250918124008-71fb50adbeb5
17+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251002145853-52dcb63c343b
1818
go.uber.org/zap v1.27.0
1919
k8s.io/api v0.31.13
2020
k8s.io/apimachinery v0.31.13
@@ -24,7 +24,7 @@ require (
2424

2525
require (
2626
github.com/google/uuid v1.6.0
27-
github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250922082314-c83d83092a04
27+
github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250929092825-4c2402451077
2828
golang.org/x/crypto v0.41.0
2929
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
3030
)
@@ -37,7 +37,7 @@ require (
3737
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
3838
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3939
github.com/fsnotify/fsnotify v1.9.0 // indirect
40-
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
40+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4141
github.com/go-logr/zapr v1.3.0 // indirect
4242
github.com/go-openapi/jsonpointer v0.21.1 // indirect
4343
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -55,7 +55,7 @@ require (
5555
github.com/json-iterator/go v1.1.12 // indirect
5656
github.com/mailru/easyjson v0.9.0 // indirect
5757
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
58-
github.com/modern-go/reflect2 v1.0.2 // indirect
58+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
5959
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6060
github.com/openshift/api v3.9.0+incompatible // indirect
6161
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250922082314-c83d83092a04 // indirect
@@ -64,8 +64,8 @@ require (
6464
github.com/prometheus/client_model v0.6.2 // indirect
6565
github.com/prometheus/common v0.65.0 // indirect
6666
github.com/prometheus/procfs v0.16.1 // indirect
67-
github.com/rabbitmq/cluster-operator/v2 v2.9.0 // indirect
68-
github.com/spf13/pflag v1.0.6 // indirect
67+
github.com/rabbitmq/cluster-operator/v2 v2.16.0 // indirect
68+
github.com/spf13/pflag v1.0.7 // indirect
6969
github.com/x448/float16 v0.8.4 // indirect
7070
go.uber.org/automaxprocs v1.6.0 // indirect
7171
go.uber.org/multierr v1.11.0 // indirect
@@ -86,11 +86,11 @@ require (
8686
gopkg.in/yaml.v3 v3.0.1 // indirect
8787
k8s.io/apiextensions-apiserver v0.33.2 // indirect
8888
k8s.io/klog/v2 v2.130.1 // indirect
89-
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
89+
k8s.io/kube-openapi v0.0.0-20250902184714-7fc278399c7f // indirect
9090
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
9191
sigs.k8s.io/randfill v1.0.0 // indirect
9292
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
93-
sigs.k8s.io/yaml v1.5.0 // indirect
93+
sigs.k8s.io/yaml v1.6.0 // indirect
9494
)
9595

9696
replace github.com/openstack-k8s-operators/octavia-operator/api => ./api

0 commit comments

Comments
 (0)