Skip to content

Commit 8e3b35c

Browse files
bogdandobogdando
committed
WIP tests
Signed-off-by: Bohdan Dobrelia <bdobreli@redhat.com>
1 parent 1e37ac3 commit 8e3b35c

10 files changed

Lines changed: 155 additions & 89 deletions

File tree

‎apis/core/v1beta1/openstackcontrolplane_types.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,12 +500,12 @@ type NotificationsBusSection struct {
500500
// +kubebuilder:validation:Optional
501501
// The name of RabbitMQ Cluster CR to select a Messaging
502502
// Bus Service instance used by all services that produce or consume notifications.
503-
// Avoid colocating it with RabbitMQ services used for PRC.
503+
// Avoid colocating it with RabbitMQ services used for RPC.
504504
// That instance will be pushed down for services, unless overriden in templates.
505505
// An empty value disables notifications drivers, and makes the services emitting no notifications at all.
506506
// When undefined, no configuration will be pushed down for services, which provides backward compatibility during upgrades,
507507
// and leaves a possibility for services to override the configuration, stick with its default behavior, or disable notifications only for itself.
508-
// Services that support this global configuration interface include: Nova
508+
// Services that support this global configuration interface include: Nova
509509
RabbitMqClusterName *string `json:"rabbitMqClusterName,omitempty"`
510510
}
511511

‎apis/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250407064150-1cff0f51b44d
1414
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250423034234-f96998c6fdac
1515
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250421055257-62660c8c5cba
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250424140239-2d89c1d9f3ec
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250430070919-2ce4eea3a06d
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250423054051-4b1b486312a5
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250420193521-f2b86a82d7e8
1919
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0

‎apis/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250423034234-f96
106106
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250423034234-f96998c6fdac/go.mod h1:H7Cd+GRpWmm+Viqu2eqNMGhK7qTE7SpSVo6qz1Gksec=
107107
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250421055257-62660c8c5cba h1:ZJSh4+IWoojgMeY2Pe2kaG3lLPPxT81X9tSEV2Ke3hM=
108108
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250421055257-62660c8c5cba/go.mod h1:Jti6wluZ1s3eRUQKoeYTZyMfap5cKYZsjkkVuAiiqQA=
109-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250424140239-2d89c1d9f3ec h1:Sr12fbgiUTL/a7qvKCosedKW5gn5S+53DgRJgeveTk4=
110-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250424140239-2d89c1d9f3ec/go.mod h1:XywwuHkxaBZA+6QsF+N/3f9ekBq3tH0I/gQZzwL89GU=
109+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250430070919-2ce4eea3a06d h1:aphoDw96rkEMGhZJoc+kO3S4o9e/GQfXz/njRPjh+Kw=
110+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250430070919-2ce4eea3a06d/go.mod h1:XywwuHkxaBZA+6QsF+N/3f9ekBq3tH0I/gQZzwL89GU=
111111
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250423054051-4b1b486312a5 h1:5joWLQOZmZb1vQRm0h0n2oTEmwcazQskWq7Tq77l2p0=
112112
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250423054051-4b1b486312a5/go.mod h1:Xla9BX9bX9/9SqV6g4fQEJUGiCLyd2JiR7Xk5fZJFmk=
113113
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250420193521-f2b86a82d7e8 h1:goExj6wO3m63qMWsavIR+IbnmkJ/H/kN5ypLDAfys+c=

‎bindata/crds/crds.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9181,7 +9181,7 @@ spec:
91819181
type: object
91829182
notificationsBus:
91839183
properties:
9184-
rabbitMQCluster:
9184+
rabbitMqClusterName:
91859185
type: string
91869186
type: object
91879187
nova:
@@ -10144,6 +10144,8 @@ spec:
1014410144
additionalProperties:
1014510145
type: string
1014610146
type: object
10147+
notificationsBusInstance:
10148+
type: string
1014710149
passwordSelectors:
1014810150
default:
1014910151
service: NovaPassword

