From 34c86661acfc13538b5e4562fb8e94768b5d7e7f Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Tue, 18 Jun 2024 16:26:21 +0200 Subject: [PATCH] update finalzier to CRD doc Depends-On: https://github.com/openstack-k8s-operators/lib-common/pull/519 Depends-On: https://github.com/openstack-k8s-operators/mariadb-operator/pull/231 Depends-On: https://github.com/openstack-k8s-operators/barbican-operator/pull/125 Depends-On: https://github.com/openstack-k8s-operators/cinder-operator/pull/402 Depends-On: https://github.com/openstack-k8s-operators/designate-operator/pull/178 Depends-On: https://github.com/openstack-k8s-operators/glance-operator/pull/559 Depends-On: https://github.com/openstack-k8s-operators/heat-operator/pull/380 Depends-On: https://github.com/openstack-k8s-operators/horizon-operator/pull/332 Depends-On: https://github.com/openstack-k8s-operators/infra-operator/pull/231 Depends-On: https://github.com/openstack-k8s-operators/ironic-operator/pull/440 Depends-On: https://github.com/openstack-k8s-operators/keystone-operator/pull/428 Depends-On: https://github.com/openstack-k8s-operators/lib-common/pull/519 Depends-On: https://github.com/openstack-k8s-operators/manila-operator/pull/287 Depends-On: https://github.com/openstack-k8s-operators/mariadb-operator/pull/231 Depends-On: https://github.com/openstack-k8s-operators/neutron-operator/pull/366 Depends-On: https://github.com/openstack-k8s-operators/nova-operator/pull/794 Depends-On: https://github.com/openstack-k8s-operators/octavia-operator/pull/330 Depends-On: https://github.com/openstack-k8s-operators/openstack-baremetal-operator/pull/180 Depends-On: https://github.com/openstack-k8s-operators/ovn-operator/pull/309 Depends-On: https://github.com/openstack-k8s-operators/placement-operator/pull/215 Depends-On: https://github.com/openstack-k8s-operators/swift-operator/pull/231 Depends-On: https://github.com/openstack-k8s-operators/telemetry-operator/pull/414 Signed-off-by: Martin Schuppert --- ....openstack.org_openstackcontrolplanes.yaml | 30 ++++--- apis/go.mod | 40 ++++++---- apis/go.sum | 80 +++++++++---------- ....openstack.org_openstackcontrolplanes.yaml | 30 ++++--- ...nstack-operator.clusterserviceversion.yaml | 5 -- go.mod | 40 ++++++---- go.sum | 80 +++++++++---------- .../common/errors_cleanup_openstack.yaml | 8 +- 8 files changed, 168 insertions(+), 145 deletions(-) diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml index f2577719b..a9e9391f0 100644 --- a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -4373,8 +4373,6 @@ spec: type: object type: object type: object - pvc: - type: string replicas: default: 1 format: int32 @@ -4412,10 +4410,15 @@ spec: x-kubernetes-int-or-string: true type: object type: object - storageClass: - type: string - storageRequest: - type: string + storage: + properties: + external: + type: boolean + storageClass: + type: string + storageRequest: + type: string + type: object tls: properties: api: @@ -4443,7 +4446,6 @@ spec: type: string required: - containerImage - - storageRequest type: object type: object imageCache: @@ -4506,10 +4508,15 @@ spec: serviceUser: default: glance type: string - storageClass: - type: string - storageRequest: - type: string + storage: + properties: + external: + type: boolean + storageClass: + type: string + storageRequest: + type: string + type: object required: - databaseInstance - glanceAPIs @@ -4517,7 +4524,6 @@ spec: - keystoneEndpoint - memcachedInstance - secret - - storageRequest type: object type: object heat: diff --git a/apis/go.mod b/apis/go.mod index 6ed1cbed9..f742c96bf 100644 --- a/apis/go.mod +++ b/apis/go.mod @@ -7,26 +7,26 @@ require ( github.com/go-playground/validator/v10 v10.22.0 github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 - github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240617164203-79f227e25054 - github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240612161940-604036e71c7f - github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240617072628-d9a4e3570a7b + github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240619095200-b42b011211df + github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240619145716-e6f7008174d3 + github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240619094058-aa8505803e88 github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240616104609-e296d336e2d0 - github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240617071814-4b53828cc9b0 - github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240617072342-155b98fbba7f - github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240617061457-9ce4f0e12b76 - github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240617151404-d91e8253e159 - github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240617061212-21a80bc3d1fa - github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240615134235-24529fcff658 + github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240619151918-b0834d823735 + github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240619143516-7e487e49906e + github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240619095729-12880d8dcd1a + github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240619143011-b4ca00d278c3 + github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240619130146-b17a4c95ef7d + github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240618142732-ec81334ac10d github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240615134235-24529fcff658 github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240617071525-810dcd87f715 - github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240617061457-85af496b1f8d - github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240617051141-0f11eeae5551 - github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240618042617-76df83782bee + github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240618160206-098a347e0f61 + github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240619144047-f156aa49471a + github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240619091610-e9f5a93a7ee1 github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240617144925-7e66f41e25b7 - github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240617061743-3d9d8de89185 - github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240617061743-5f2e00117024 - github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240617142146-ec06106bbc15 - github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240617073156-f03281e75417 + github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240619085411-bef49bac48ba + github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240619135645-867a324eb196 + github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240619143517-c17fa31548a9 + github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240619062540-252083b90a7c github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240617135419-de45c322372c github.com/rabbitmq/cluster-operator/v2 v2.6.0 github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.69.0-rhobs1 // indirect @@ -116,3 +116,11 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202304141430 // custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.6.0_patches_tag) replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240612145157-629e537392b3 //allow-merging + +replace github.com/openstack-k8s-operators/glance-operator/api => github.com/stuggi/glance-operator/api v0.0.0-20240619055204-dba8b082243c + +replace github.com/openstack-k8s-operators/manila-operator/api => github.com/stuggi/manila-operator/api v0.0.0-20240619055915-e1faf674a5fa + +replace github.com/openstack-k8s-operators/octavia-operator/api => github.com/stuggi/octavia-operator/api v0.0.0-20240619060727-cbbfb96d7b18 + +replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/stuggi/telemetry-operator/api v0.0.0-20240619062407-d70a41985e03 diff --git a/apis/go.sum b/apis/go.sum index 0162904cc..c1904dc1e 100644 --- a/apis/go.sum +++ b/apis/go.sum @@ -90,52 +90,44 @@ github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 h1:rncLxJBpFGqBztyxCMwNRnMjhhIDOWHJowi6q8G6koI= github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4= -github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240617164203-79f227e25054 h1:tY5RXS8c/XVYQ+Uu6oTb6kNOQnCN7QfuVbHiTk3C5AI= -github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240617164203-79f227e25054/go.mod h1:jxfMVyEoAeIzYbjWmV8bYWo9zr2yES1ABNyLo/SVGOE= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240612161940-604036e71c7f h1:8HiRyfjQjyQ4lXkSG7TXcjX3pkwHiyaFfX5xnWgRmck= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240612161940-604036e71c7f/go.mod h1:8Wn6ZAPaJshxozJVPI7uq4qrcUXZmECGAPJK7Ed+uGQ= -github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240617072628-d9a4e3570a7b h1:KodjRfVnaQt9tRztidjT9F3zpKWmRSc369Z7c1n556c= -github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240617072628-d9a4e3570a7b/go.mod h1:sN6FNMjzbVZSuh1IzhnVLXwdKvi8LoxuRRGLGT8CRb4= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240616104609-e296d336e2d0 h1:Wx4xa5Jh/Wa9pAsoCYROJKycesBAy3RBjf/2WnG1Da8= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240616104609-e296d336e2d0/go.mod h1:fYNG/9X9HbQTZkaPo+YLqPu/94dNftw15S58OpQjcZE= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240617071814-4b53828cc9b0 h1:/nQdWwAE/qHonBXFQv57BNt0+ZGvqoaA2wkdKjLHcC4= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240617071814-4b53828cc9b0/go.mod h1:BaF3hWIIaZP8boIwhHdYV/Iz4vda7NQuIgh5l/RhXYo= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240617072342-155b98fbba7f h1:DckJpHSko5A7ea15fq3HBsqLQYTtRHdCxVygHZWbIOI= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240617072342-155b98fbba7f/go.mod h1:iMI3Xiu7BHDwsytE1xz531xl5UZM0+TztilKx6l5xlk= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240617061457-9ce4f0e12b76 h1:dW8fLPa2NmOkaPpqHsYZ1eAnmd4Ylv508fUwr0qbV1s= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240617061457-9ce4f0e12b76/go.mod h1:q1RrcH2Gr+4v/hc7GrRasvXC1fBnM3+QS8G46oSYdnE= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240617151404-d91e8253e159 h1:eeUcHALF05STYiW4YI862KpGeDslh6Niv1z7ll7wOnk= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240617151404-d91e8253e159/go.mod h1:az6OnWQZScIbF+jNCJn+9CJwaWTFlcXk1eKdH3QCfYU= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240617061212-21a80bc3d1fa h1:Zq8sd+K35D7jawVJzuEATsOTESdMT1Wu6t9gdGK8sdA= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240617061212-21a80bc3d1fa/go.mod h1:0IMSIVB7kMArAHQW+fQcaWTN4xDURGaEyLT+ro2Q05k= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240615134235-24529fcff658 h1:h10bPourbXsIN7p5M//SUly/UzWfEp+d5tloBnyDDMI= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240615134235-24529fcff658/go.mod h1:k9KuWN2LBtLbKHgcyh/0lrwk3Kr0cOAhiR3hi/mrwOQ= +github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240619095200-b42b011211df h1:O1i3Xvknmst2aAGAIthtjxIBCeLd1/yjHdM0VMimrwg= +github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240619095200-b42b011211df/go.mod h1:dT5uvFH3FEbC82vBtiFGuZVYxV1OcjnIwvZ4oBmYR68= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240619145716-e6f7008174d3 h1:gzVUzLUODeW/VKNuWdhj6JWwS+DlxIQ2bez7gIC3mdo= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240619145716-e6f7008174d3/go.mod h1:HUva6ZrG7POEm/l6oik8vrKtA465+Q/SVbNgZaCeAFQ= +github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240619094058-aa8505803e88 h1:fT4zESQk4B471iGBAeNhH5HF1GRPkz5J/LpRW+J5IR8= +github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240619094058-aa8505803e88/go.mod h1:1SRptNqYG5/xWGDwBOqRx18DM47CugpSZ/3qhfEdM5o= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240619151918-b0834d823735 h1:+GtLrS1zw0MunAvB1nMVhV50KuU0ucmmpc/skK3U+E8= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240619151918-b0834d823735/go.mod h1:8mJjDlX94SOtWd7W72Itmc/SLrsuxK/cRqSvFNJhC0o= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240619143516-7e487e49906e h1:GDYdcZsJaHBF6x7rgPXu3LrKeuXjAJDsRGaSRnNk6TI= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240619143516-7e487e49906e/go.mod h1:pB66XE99iOyvj7LlG6kh1ql4Bz+pC+xf9Eeq6d/UZ2M= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240619095729-12880d8dcd1a h1:+XLKqSMFxkkdTOw9PIBiOyprmkJPkZIrrjaIf/LHi2M= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240619095729-12880d8dcd1a/go.mod h1:g9AEIebQRkTchWZlAvzq77OfzZxfvr1g5Ppm1BJmTBU= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240619143011-b4ca00d278c3 h1:yQfTmjoSLsC/yuJ5hzcx7XpHtGwSnJLFVKI8jLDU69A= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240619143011-b4ca00d278c3/go.mod h1:1d/yeAfEngAQsXO9/TZNFvn6MEp9d15eSu0KyenzFqk= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240619130146-b17a4c95ef7d h1:Vjp9zYmJ3aOQr5rlUKdJpd1BrPYCXfW+MfauKgxh1Cc= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240619130146-b17a4c95ef7d/go.mod h1:FrtE6oanVDCaPN1PKHBGAMyuVpoDcj20IzWXT1/tQqU= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240618142732-ec81334ac10d h1:t1Lvt1WGp/WbkdU5R7nsc0NtMAvfd0K1nlNYLprHhbQ= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240618142732-ec81334ac10d/go.mod h1:k9KuWN2LBtLbKHgcyh/0lrwk3Kr0cOAhiR3hi/mrwOQ= github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240615134235-24529fcff658 h1:Vb2WhryohIhyeG55z3HDG3R5hk4ipvAYRxAOUgYrOlI= github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240615134235-24529fcff658/go.mod h1:zuPcZ5Kopr15AdfxvA0xqKIIGCZ0XbSe/0VHNKuvbEE= github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240615134235-24529fcff658 h1:HzOM/miWApJGfZhctTZICbbcKDZUls9o1Z1UWuO79PM= github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240615134235-24529fcff658/go.mod h1:v9iFrR8J5fZACS9W5pZau/4lwyWs/YmO4ezpDeoEFKU= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240617071525-810dcd87f715 h1:WJEwFFH0xiu/+kp/IG4fcTzL5HFQicHww0dwNJ2Ezfc= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240617071525-810dcd87f715/go.mod h1:p7BfkInlK6nCTIKAVcjKW8b8I+8mhQv4EyW2ifIEEvI= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240617061457-85af496b1f8d h1:9x6/YC/UzmT2dQ1ulHSFlK09cGQf3rxo0Ff5ki62/KE= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240617061457-85af496b1f8d/go.mod h1:C9Y3qa7mcFdqcWLpfnB61ZxI56Lu1PWm90er8tdAyu8= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240617051141-0f11eeae5551 h1:zazXktkpcHOL8P9c7huI08iipB0DbNPHcs1z3YK8OdM= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240617051141-0f11eeae5551/go.mod h1:563gHN4SVAME0N63VAMV4JJZSiBMChtMyyGf3HjYsu0= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240618042617-76df83782bee h1:/lp3CED/gN8xQcRX4bqnY1BtgN6A7OjHoUM48h98WQk= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240618042617-76df83782bee/go.mod h1:qJDuEiplENsNvkcRg5SbkD6dg6Y4d0M+yS3Rypkdthg= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240617144925-7e66f41e25b7 h1:fB5D/0KlQSk4dbILDeoswYr9j9vj53xQroSZqCBuHjg= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240617144925-7e66f41e25b7/go.mod h1:h03g3HXawiEFYu4r9MD79RXrjc+UGivcHo/Sq2ByUC0= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240617061743-3d9d8de89185 h1:wVCJ1xe4FaSPPy5/K6teaC0/iUyDorFSXZLrMFh00Xk= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240617061743-3d9d8de89185/go.mod h1:iIivV7CKTJEPA2v1B07cw2Y98sGCldl1v31hzGbJH4c= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240617061743-5f2e00117024 h1:TIP3FsbebMdbTFrq/yXxy0SWsriSSeOwL+Sso7P66x8= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240617061743-5f2e00117024/go.mod h1:OT23cnSKIuCdP6n2O2peXsujD1IguqJnnPeXMUNrRC4= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240617142146-ec06106bbc15 h1:dnqMbQWYpZ4j2PpPGRg26UlaN6LAXi9V4SXeS7DMoOA= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240617142146-ec06106bbc15/go.mod h1:iWCReZnbwufk5IZ2/jmDfPXjaLdwnT0ubqzbfmzznbw= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240618160206-098a347e0f61 h1:D2Yk4HW54k9zUn9FBQqr3HRm6ta2rTjFc3yqExkyr+o= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240618160206-098a347e0f61/go.mod h1:HWwqZr9qI121evs7+M7AEO1qqIHY43roDsDrOnbjEMM= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240619144047-f156aa49471a h1:WBQTDSK72gcuR/SZV1tUp/bCUJ7fYccEz0Y2PNl+7rA= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240619144047-f156aa49471a/go.mod h1:VrYKl8hO5VGAacwjx4X1+VUtHQ40UV2jyiO0U464fpA= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240619091610-e9f5a93a7ee1 h1:VmWAtM0n4aP6udlZBnVIzlST2qwzZhYG9sjaQ5L9avM= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240619091610-e9f5a93a7ee1/go.mod h1:XMKNGwB7KX+bH7ocH/zz4+7ahIWicp1/xcmVRatp9eo= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240619085411-bef49bac48ba h1:+JS04yedIPAXVrBCKsAmM5JgelYoHpr0pfuCGqC2lEg= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240619085411-bef49bac48ba/go.mod h1:Qyz0XpxdC9CnVODnlguDknzrIb4Yj3ami3JvVglX5KE= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240619135645-867a324eb196 h1:dFpCCL3+0DOSQsVmRFKgQ4b1bX5e0KToTxbo+RjMdn0= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240619135645-867a324eb196/go.mod h1:QRYXqFox3exy5+QVneOpUzxO2+VRJnOwJZV56FzIPug= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240619143517-c17fa31548a9 h1:mhqv18CgajuKssSqZJsukomPiR83JHqpYK5+7a1cltI= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240619143517-c17fa31548a9/go.mod h1:UsAVhk9/mPsrFyAJOqqvU33oIQVG1rbvVii0KKiqY+I= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240612145157-629e537392b3 h1:lOuzMO0ud9dDOLDrl4mD2Q7FWtm/6yXkdi5JcF5Fbio= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240612145157-629e537392b3/go.mod h1:Zryxg5YgbPUFcLSCcKpf10il8kIRAK5HloNo6khhdis= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240617073156-f03281e75417 h1:kzJJLbyVyYvVt9s4xgiNFifr+slhMBpGGQATeIhZoPY= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240617073156-f03281e75417/go.mod h1:IwK4FYI8S2W7YtsVdoGvoMukNCPrEhoivJ6hb1iMHo4= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240617135419-de45c322372c h1:RghExTL4l6ZPlcCJ35FPiW3g3QOxF/KP/awu8HTfkHQ= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240617135419-de45c322372c/go.mod h1:EuzACoj5reBC4tvdsMkSsoIMcYmrPTC16gEb0qkR86Y= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240619062540-252083b90a7c h1:uxntHE7IFKk7PW2Yu7cRn5+jbh5ojSRBwENAERzYHeM= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240619062540-252083b90a7c/go.mod h1:IwK4FYI8S2W7YtsVdoGvoMukNCPrEhoivJ6hb1iMHo4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -160,6 +152,14 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stuggi/glance-operator/api v0.0.0-20240619055204-dba8b082243c h1:6FdR18lPpWY0YGuzK/10+qW2/MWLaG2v7Up2+9m7f2M= +github.com/stuggi/glance-operator/api v0.0.0-20240619055204-dba8b082243c/go.mod h1:wCKPtH185AlWtozmZDgrx0toq34qaAdEVQ2AMWpsUII= +github.com/stuggi/manila-operator/api v0.0.0-20240619055915-e1faf674a5fa h1:XbiKsjpsmlzPA6rWPFSOARtcTX51aDtpCj1bNEV+oF8= +github.com/stuggi/manila-operator/api v0.0.0-20240619055915-e1faf674a5fa/go.mod h1:HMMECTphkWq3mq9E2PAzhN/b6/e/fYKGQev26ksF9sc= +github.com/stuggi/octavia-operator/api v0.0.0-20240619060727-cbbfb96d7b18 h1:IpfZqVvpMWu9+E8lW0dPJoGkwl4S4XShqBAvKIoYe+I= +github.com/stuggi/octavia-operator/api v0.0.0-20240619060727-cbbfb96d7b18/go.mod h1:BTPjQUZoCfPZe+9w5RN3M2MHTVZv8l2RNA5tO3QNDVI= +github.com/stuggi/telemetry-operator/api v0.0.0-20240619062407-d70a41985e03 h1:s6PWgoxlel0y8uoYPwF5JnCwznJjqerxG4YCRgHmzgQ= +github.com/stuggi/telemetry-operator/api v0.0.0-20240619062407-d70a41985e03/go.mod h1:Zpv5QYwhhUBYPCS7nWjaEbkWCGxAmu52bqNh/2AKNSk= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml index f2577719b..a9e9391f0 100644 --- a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -4373,8 +4373,6 @@ spec: type: object type: object type: object - pvc: - type: string replicas: default: 1 format: int32 @@ -4412,10 +4410,15 @@ spec: x-kubernetes-int-or-string: true type: object type: object - storageClass: - type: string - storageRequest: - type: string + storage: + properties: + external: + type: boolean + storageClass: + type: string + storageRequest: + type: string + type: object tls: properties: api: @@ -4443,7 +4446,6 @@ spec: type: string required: - containerImage - - storageRequest type: object type: object imageCache: @@ -4506,10 +4508,15 @@ spec: serviceUser: default: glance type: string - storageClass: - type: string - storageRequest: - type: string + storage: + properties: + external: + type: boolean + storageClass: + type: string + storageRequest: + type: string + type: object required: - databaseInstance - glanceAPIs @@ -4517,7 +4524,6 @@ spec: - keystoneEndpoint - memcachedInstance - secret - - storageRequest type: object type: object heat: diff --git a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml index 44148d95c..af587b1c9 100644 --- a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml @@ -514,11 +514,6 @@ spec: path: conditions x-descriptors: - urn:alm:descriptor:io.kubernetes.conditions - - description: Deployed - displayName: Deployed - path: deployed - x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:booleanSwitch version: v1beta1 - description: OpenStackDataPlaneNodeSet is the Schema for the openstackdataplanenodesets API OpenStackDataPlaneNodeSet name must be a valid RFC1123 as it is used in diff --git a/go.mod b/go.mod index 8b4e7fb9a..a52cbabd6 100644 --- a/go.mod +++ b/go.mod @@ -14,31 +14,31 @@ require ( github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 github.com/openshift/api v3.9.0+incompatible - github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240617164203-79f227e25054 - github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240612161940-604036e71c7f - github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240617072628-d9a4e3570a7b + github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240619095200-b42b011211df + github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240619145716-e6f7008174d3 + github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240619094058-aa8505803e88 github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240616104609-e296d336e2d0 - github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240617071814-4b53828cc9b0 - github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240617072342-155b98fbba7f - github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240617061457-9ce4f0e12b76 - github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240617151404-d91e8253e159 - github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240617061212-21a80bc3d1fa + github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240619151918-b0834d823735 + github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240619143516-7e487e49906e + github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240619095729-12880d8dcd1a + github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240619143011-b4ca00d278c3 + github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240619130146-b17a4c95ef7d github.com/openstack-k8s-operators/lib-common/modules/ansible v0.3.1-0.20240615134235-24529fcff658 github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240615134235-24529fcff658 - github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240615134235-24529fcff658 + github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240618142732-ec81334ac10d github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240615134235-24529fcff658 github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240615134235-24529fcff658 github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240617071525-810dcd87f715 - github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240617061457-85af496b1f8d - github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240617051141-0f11eeae5551 - github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240618042617-76df83782bee + github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240618160206-098a347e0f61 + github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240619144047-f156aa49471a + github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240619091610-e9f5a93a7ee1 github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240617144925-7e66f41e25b7 github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240617142718-0b7bee230fa3 - github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240617061743-3d9d8de89185 + github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240619085411-bef49bac48ba github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c - github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240617061743-5f2e00117024 - github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240617142146-ec06106bbc15 - github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240617073156-f03281e75417 + github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240619135645-867a324eb196 + github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240619143517-c17fa31548a9 + github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240619062540-252083b90a7c github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240617135419-de45c322372c github.com/openstack-k8s-operators/test-operator/api v0.0.0-20240613081303-0fafab189e4c github.com/operator-framework/api v0.20.0 @@ -130,3 +130,11 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202304141430 // custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.6.0_patches_tag) replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240612145157-629e537392b3 //allow-merging + +replace github.com/openstack-k8s-operators/glance-operator/api => github.com/stuggi/glance-operator/api v0.0.0-20240619055204-dba8b082243c + +replace github.com/openstack-k8s-operators/manila-operator/api => github.com/stuggi/manila-operator/api v0.0.0-20240619055915-e1faf674a5fa + +replace github.com/openstack-k8s-operators/octavia-operator/api => github.com/stuggi/octavia-operator/api v0.0.0-20240619060727-cbbfb96d7b18 + +replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/stuggi/telemetry-operator/api v0.0.0-20240619062407-d70a41985e03 diff --git a/go.sum b/go.sum index 38b6e0286..1fd351e45 100644 --- a/go.sum +++ b/go.sum @@ -98,60 +98,52 @@ github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 h1:rncLxJBpFGqBztyxCMwNRnMjhhIDOWHJowi6q8G6koI= github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4= -github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240617164203-79f227e25054 h1:tY5RXS8c/XVYQ+Uu6oTb6kNOQnCN7QfuVbHiTk3C5AI= -github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240617164203-79f227e25054/go.mod h1:jxfMVyEoAeIzYbjWmV8bYWo9zr2yES1ABNyLo/SVGOE= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240612161940-604036e71c7f h1:8HiRyfjQjyQ4lXkSG7TXcjX3pkwHiyaFfX5xnWgRmck= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240612161940-604036e71c7f/go.mod h1:8Wn6ZAPaJshxozJVPI7uq4qrcUXZmECGAPJK7Ed+uGQ= -github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240617072628-d9a4e3570a7b h1:KodjRfVnaQt9tRztidjT9F3zpKWmRSc369Z7c1n556c= -github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240617072628-d9a4e3570a7b/go.mod h1:sN6FNMjzbVZSuh1IzhnVLXwdKvi8LoxuRRGLGT8CRb4= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240616104609-e296d336e2d0 h1:Wx4xa5Jh/Wa9pAsoCYROJKycesBAy3RBjf/2WnG1Da8= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240616104609-e296d336e2d0/go.mod h1:fYNG/9X9HbQTZkaPo+YLqPu/94dNftw15S58OpQjcZE= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240617071814-4b53828cc9b0 h1:/nQdWwAE/qHonBXFQv57BNt0+ZGvqoaA2wkdKjLHcC4= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240617071814-4b53828cc9b0/go.mod h1:BaF3hWIIaZP8boIwhHdYV/Iz4vda7NQuIgh5l/RhXYo= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240617072342-155b98fbba7f h1:DckJpHSko5A7ea15fq3HBsqLQYTtRHdCxVygHZWbIOI= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240617072342-155b98fbba7f/go.mod h1:iMI3Xiu7BHDwsytE1xz531xl5UZM0+TztilKx6l5xlk= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240617061457-9ce4f0e12b76 h1:dW8fLPa2NmOkaPpqHsYZ1eAnmd4Ylv508fUwr0qbV1s= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240617061457-9ce4f0e12b76/go.mod h1:q1RrcH2Gr+4v/hc7GrRasvXC1fBnM3+QS8G46oSYdnE= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240617151404-d91e8253e159 h1:eeUcHALF05STYiW4YI862KpGeDslh6Niv1z7ll7wOnk= -github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240617151404-d91e8253e159/go.mod h1:az6OnWQZScIbF+jNCJn+9CJwaWTFlcXk1eKdH3QCfYU= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240617061212-21a80bc3d1fa h1:Zq8sd+K35D7jawVJzuEATsOTESdMT1Wu6t9gdGK8sdA= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240617061212-21a80bc3d1fa/go.mod h1:0IMSIVB7kMArAHQW+fQcaWTN4xDURGaEyLT+ro2Q05k= +github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240619095200-b42b011211df h1:O1i3Xvknmst2aAGAIthtjxIBCeLd1/yjHdM0VMimrwg= +github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240619095200-b42b011211df/go.mod h1:dT5uvFH3FEbC82vBtiFGuZVYxV1OcjnIwvZ4oBmYR68= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240619145716-e6f7008174d3 h1:gzVUzLUODeW/VKNuWdhj6JWwS+DlxIQ2bez7gIC3mdo= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240619145716-e6f7008174d3/go.mod h1:HUva6ZrG7POEm/l6oik8vrKtA465+Q/SVbNgZaCeAFQ= +github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240619094058-aa8505803e88 h1:fT4zESQk4B471iGBAeNhH5HF1GRPkz5J/LpRW+J5IR8= +github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240619094058-aa8505803e88/go.mod h1:1SRptNqYG5/xWGDwBOqRx18DM47CugpSZ/3qhfEdM5o= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240619151918-b0834d823735 h1:+GtLrS1zw0MunAvB1nMVhV50KuU0ucmmpc/skK3U+E8= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240619151918-b0834d823735/go.mod h1:8mJjDlX94SOtWd7W72Itmc/SLrsuxK/cRqSvFNJhC0o= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240619143516-7e487e49906e h1:GDYdcZsJaHBF6x7rgPXu3LrKeuXjAJDsRGaSRnNk6TI= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240619143516-7e487e49906e/go.mod h1:pB66XE99iOyvj7LlG6kh1ql4Bz+pC+xf9Eeq6d/UZ2M= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240619095729-12880d8dcd1a h1:+XLKqSMFxkkdTOw9PIBiOyprmkJPkZIrrjaIf/LHi2M= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240619095729-12880d8dcd1a/go.mod h1:g9AEIebQRkTchWZlAvzq77OfzZxfvr1g5Ppm1BJmTBU= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240619143011-b4ca00d278c3 h1:yQfTmjoSLsC/yuJ5hzcx7XpHtGwSnJLFVKI8jLDU69A= +github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240619143011-b4ca00d278c3/go.mod h1:1d/yeAfEngAQsXO9/TZNFvn6MEp9d15eSu0KyenzFqk= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240619130146-b17a4c95ef7d h1:Vjp9zYmJ3aOQr5rlUKdJpd1BrPYCXfW+MfauKgxh1Cc= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240619130146-b17a4c95ef7d/go.mod h1:FrtE6oanVDCaPN1PKHBGAMyuVpoDcj20IzWXT1/tQqU= github.com/openstack-k8s-operators/lib-common/modules/ansible v0.3.1-0.20240615134235-24529fcff658 h1:Igs42gZNIrvqkAn4YR6MulwfT3xU4T1yhLQ6RhOmiGY= github.com/openstack-k8s-operators/lib-common/modules/ansible v0.3.1-0.20240615134235-24529fcff658/go.mod h1:tP+nxk95PisCKJaXE/an2igG9lluxuOVhdmV9WtkR2s= github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240615134235-24529fcff658 h1:pUWaPJkHJdUkK7UbzW/KWMvXh3rAQBo/LiNhlE2Q8rc= github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240615134235-24529fcff658/go.mod h1:GooNi6hM78cOUMjhBy0fXsZIcDTK1dUb1rlay170IJo= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240615134235-24529fcff658 h1:h10bPourbXsIN7p5M//SUly/UzWfEp+d5tloBnyDDMI= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240615134235-24529fcff658/go.mod h1:k9KuWN2LBtLbKHgcyh/0lrwk3Kr0cOAhiR3hi/mrwOQ= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240618142732-ec81334ac10d h1:t1Lvt1WGp/WbkdU5R7nsc0NtMAvfd0K1nlNYLprHhbQ= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240618142732-ec81334ac10d/go.mod h1:k9KuWN2LBtLbKHgcyh/0lrwk3Kr0cOAhiR3hi/mrwOQ= github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240615134235-24529fcff658 h1:Vb2WhryohIhyeG55z3HDG3R5hk4ipvAYRxAOUgYrOlI= github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240615134235-24529fcff658/go.mod h1:zuPcZ5Kopr15AdfxvA0xqKIIGCZ0XbSe/0VHNKuvbEE= github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240615134235-24529fcff658 h1:HzOM/miWApJGfZhctTZICbbcKDZUls9o1Z1UWuO79PM= github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240615134235-24529fcff658/go.mod h1:v9iFrR8J5fZACS9W5pZau/4lwyWs/YmO4ezpDeoEFKU= github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240615134235-24529fcff658 h1:E3v5us2zv+9bRj+8t9Lk0+QpC6t1KSgVsDuzv+7RiMQ= github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240615134235-24529fcff658/go.mod h1:0h76CxD9g0z2Hk7fGFOZcjnzT1tQQ/yRNv3OXng+S/A= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240617071525-810dcd87f715 h1:WJEwFFH0xiu/+kp/IG4fcTzL5HFQicHww0dwNJ2Ezfc= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240617071525-810dcd87f715/go.mod h1:p7BfkInlK6nCTIKAVcjKW8b8I+8mhQv4EyW2ifIEEvI= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240617061457-85af496b1f8d h1:9x6/YC/UzmT2dQ1ulHSFlK09cGQf3rxo0Ff5ki62/KE= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240617061457-85af496b1f8d/go.mod h1:C9Y3qa7mcFdqcWLpfnB61ZxI56Lu1PWm90er8tdAyu8= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240617051141-0f11eeae5551 h1:zazXktkpcHOL8P9c7huI08iipB0DbNPHcs1z3YK8OdM= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240617051141-0f11eeae5551/go.mod h1:563gHN4SVAME0N63VAMV4JJZSiBMChtMyyGf3HjYsu0= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240618042617-76df83782bee h1:/lp3CED/gN8xQcRX4bqnY1BtgN6A7OjHoUM48h98WQk= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240618042617-76df83782bee/go.mod h1:qJDuEiplENsNvkcRg5SbkD6dg6Y4d0M+yS3Rypkdthg= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240617144925-7e66f41e25b7 h1:fB5D/0KlQSk4dbILDeoswYr9j9vj53xQroSZqCBuHjg= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240617144925-7e66f41e25b7/go.mod h1:h03g3HXawiEFYu4r9MD79RXrjc+UGivcHo/Sq2ByUC0= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240618160206-098a347e0f61 h1:D2Yk4HW54k9zUn9FBQqr3HRm6ta2rTjFc3yqExkyr+o= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240618160206-098a347e0f61/go.mod h1:HWwqZr9qI121evs7+M7AEO1qqIHY43roDsDrOnbjEMM= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240619144047-f156aa49471a h1:WBQTDSK72gcuR/SZV1tUp/bCUJ7fYccEz0Y2PNl+7rA= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240619144047-f156aa49471a/go.mod h1:VrYKl8hO5VGAacwjx4X1+VUtHQ40UV2jyiO0U464fpA= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240619091610-e9f5a93a7ee1 h1:VmWAtM0n4aP6udlZBnVIzlST2qwzZhYG9sjaQ5L9avM= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240619091610-e9f5a93a7ee1/go.mod h1:XMKNGwB7KX+bH7ocH/zz4+7ahIWicp1/xcmVRatp9eo= github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240617142718-0b7bee230fa3 h1:p/ygJsDgEW3XDnLnzz+sGMm+OiwCgRz+4BXav/EVULg= github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240617142718-0b7bee230fa3/go.mod h1:S3qqozWG2WJXSm94nDk5wUBYjdP12Y8QEspo92DLEpc= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240617061743-3d9d8de89185 h1:wVCJ1xe4FaSPPy5/K6teaC0/iUyDorFSXZLrMFh00Xk= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240617061743-3d9d8de89185/go.mod h1:iIivV7CKTJEPA2v1B07cw2Y98sGCldl1v31hzGbJH4c= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240617061743-5f2e00117024 h1:TIP3FsbebMdbTFrq/yXxy0SWsriSSeOwL+Sso7P66x8= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240617061743-5f2e00117024/go.mod h1:OT23cnSKIuCdP6n2O2peXsujD1IguqJnnPeXMUNrRC4= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240617142146-ec06106bbc15 h1:dnqMbQWYpZ4j2PpPGRg26UlaN6LAXi9V4SXeS7DMoOA= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240617142146-ec06106bbc15/go.mod h1:iWCReZnbwufk5IZ2/jmDfPXjaLdwnT0ubqzbfmzznbw= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240619085411-bef49bac48ba h1:+JS04yedIPAXVrBCKsAmM5JgelYoHpr0pfuCGqC2lEg= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240619085411-bef49bac48ba/go.mod h1:Qyz0XpxdC9CnVODnlguDknzrIb4Yj3ami3JvVglX5KE= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240619135645-867a324eb196 h1:dFpCCL3+0DOSQsVmRFKgQ4b1bX5e0KToTxbo+RjMdn0= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240619135645-867a324eb196/go.mod h1:QRYXqFox3exy5+QVneOpUzxO2+VRJnOwJZV56FzIPug= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240619143517-c17fa31548a9 h1:mhqv18CgajuKssSqZJsukomPiR83JHqpYK5+7a1cltI= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240619143517-c17fa31548a9/go.mod h1:UsAVhk9/mPsrFyAJOqqvU33oIQVG1rbvVii0KKiqY+I= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240612145157-629e537392b3 h1:lOuzMO0ud9dDOLDrl4mD2Q7FWtm/6yXkdi5JcF5Fbio= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240612145157-629e537392b3/go.mod h1:Zryxg5YgbPUFcLSCcKpf10il8kIRAK5HloNo6khhdis= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240617073156-f03281e75417 h1:kzJJLbyVyYvVt9s4xgiNFifr+slhMBpGGQATeIhZoPY= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240617073156-f03281e75417/go.mod h1:IwK4FYI8S2W7YtsVdoGvoMukNCPrEhoivJ6hb1iMHo4= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240617135419-de45c322372c h1:RghExTL4l6ZPlcCJ35FPiW3g3QOxF/KP/awu8HTfkHQ= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240617135419-de45c322372c/go.mod h1:EuzACoj5reBC4tvdsMkSsoIMcYmrPTC16gEb0qkR86Y= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240619062540-252083b90a7c h1:uxntHE7IFKk7PW2Yu7cRn5+jbh5ojSRBwENAERzYHeM= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240619062540-252083b90a7c/go.mod h1:IwK4FYI8S2W7YtsVdoGvoMukNCPrEhoivJ6hb1iMHo4= github.com/openstack-k8s-operators/test-operator/api v0.0.0-20240613081303-0fafab189e4c h1:Dn45Kw8eKO83OXU0GWOzDNIMGwZfUXIgE/KEkxn2dh0= github.com/openstack-k8s-operators/test-operator/api v0.0.0-20240613081303-0fafab189e4c/go.mod h1:UgqzIVmPod3EOAwoaiB4nXSpyOO5NI2GJKAwjLi+VzU= github.com/operator-framework/api v0.20.0 h1:A2YCRhr+6s0k3pRJacnwjh1Ue8BqjIGuQ2jvPg9XCB4= @@ -183,6 +175,14 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stuggi/glance-operator/api v0.0.0-20240619055204-dba8b082243c h1:6FdR18lPpWY0YGuzK/10+qW2/MWLaG2v7Up2+9m7f2M= +github.com/stuggi/glance-operator/api v0.0.0-20240619055204-dba8b082243c/go.mod h1:wCKPtH185AlWtozmZDgrx0toq34qaAdEVQ2AMWpsUII= +github.com/stuggi/manila-operator/api v0.0.0-20240619055915-e1faf674a5fa h1:XbiKsjpsmlzPA6rWPFSOARtcTX51aDtpCj1bNEV+oF8= +github.com/stuggi/manila-operator/api v0.0.0-20240619055915-e1faf674a5fa/go.mod h1:HMMECTphkWq3mq9E2PAzhN/b6/e/fYKGQev26ksF9sc= +github.com/stuggi/octavia-operator/api v0.0.0-20240619060727-cbbfb96d7b18 h1:IpfZqVvpMWu9+E8lW0dPJoGkwl4S4XShqBAvKIoYe+I= +github.com/stuggi/octavia-operator/api v0.0.0-20240619060727-cbbfb96d7b18/go.mod h1:BTPjQUZoCfPZe+9w5RN3M2MHTVZv8l2RNA5tO3QNDVI= +github.com/stuggi/telemetry-operator/api v0.0.0-20240619062407-d70a41985e03 h1:s6PWgoxlel0y8uoYPwF5JnCwznJjqerxG4YCRgHmzgQ= +github.com/stuggi/telemetry-operator/api v0.0.0-20240619062407-d70a41985e03/go.mod h1:Zpv5QYwhhUBYPCS7nWjaEbkWCGxAmu52bqNh/2AKNSk= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= diff --git a/tests/kuttl/common/errors_cleanup_openstack.yaml b/tests/kuttl/common/errors_cleanup_openstack.yaml index dffa784c8..2880f3b1f 100644 --- a/tests/kuttl/common/errors_cleanup_openstack.yaml +++ b/tests/kuttl/common/errors_cleanup_openstack.yaml @@ -51,28 +51,28 @@ apiVersion: ovn.openstack.org/v1beta1 kind: OVNNorthd metadata: finalizers: - - OVNNorthd + - openstack.org/ovnnorthd name: ovnnorthd-sample --- apiVersion: ovn.openstack.org/v1beta1 kind: OVNDBCluster metadata: finalizers: - - OVNDBCluster + - openstack.org/ovndbcluster name: ovndbcluster-nb-sample --- apiVersion: ovn.openstack.org/v1beta1 kind: OVNDBCluster metadata: finalizers: - - OVNDBCluster + - openstack.org/ovndbcluster name: ovndbcluster-sb-sample --- apiVersion: ovn.openstack.org/v1beta1 kind: OVNController metadata: finalizers: - - OVNController + - openstack.org/ovncontroller name: ovncontroller-sample --- apiVersion: apps/v1