Skip to content

Commit 5ad365d

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1954 from openstack-k8s-operators/openstack-dependency-bump/main
openstack-k8s-operators dependency bump branch: main
2 parents 45185d2 + d5d4e78 commit 5ad365d

10 files changed

Lines changed: 41 additions & 37 deletions

‎api/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9941,6 +9941,7 @@ spec:
99419941
type: object
99429942
trustFlushArgs:
99439943
default: ""
9944+
pattern: ^[A-Za-z0-9 =._/-]*$
99449945
type: string
99459946
trustFlushSchedule:
99469947
default: 1 * * * *

‎api/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ require (
99
github.com/onsi/gomega v1.42.0
1010
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260620124132-d3b99e3772fe
1111
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260620081344-884656c270ac
12-
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260621105127-57124f0e85e1
12+
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260623153836-c43c7d3c3033
1313
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260620081344-b5f7f4da641e
1414
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260620095520-3bd0eaaddccb
1515
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260620095236-ada2819d1203
1616
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260618172644-5a4764bdaa36
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260620095519-8d1db7761064
18-
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260621105127-dc5935839186
18+
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260623071703-dd47f94060d8
1919
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260618132757-fe8e60d1d8a6
2020
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260618132757-fe8e60d1d8a6
2121
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260621130139-c5a1195cece1
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260620140210-bde181530f1a
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260621105414-d0a3387cbde6
2424
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260621105415-b50a660a36c5
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260621105415-8c3a32631086
26-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260618173215-31a17b1de72a
26+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260622142421-cbb880280d23
2727
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260621105414-da97a35a2fed
2828
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260620124412-719ab0600c40
29-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260621105415-8863ed73c35e
29+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260623121042-02616e6bcc4e
3030
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260622090505-66c9c9781b5d
3131
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1 // indirect
3232
github.com/rhobs/observability-operator v1.0.0 // indirect

‎api/go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260620124132
118118
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260620124132-d3b99e3772fe/go.mod h1:UtGbDdp7ZghriKsn7UnN0/CIGk/F9+4aUnMwjTcP7Rk=
119119
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260620081344-884656c270ac h1:AqamFh6+clyLszyLKVj4uJlWqpBNTwJ1EjoS6awztZg=
120120
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260620081344-884656c270ac/go.mod h1:abPgNG4MWwqC7IycQWGI3+9MEPMmOjTGMDggXjJXW54=
121-
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260621105127-57124f0e85e1 h1:1rW4cMLW6ipPqz4xRYY1ytaiqwpKP9Q0oePzkpuE1PY=
122-
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260621105127-57124f0e85e1/go.mod h1:bxh7PSkd0BXv/zrBhmjEyvPXrtr/bPXVqXgDtOiJfVc=
121+
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260623153836-c43c7d3c3033 h1:tIq8K9N3rOJZrHENBOD9Zknj0nrMRTdpqR6gY7zDABA=
122+
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260623153836-c43c7d3c3033/go.mod h1:bxh7PSkd0BXv/zrBhmjEyvPXrtr/bPXVqXgDtOiJfVc=
123123
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260620081344-b5f7f4da641e h1:3EXGMBB+R/7Gsh07Mk4SldBSEXAwzJ0Nc/+bWIKtHuQ=
124124
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260620081344-b5f7f4da641e/go.mod h1:5rXI8xXALj5KsMtN8cWNZGh09LA16ZmIqZ6qjoo1CCA=
125125
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260620095520-3bd0eaaddccb h1:Many+jTO7EefSKArbaivcHO5csV9vnQKXPszL150oWE=
@@ -130,8 +130,8 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260618172644-5
130130
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260618172644-5a4764bdaa36/go.mod h1:fcTuxQ/hzNBPxCf99vbsBt7dgZ3W12gUthaCXSvkPr8=
131131
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260620095519-8d1db7761064 h1:bTBPtyWYwt2TdM/VZO1es09qP7bSrA/IoCfJnF18dJE=
132132
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260620095519-8d1db7761064/go.mod h1:ZY/+8pjTW/ajyLx8PQt45GCkFhqHSiSkYP2UBSDv/dM=
133-
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260621105127-dc5935839186 h1:HOjyk0EPGukcKwGcruTmuPcOoqtzqgWC2Toq92RBV8w=
134-
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260621105127-dc5935839186/go.mod h1:dCNAMQ8cXV7h9EmSeVBeN7vAqEyfnSm+v2I1S/4FFgg=
133+
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260623071703-dd47f94060d8 h1:gKQp6E2qJ4DnQuma2LOXbi/fIXiQfcHJgi6r2iTNfrQ=
134+
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260623071703-dd47f94060d8/go.mod h1:dCNAMQ8cXV7h9EmSeVBeN7vAqEyfnSm+v2I1S/4FFgg=
135135
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260618132757-fe8e60d1d8a6 h1:aIc5ECO3dubv265jjUZ66oi56kf5iUt8Y1DWmCPrzOc=
136136
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260618132757-fe8e60d1d8a6/go.mod h1:oeIagnkOxEsxluKFcFMW80Lf1rXdV7FT2W+peB6kSE0=
137137
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260618132757-fe8e60d1d8a6 h1:OVFoNXzinsI0rq8gbegu8TnlDPkO409iyVoWhU4nEdQ=
@@ -148,14 +148,14 @@ github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260621105415-b50
148148
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260621105415-b50a660a36c5/go.mod h1:Y2jrWxpgccb76gOENuOeaHooCWkYZHzhoMf74jPMFQE=
149149
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260621105415-8c3a32631086 h1:2JNVrTtEgrJzUFogG4U99D4bBtjlm7HUD6MiXMjAhnU=
150150
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260621105415-8c3a32631086/go.mod h1:/EA82wUwEMaKPgcj4k3cq7bJazoVqUBvlUxOd2hX2eY=
151-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260618173215-31a17b1de72a h1:WEnHJaLTNl22xdEu1FQ+Ru1iGiGpOV1L2Zv8TIs13cA=
152-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260618173215-31a17b1de72a/go.mod h1:12F7+H+Uy5eDduRlxZnOUMtFG/3tEGLSLuZsbkZkPTA=
151+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260622142421-cbb880280d23 h1:2urkUmhsEQiekRkiKwNT+maUo4jFQ62VC5fyGw6Kb5Q=
152+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260622142421-cbb880280d23/go.mod h1:12F7+H+Uy5eDduRlxZnOUMtFG/3tEGLSLuZsbkZkPTA=
153153
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260621105414-da97a35a2fed h1:sH1HEbgRnidtsVN+IYtjGsCWouEeIFzdfi1dIURbO5E=
154154
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260621105414-da97a35a2fed/go.mod h1:mCmolkJR927iEDgT79cGqrwC9y/n7WqrdLM6UShnLeg=
155155
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260620124412-719ab0600c40 h1:5rn4qJW+eClauppVbHKlaOOQxB/lNwj4/qu2pelPlUQ=
156156
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260620124412-719ab0600c40/go.mod h1:SBFKpZENMMBRzSYPehe76JiSC+RKXifu0sdg0042y8c=
157-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260621105415-8863ed73c35e h1:baa3mv1zI2D4Hox5GA/2UzMMU7/EG+YRbc19b+eNVPo=
158-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260621105415-8863ed73c35e/go.mod h1:qSVOSQLGW1XYsF/3sY3rzTlIVrSyDzdOaW5ib139GZ4=
157+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260623121042-02616e6bcc4e h1:P7DJWvscM7YpWp1fpYGn5ncCvUWxDmTU7v38rWZzGwI=
158+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260623121042-02616e6bcc4e/go.mod h1:qSVOSQLGW1XYsF/3sY3rzTlIVrSyDzdOaW5ib139GZ4=
159159
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260622090505-66c9c9781b5d h1:gG6rAMw3HMAhyuQPv6+QKuGfmtDvqCC6/v0/6ataGX0=
160160
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260622090505-66c9c9781b5d/go.mod h1:9PdM9wxL6Y2sIp2vDAdEWrhYPivlR/y8bvU9qwezQPY=
161161
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

‎bindata/crds/crds.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10475,6 +10475,7 @@ spec:
1047510475
type: object
1047610476
trustFlushArgs:
1047710477
default: ""
10478+
pattern: ^[A-Za-z0-9 =._/-]*$
1047810479
type: string
1047910480
trustFlushSchedule:
1048010481
default: 1 * * * *

‎bindata/crds/keystone.openstack.org_keystoneapis.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1611,6 +1611,7 @@ spec:
16111611
default: ""
16121612
description: TrustFlushArgs - Arguments added to keystone-manage trust_flush
16131613
command
1614+
pattern: ^[A-Za-z0-9 =._/-]*$
16141615
type: string
16151616
trustFlushSchedule:
16161617
default: 1 * * * *

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9941,6 +9941,7 @@ spec:
99419941
type: object
99429942
trustFlushArgs:
99439943
default: ""
9944+
pattern: ^[A-Za-z0-9 =._/-]*$
99449945
type: string
99459946
trustFlushSchedule:
99469947
default: 1 * * * *

‎config/operator/manager_operator_images.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
- name: RELATED_IMAGE_CINDER_OPERATOR_MANAGER_IMAGE_URL
1919
value: quay.io/openstack-k8s-operators/cinder-operator@sha256:c67c3fdfecbce73bcd1781397dc3c4825f29b177b0090ad9f002253d23db3497
2020
- name: RELATED_IMAGE_DESIGNATE_OPERATOR_MANAGER_IMAGE_URL
21-
value: quay.io/openstack-k8s-operators/designate-operator@sha256:8a9baf1057cbb4ebbe5418a1704ddb1a143852f8beaa9d0826a18c161a7ce9b7
21+
value: quay.io/openstack-k8s-operators/designate-operator@sha256:5592f8edfde1864a954cb71e96e414b3be973a408ee439c7d66ff0c23754c237
2222
- name: RELATED_IMAGE_GLANCE_OPERATOR_MANAGER_IMAGE_URL
2323
value: quay.io/openstack-k8s-operators/glance-operator@sha256:8471dfdd675cfa0a7e5aaabad8388d4be2826702e6713fc8d239bea6da0122ef
2424
- name: RELATED_IMAGE_HEAT_OPERATOR_MANAGER_IMAGE_URL
@@ -30,7 +30,7 @@ spec:
3030
- name: RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL
3131
value: quay.io/openstack-k8s-operators/ironic-operator@sha256:7c51943f9b0530049d2fd311021740734225b2eab2f8520e1fac7b553f61c064
3232
- name: RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL
33-
value: quay.io/openstack-k8s-operators/keystone-operator@sha256:09b701afb9ea34aea39d0fe6969109d093bfe3c78dd624a4094e925264175a83
33+
value: quay.io/openstack-k8s-operators/keystone-operator@sha256:d6b3b4f9b7e9c72deb208452b6511a0ac0f07acb99edc07185f371cdf654041d
3434
- name: RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL
3535
value: quay.io/openstack-k8s-operators/manila-operator@sha256:489705ee8d9b7d84260a1e6d9d41765bcbf2b630414f0c0fc9ba2b80de0236c8
3636
- name: RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL
@@ -42,14 +42,14 @@ spec:
4242
- name: RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL
4343
value: quay.io/openstack-k8s-operators/octavia-operator@sha256:4a55bb146f24a953897392949e58ffd55dc0712f978117526aca5669ff480d17
4444
- name: RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL
45-
value: quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:f20e626ac4cd7fe30481a4f8c509a76d7735a4839d14bfe576bd272e62b0de49
45+
value: quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:c6a4f49295e19ec215f1146c043708b72c7084965a1ac1fcae62126fc786a759
4646
- name: RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL
4747
value: quay.io/openstack-k8s-operators/ovn-operator@sha256:923630247c927e4c60610e9bbe331e2375e894dbd74b81095d0c86f399c6fc4b
4848
- name: RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL
4949
value: quay.io/openstack-k8s-operators/swift-operator@sha256:ecd0fd8ec9ab432e18d959676201a10b2d156dfd1cd44edea27a89bc38065bbc
5050
- name: RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL
51-
value: quay.io/openstack-k8s-operators/telemetry-operator@sha256:02085623ead3797864ee7a6f6d4c53df7090f097bb1f652ce69ff8033093192e
51+
value: quay.io/openstack-k8s-operators/telemetry-operator@sha256:d53b9b848ccbf1df2d2fe92e2f67b24cf0ba83a6b45beb3dd8c42e939c655a75
5252
- name: RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL
53-
value: quay.io/openstack-k8s-operators/test-operator@sha256:b7b713567a084ad73d4bb7b54aec13cbcb2dc6b07b848d713854ed93206676b9
53+
value: quay.io/openstack-k8s-operators/test-operator@sha256:39f20119075f2fd41b295ac22e89d3e54d80d0ddb183e6f91390d49d9c03477f
5454
- name: RELATED_IMAGE_WATCHER_OPERATOR_MANAGER_IMAGE_URL
5555
value: quay.io/openstack-k8s-operators/watcher-operator@sha256:a50366844daa15b047cb7fde95fd4df6744237665b71975bb3a6525d617b307f

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ require (
1414
github.com/openshift/api v3.9.0+incompatible
1515
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260620124132-d3b99e3772fe
1616
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260620081344-884656c270ac
17-
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260621105127-57124f0e85e1
17+
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260623153836-c43c7d3c3033
1818
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260620081344-b5f7f4da641e
1919
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260620095520-3bd0eaaddccb
2020
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260620095236-ada2819d1203
2121
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260618172644-5a4764bdaa36
2222
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260620095519-8d1db7761064
23-
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260621105127-dc5935839186
23+
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260623071703-dd47f94060d8
2424
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20260618132757-fe8e60d1d8a6
2525
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.6.1-0.20260618132757-fe8e60d1d8a6
2626
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260618132757-fe8e60d1d8a6
@@ -31,12 +31,12 @@ require (
3131
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260621105414-d0a3387cbde6
3232
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260621105415-b50a660a36c5
3333
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260621105415-8c3a32631086
34-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260618173215-31a17b1de72a
34+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260622142421-cbb880280d23
3535
github.com/openstack-k8s-operators/openstack-operator/api v0.0.0-00010101000000-000000000000
3636
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260621105414-da97a35a2fed
3737
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260620124412-719ab0600c40
38-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260621105415-8863ed73c35e
39-
github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20260618175018-5ad5fb731abc
38+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260623121042-02616e6bcc4e
39+
github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20260622172441-1bf5034ea0f7
4040
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260622090505-66c9c9781b5d
4141
github.com/pkg/errors v0.9.1
4242
github.com/stretchr/testify v1.11.1

0 commit comments

Comments
 (0)