‎config/operator/manager_operator_images.yaml‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
- name: RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL
2727
value: quay.io/openstack-k8s-operators/horizon-operator@sha256:37a80bf1b810fdfac60039ba071fe5f577c5bb577e1dfbe5288f0f0a518b3208
2828
- name: RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL
29-
value: quay.io/openstack-k8s-operators/infra-operator@sha256:430cf7662b053e44cd192707df7e1be6ef7a15220bc33ccee0603584286f5904
29+
value: quay.io/openstack-k8s-operators/infra-operator@sha256:2f9a5ff028317071196316f63c725ffeac2edcf048a8e2bcaad8b62c0cf01a37
3030
- name: RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL
3131
value: quay.io/openstack-k8s-operators/ironic-operator@sha256:582b87b8aab73281a4f80805cb4ca1de25e4777cade42b7e77ecd0970764e4ef
3232
- name: RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL
@@ -37,21 +37,3 @@ spec:
3737
value: quay.io/openstack-k8s-operators/mariadb-operator@sha256:84d5f2b679bf78bafa7196573d0c0eadac187619f99f6f0366c18a0d451f2429
3838
- name: RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL
3939
value: quay.io/openstack-k8s-operators/neutron-operator@sha256:9dd2d21b7b92aad53a4d8396b6813580a41c3fb27c6660d4c97df5eb740b90c7
40-
- name: RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL
41-
value: quay.io/openstack-k8s-operators/nova-operator@sha256:54003c77ea9a53c88b63459d6b89aad39b4545fa8b54117baa3e7b0b5193f87b
42-
- name: RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL
43-
value: quay.io/openstack-k8s-operators/octavia-operator@sha256:abf1768201b89781b0ee32c4f5b814b73c665821aeac1acf6c5d9adec341c27d
44-
- name: RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL
45-
value: quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:63a389d560a494a2c27b88ce6a484269b60255d9bf1c716a78ba36f476fd9e2a
46-
- name: RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL
47-
value: quay.io/openstack-k8s-operators/ovn-operator@sha256:7bfea334ddbdc6d90bfe103055c7a45a1368de12ab1dbae7138ae66cdcbcddfa
48-
- name: RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL
49-
value: quay.io/openstack-k8s-operators/placement-operator@sha256:85109a7c6cc469d1939b33b9d6f671eb152cf42c157b810c1735c50f6c5b15d5
50-
- name: RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL
51-
value: quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:225524223bf2a7f3a4ce95958fc9ca6fdab02745fb70374e8ff5bf1ddaceda4b
52-
- name: RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL
53-
value: quay.io/openstack-k8s-operators/swift-operator@sha256:14ce5df801eaf57a1b52246e9c17958b1b6f1db0f93b02043bb54349369c2299
54-
- name: RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL
55-
value: quay.io/openstack-k8s-operators/telemetry-operator@sha256:a0f2d268709301ddd923e39ccd7af55fc7b4ee31c64baf1b71365719dbc171cc
56-
- name: RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL
57-
value: quay.io/openstack-k8s-operators/test-operator@sha256:2e8434e19d7a01c2e36f14f8de0443b307321ccb15bcc99f3a263c40e31489bd

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250407064150-1cff0f51b44d
1919
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250423034234-f96998c6fdac
2020
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250421055257-62660c8c5cba
21-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250424140239-2d89c1d9f3ec
21+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250430070919-2ce4eea3a06d
2222
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250423054051-4b1b486312a5
2323
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250420193521-f2b86a82d7e8
2424
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20250423055245-3cb2ae8df6f0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250423034234-f96
110110
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250423034234-f96998c6fdac/go.mod h1:H7Cd+GRpWmm+Viqu2eqNMGhK7qTE7SpSVo6qz1Gksec=
111111
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250421055257-62660c8c5cba h1:ZJSh4+IWoojgMeY2Pe2kaG3lLPPxT81X9tSEV2Ke3hM=
112112
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250421055257-62660c8c5cba/go.mod h1:Jti6wluZ1s3eRUQKoeYTZyMfap5cKYZsjkkVuAiiqQA=
113-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250424140239-2d89c1d9f3ec h1:Sr12fbgiUTL/a7qvKCosedKW5gn5S+53DgRJgeveTk4=
114-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250424140239-2d89c1d9f3ec/go.mod h1:XywwuHkxaBZA+6QsF+N/3f9ekBq3tH0I/gQZzwL89GU=
113+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250430070919-2ce4eea3a06d h1:aphoDw96rkEMGhZJoc+kO3S4o9e/GQfXz/njRPjh+Kw=
114+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250430070919-2ce4eea3a06d/go.mod h1:XywwuHkxaBZA+6QsF+N/3f9ekBq3tH0I/gQZzwL89GU=
115115
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250423054051-4b1b486312a5 h1:5joWLQOZmZb1vQRm0h0n2oTEmwcazQskWq7Tq77l2p0=
116116
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250423054051-4b1b486312a5/go.mod h1:Xla9BX9bX9/9SqV6g4fQEJUGiCLyd2JiR7Xk5fZJFmk=
117117
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250420193521-f2b86a82d7e8 h1:goExj6wO3m63qMWsavIR+IbnmkJ/H/kN5ypLDAfys+c=

