Skip to content

Commit 63019d9

Browse files
Merge pull request #1852 from openstack-k8s-operators/openstack-dependency-bump/main
openstack-k8s-operators dependency bump branch: main
2 parents 7fde865 + 34eb3f7 commit 63019d9

12 files changed

Lines changed: 126 additions & 93 deletions

api/bases/core.openstack.org_openstackcontrolplanes.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17348,6 +17348,10 @@ spec:
1734817348
alertingEnabled:
1734917349
default: true
1735017350
type: boolean
17351+
nodeSelector:
17352+
additionalProperties:
17353+
type: string
17354+
type: object
1735117355
scrapeInterval:
1735217356
default: 30s
1735317357
type: string

api/go.mod

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,28 @@ require (
77
github.com/go-playground/validator/v10 v10.30.1
88
github.com/onsi/ginkgo/v2 v2.28.1
99
github.com/onsi/gomega v1.39.1
10-
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260307080957-e78b772a9d63
10+
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260310123450-8e5667f5a219
1111
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260304071337-63312061d576
1212
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260302083231-563bef879f57
1313
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260307070902-e95146e9e7f0
1414
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260304090236-61c1f63e5bfb
1515
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260228155252-bb17197b83a6
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260302112901-11ab59789dd7
17-
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260307080956-4bd0f169a0c1
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260313075911-3b17118b2447
17+
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260310233800-9f43f52516ea
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260228160423-41bde73701b8
19-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260224071535-c6fd98c589ad
20-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260224071535-c6fd98c589ad
21-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260307070618-b2dcce0324ee
22-
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260307080955-79e845a223d3
19+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260310070607-b96da8dd520e
20+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260310070607-b96da8dd520e
21+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260310151043-fdeb5b199cf7
22+
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260312161300-a8a323f4d30c
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260302115939-a696e17a0a2f
24-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260306120535-320f4092f4db
24+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260312110001-ed0bef54a7ad
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260304073356-83422cbfef70
2626
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260228160721-0f61c8811aea
2727
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260228173827-0d5188da7798
2828
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260307081243-523ffaf56e7b
29-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260227103229-275b3dcedba0
30-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260302143235-b58a49689efe
31-
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260305150417-ebf8b9a9736a
29+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260310151043-7ab83b8d6632
30+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260312154135-1bf2c7888973
31+
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260309154718-a9587689aba5
3232
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1 // indirect
3333
github.com/rhobs/observability-operator v1.0.0 // indirect
3434
go.uber.org/multierr v1.11.0 // indirect

api/go.sum

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=
114114
github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg=
115115
github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e h1:E1OdwSpqWuDPCedyUt0GEdoAE+r5TXy7YS21yNEo+2U=
116116
github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
117-
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260307080957-e78b772a9d63 h1:tT4ULeRKkfD3Sm89IB7mcFZmcswXv1kQUYyDbus2cLw=
118-
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260307080957-e78b772a9d63/go.mod h1:TqAs8co9g6qjCxO799EKQWYsHBiKLL554hGp5oUyAo0=
117+
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260310123450-8e5667f5a219 h1:363bGmSTu7nTVjZU3WxsYXMEAoDanzEIhcINgtqpwLE=
118+
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260310123450-8e5667f5a219/go.mod h1:TqAs8co9g6qjCxO799EKQWYsHBiKLL554hGp5oUyAo0=
119119
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260304071337-63312061d576 h1:RVHqL7DmmH+Cg7a4XMrqy1JnO/d5TzVwXOtFJRYqZCY=
120120
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260304071337-63312061d576/go.mod h1:Ta5iogB0ASRIz3tZBV5tmuWBkxKfLcCX/zm1sLLs4MM=
121121
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260302083231-563bef879f57 h1:vgIrNDgCARoTi/EvPG8U4DPt9YXeCbneJEAI1Yyi2KQ=
@@ -126,26 +126,26 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260304090236-61c
126126
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260304090236-61c1f63e5bfb/go.mod h1:sXlGVZlqKvRJ0RXGb1ze6a7e5+N/ZOVqSpOTGrBVhIo=
127127
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260228155252-bb17197b83a6 h1:AtuwSvzQs3UoVY37KouH27un8uMqJ+mZvpCc/Y019Ho=
128128
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260228155252-bb17197b83a6/go.mod h1:napoX9gnT+aYRY4yCBrygpqEpFQ2AA8Uknk3zdfYqAE=
129-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260302112901-11ab59789dd7 h1:lzMABCuVfzx6oEKG3CtWpdDwDDSy6VEVxqMLBFICzTo=
130-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260302112901-11ab59789dd7/go.mod h1:XsEbK1LxXg8beKXRf8s1OQanE82hCuGtkO1URg7uezU=
131-
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260307080956-4bd0f169a0c1 h1:2Z8jm1gVCQF36x1Ueu6QDAVdr21WMhYVyNoNtmO5BJk=
132-
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260307080956-4bd0f169a0c1/go.mod h1:5lPjNcpydgNFeMcQU+0TW4RtsjUIum7crq+KeLKYAEQ=
129+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260313075911-3b17118b2447 h1:TbU1wdKNQK/MkLP2Y6etQDItFz0Bx930Jwzblv3BJu4=
130+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260313075911-3b17118b2447/go.mod h1:XsEbK1LxXg8beKXRf8s1OQanE82hCuGtkO1URg7uezU=
131+
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260310233800-9f43f52516ea h1:QSL2GysITuRUOYuCoGM26RO9IZJrN5/keyxQyB+TWWQ=
132+
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260310233800-9f43f52516ea/go.mod h1:5lPjNcpydgNFeMcQU+0TW4RtsjUIum7crq+KeLKYAEQ=
133133
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260228160423-41bde73701b8 h1:QI22pZQ9rOQURNF6K/0kHr1nA5G6hjlHSz11RorqnoI=
134134
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260228160423-41bde73701b8/go.mod h1:zz82jCS9BQFHniF/MR+j/CmQ4+4Wi+kEZXhRWdQbhqw=
135-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260224071535-c6fd98c589ad h1:CCUNIUzCukBYhMJ0aZbQ2/6eF7Lskzzf/CuXLLtEz5k=
136-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260224071535-c6fd98c589ad/go.mod h1:+vcGsjqibpMUz3y/g0B5YIXNotlTvQdMB6f92siiwKM=
135+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260310070607-b96da8dd520e h1:EXpPxBaSHBDyAXhDApotNd9AZOm/DQfvAKdrWO5W4XA=
136+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260310070607-b96da8dd520e/go.mod h1:+vcGsjqibpMUz3y/g0B5YIXNotlTvQdMB6f92siiwKM=
137137
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260224071535-c6fd98c589ad h1:wgFv3BbMA8lKLFgA4f3k6vDT6mlG5bpnbOQ9uZQyDxM=
138138
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260224071535-c6fd98c589ad/go.mod h1:7yqbVpg0k0vW+kZks+TMU/cd1ovoejyHfVPWcyGYLHI=
139-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260224071535-c6fd98c589ad h1:PAQBnG86cQlbgJ8oTaP0glg61BboxcSEHHoTbfLKXyw=
140-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260224071535-c6fd98c589ad/go.mod h1:3loLaPUDQyvbPekylZd9OCLF+EXH2klRI9IeeQhuMcs=
141-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260307070618-b2dcce0324ee h1:LrUedG7Gz2NjwRUCVDh6JvsHYP2Ae5rSKqRrBLAGals=
142-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260307070618-b2dcce0324ee/go.mod h1:dRmCGqDthR5WEKOs1mbSogMKnFUr6iSESM3tP2rLv7Y=
143-
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260307080955-79e845a223d3 h1:Ls4PqPmoI1IZNicuth4ofTxlik6Y7RgFYHuGUR4Rxr8=
144-
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260307080955-79e845a223d3/go.mod h1:mRxZLKE/NUwWcjEbIxgauk5D5sIdhQpJK0vzTdnfOi8=
139+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260310070607-b96da8dd520e h1:lHsE9kmPzGHfO6o9vXj6f5UTIlQRJNdrvrj8GWy/ct8=
140+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260310070607-b96da8dd520e/go.mod h1:3loLaPUDQyvbPekylZd9OCLF+EXH2klRI9IeeQhuMcs=
141+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260310151043-fdeb5b199cf7 h1:jiu7XuDAeAHMCHeGjcI1IpYDcU8SAyR7tMyyWjW5DOE=
142+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260310151043-fdeb5b199cf7/go.mod h1:dRmCGqDthR5WEKOs1mbSogMKnFUr6iSESM3tP2rLv7Y=
143+
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260312161300-a8a323f4d30c h1:nsVAGcC+RkNaeI/dEwrNZukyjY4TICjiA8LbGV3JJcg=
144+
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260312161300-a8a323f4d30c/go.mod h1:mRxZLKE/NUwWcjEbIxgauk5D5sIdhQpJK0vzTdnfOi8=
145145
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260302115939-a696e17a0a2f h1:QaN6T4Uu0DgnCuCLQRZjNljLImmcETNbTf35SS1z8+4=
146146
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260302115939-a696e17a0a2f/go.mod h1:zfZhfIYSFkxiY1f889sgf3yEzi8dZ0u9hsH5gRNDOJk=
147-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260306120535-320f4092f4db h1:mAP7Cu2+xyy4ySysVkLCz60BDOvs7zYt+KeAK8kgF1U=
148-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260306120535-320f4092f4db/go.mod h1:jc2c9B9vPB8eNC64y+wbp1NWfHGf3kaUpqDuolejVDM=
147+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260312110001-ed0bef54a7ad h1:5sW8UdqaxNgJVcLYDLcXIofR2tidvLLrYM6UnMLiNMw=
148+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260312110001-ed0bef54a7ad/go.mod h1:jc2c9B9vPB8eNC64y+wbp1NWfHGf3kaUpqDuolejVDM=
149149
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260304073356-83422cbfef70 h1:jAHFjX1vbHd1ISrZ7Fyo4aW3GAf5Ou6ylZ31knuRNYY=
150150
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260304073356-83422cbfef70/go.mod h1:8QtBnOIiydHjzEJPIZjlqfBKSNjxulTC8xCEOiIAO/k=
151151
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260228160721-0f61c8811aea h1:QZhv86QQSZGiI2J+HD22M/DZH6N73DZcZM0oWIxahIc=
@@ -156,12 +156,12 @@ github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.2026030708124
156156
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260307081243-523ffaf56e7b/go.mod h1:JFKRWtlajxdTnpMdgn5tu261g+m1tRnKqogLt/bCbA0=
157157
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec h1:saovr368HPAKHN0aRPh8h8n9s9dn3d8Frmfua0UYRlc=
158158
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec/go.mod h1:Nh2NEePLjovUQof2krTAg4JaAoLacqtPTZQXK6izNfg=
159-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260227103229-275b3dcedba0 h1:lznMfmmjaOreRIYitcXf8E0hBui5MkJ3PCiwWXcOgCg=
160-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260227103229-275b3dcedba0/go.mod h1:Kpak2VcVhlzhyYaExQlsDG5SKRfulZTTWXNXxWlyND0=
161-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260302143235-b58a49689efe h1:9GTuqN0Npbv3BVSIqpknIaSnTvxxI+b63+wailR35P0=
162-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260302143235-b58a49689efe/go.mod h1:BwQpYIKIeJcc/Yxc5vMj7H21CjUVdvBeekmNHOnGMt0=
163-
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260305150417-ebf8b9a9736a h1:z7LYkAlcXmHOP+6MvkIPvWphOp7PzqgwfaX8vxH2/44=
164-
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260305150417-ebf8b9a9736a/go.mod h1:cnu0p7X2jy5tpWYYFqlxmRNosOXeE+GnjDNDOVd13pw=
159+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260310151043-7ab83b8d6632 h1:t+tExZCAkce3lN8mGNcXxu+q5a21+uAMO23EbahJamw=
160+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260310151043-7ab83b8d6632/go.mod h1:fDB07y7SN+LTnBVWa2cWfc0Sy90UBHGihEw7k65uUEA=
161+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260312154135-1bf2c7888973 h1:ipyKlr/da0dx3rB7gegd2BaSpB8leIKXSXjzDPpAAKs=
162+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260312154135-1bf2c7888973/go.mod h1:BwQpYIKIeJcc/Yxc5vMj7H21CjUVdvBeekmNHOnGMt0=
163+
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260309154718-a9587689aba5 h1:QcAk6xiRA17p/9fL1VE4WzYWwoq9ycUVZahBPZBgbCo=
164+
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260309154718-a9587689aba5/go.mod h1:Z43I0UN+6UUu7sC0nn/mjBmn3gYV27tu2O4wregSMg4=
165165
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
166166
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
167167
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

bindata/crds/crds.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17613,6 +17613,10 @@ spec:
1761317613
alertingEnabled:
1761417614
default: true
1761517615
type: boolean
17616+
nodeSelector:
17617+
additionalProperties:
17618+
type: string
17619+
type: object
1761617620
scrapeInterval:
1761717621
default: 30s
1761817622
type: string

bindata/crds/instanceha.openstack.org_instancehas.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,15 @@ spec:
5656
description: ContainerImage for the InstanceHa container (will be
5757
set to environmental default if empty)
5858
type: string
59+
disabled:
60+
default: "False"
61+
description: |-
62+
Disabled allows disabling the InstanceHA process so that it does not
63+
fence and evacuate compute nodes
64+
enum:
65+
- "True"
66+
- "False"
67+
type: string
5968
fencingSecret:
6069
default: fencing-secret
6170
description: FencingSecret is the name of the Secret containing the

bindata/crds/telemetry.openstack.org_metricstorages.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,6 +1742,12 @@ spec:
17421742
default: true
17431743
description: AlertingEnabled allows to enable or disable alertmanager
17441744
type: boolean
1745+
nodeSelector:
1746+
additionalProperties:
1747+
type: string
1748+
description: NodeSelector to target subset of worker nodes running
1749+
this service
1750+
type: object
17451751
scrapeInterval:
17461752
default: 30s
17471753
description: ScrapeInterval sets the interval between scrapes

bindata/crds/telemetry.openstack.org_telemetries.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3134,6 +3134,12 @@ spec:
31343134
default: true
31353135
description: AlertingEnabled allows to enable or disable alertmanager
31363136
type: boolean
3137+
nodeSelector:
3138+
additionalProperties:
3139+
type: string
3140+
description: NodeSelector to target subset of worker nodes
3141+
running this service
3142+
type: object
31373143
scrapeInterval:
31383144
default: 30s
31393145
description: ScrapeInterval sets the interval between scrapes

config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17348,6 +17348,10 @@ spec:
1734817348
alertingEnabled:
1734917349
default: true
1735017350
type: boolean
17351+
nodeSelector:
17352+
additionalProperties:
17353+
type: string
17354+
type: object
1735117355
scrapeInterval:
1735217356
default: 30s
1735317357
type: string

0 commit comments

Comments
 (0)