‎hack/export_operator_related_images.sh‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,9 @@ export RELATED_IMAGE_DESIGNATE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-
66
export RELATED_IMAGE_GLANCE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/glance-operator@sha256:1ed34422907d48c5518baf3f7465eb1955b8c8e6ea077dc785584e4d9e7f5cb0
77
export RELATED_IMAGE_HEAT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/heat-operator@sha256:1b38316cbd850806a212ce5e8c0c2934a70d0aa512849f992aa3e7bed068f987
88
export RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/horizon-operator@sha256:37a80bf1b810fdfac60039ba071fe5f577c5bb577e1dfbe5288f0f0a518b3208
9-
export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:430cf7662b053e44cd192707df7e1be6ef7a15220bc33ccee0603584286f5904
9+
export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:2f9a5ff028317071196316f63c725ffeac2edcf048a8e2bcaad8b62c0cf01a37
1010
export RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ironic-operator@sha256:582b87b8aab73281a4f80805cb4ca1de25e4777cade42b7e77ecd0970764e4ef
1111
export RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/keystone-operator@sha256:729a882ea6abbe3fbbb0e62af88caf5c9af686ca14d53c16e54c32683d534ee4
1212
export RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/manila-operator@sha256:248b4cd350f249f1f49ee2e9c672ab703158639e63a14357bbb5682c66abea3f
1313
export RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/mariadb-operator@sha256:84d5f2b679bf78bafa7196573d0c0eadac187619f99f6f0366c18a0d451f2429
1414
export RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/neutron-operator@sha256:9dd2d21b7b92aad53a4d8396b6813580a41c3fb27c6660d4c97df5eb740b90c7
15-
export RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/nova-operator@sha256:54003c77ea9a53c88b63459d6b89aad39b4545fa8b54117baa3e7b0b5193f87b
16-
export RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/octavia-operator@sha256:abf1768201b89781b0ee32c4f5b814b73c665821aeac1acf6c5d9adec341c27d
17-
export RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:63a389d560a494a2c27b88ce6a484269b60255d9bf1c716a78ba36f476fd9e2a
18-
export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:7bfea334ddbdc6d90bfe103055c7a45a1368de12ab1dbae7138ae66cdcbcddfa
19-
export RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/placement-operator@sha256:85109a7c6cc469d1939b33b9d6f671eb152cf42c157b810c1735c50f6c5b15d5
20-
export RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:225524223bf2a7f3a4ce95958fc9ca6fdab02745fb70374e8ff5bf1ddaceda4b
21-
export RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/swift-operator@sha256:14ce5df801eaf57a1b52246e9c17958b1b6f1db0f93b02043bb54349369c2299
22-
export RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/telemetry-operator@sha256:a0f2d268709301ddd923e39ccd7af55fc7b4ee31c64baf1b71365719dbc171cc
23-
export RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/test-operator@sha256:2e8434e19d7a01c2e36f14f8de0443b307321ccb15bcc99f3a263c40e31489bd

‎tests/functional/ctlplane/base_test.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ type Names struct {
5656
NeutronName types.NamespacedName
5757
HorizonName types.NamespacedName
5858
HeatName types.NamespacedName
59+
NovaName types.NamespacedName
60+
PlacementName types.NamespacedName
5961
TelemetryName types.NamespacedName
6062
DBName types.NamespacedName
6163
DBCertName types.NamespacedName
@@ -170,6 +172,14 @@ func CreateNames(openstackControlplaneName types.NamespacedName) Names {
170172
Namespace: openstackControlplaneName.Namespace,
171173
Name: "telemetry",
172174
},
175+
NovaName: types.NamespacedName{
176+
Namespace: openstackControlplaneName.Namespace,
177+
Name: "nova",
178+
},
179+
PlacementName: types.NamespacedName{
180+
Namespace: openstackControlplaneName.Namespace,
181+
Name: "placement",
182+
},
173183
DBName: types.NamespacedName{
174184
Namespace: openstackControlplaneName.Namespace,
175185
Name: "openstack",

0 commit comments

Comments
 (0)