diff --git a/api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml index 05ce3f662..5d2d0e9f6 100644 --- a/api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml +++ b/api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml @@ -199,6 +199,8 @@ spec: - ctlplaneInterface - deploymentSSHSecret type: object + controlPlane: + type: string env: items: properties: diff --git a/api/go.mod b/api/go.mod index 25caea5dc..6538b049e 100644 --- a/api/go.mod +++ b/api/go.mod @@ -3,10 +3,10 @@ module github.com/openstack-k8s-operators/dataplane-operator/api go 1.20 require ( - github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240419144952-326611519a8c - github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240420115137-a02d94f5aa66 - github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240420115137-a02d94f5aa66 - github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240422041901-293e48aceb9b + github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240417142035-3e555cf09907 + github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240417144545-d24e7a32d33b + github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240417144545-d24e7a32d33b + github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240409112939-b6f8f2f4e898 k8s.io/api v0.28.9 k8s.io/apimachinery v0.28.9 sigs.k8s.io/controller-runtime v0.16.5 @@ -15,7 +15,7 @@ require ( require ( github.com/cert-manager/cert-manager v1.13.5 github.com/go-playground/validator/v10 v10.19.0 - github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240422120541-8f652bde5abf + github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240418083003-41031f2a1340 golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 ) @@ -52,24 +52,24 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/openshift/api v3.9.0+incompatible // indirect - github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240422095355-066b5ce845c1 // indirect - github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240422110332-6ed2fef78115 // indirect + github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240401125932-8d6162aed60d // indirect + github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240401190259-4d30fdbf5531 // indirect github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240403153039-29d27af23767 // indirect - github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240422132508-f70e0bce1bb6 // indirect - github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240422125749-ff05088a9c5f // indirect - github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240422122457-4fad41f6b28f // indirect + github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240417165217-4dca406ca0a1 // indirect + github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240416110211-aaba96840297 // indirect + github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240417112606-3bc0fba1101d // indirect github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240408054123-cb7b79a22b47 // indirect - github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240422083029-9546ece5eb4f // indirect - github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240420115137-a02d94f5aa66 // indirect - github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240422122211-bccd8acbdde6 // indirect - github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240418060416-9de2d1f1915e // indirect - github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240422111921-f979f931e18c // indirect - github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240422112427-13e4c8de493e // indirect - github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240419104752-ab112a2c09f3 // indirect - github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240422140910-e68a45de92f4 // indirect - github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240422132507-fcac8d9e33fc // indirect - github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240418150616-4d9e60def8ba // indirect - github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240422130014-0607c4aa4a7b // indirect + github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240417151252-c5ede1e3eb6f // indirect + github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240417144545-d24e7a32d33b // indirect + github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240417164648-969367d7f690 // indirect + github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240411135034-a77c10351c47 // indirect + github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240416230751-051151b6f9e0 // indirect + github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240417151820-72ec42d52670 // indirect + github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240417135623-fc90a6fe7f86 // indirect + github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240415222517-eb816e08cb4a // indirect + github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240417101529-887edc53c417 // indirect + github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240417131140-2e30bb18b13b // indirect + github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240417071438-ad7ce0d9da6a // indirect github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.18.0 // indirect github.com/prometheus/client_model v0.5.0 // indirect diff --git a/api/go.sum b/api/go.sum index c98a0a602..99874846f 100644 --- a/api/go.sum +++ b/api/go.sum @@ -82,57 +82,57 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8= -github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= +github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk= github.com/openshift/api v3.9.0+incompatible h1:fJ/KsefYuZAjmrr3+5U9yZIZbTOpVkDDLDLFresAeYs= github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= -github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240422095355-066b5ce845c1 h1:EwG1yy1KPgnRsDsul0MHwPzDoGbUG7WYjXsM2ZHutyM= -github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240422095355-066b5ce845c1/go.mod h1:d4lFj3oT9ZReHGT/ngbF8ViVnv3vnHs/nemKVubkBGA= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240422110332-6ed2fef78115 h1:HcszbRCYBLl7gFOOPWvg+QINL+rCQdp3yQZ4iNkDjLs= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240422110332-6ed2fef78115/go.mod h1:ayvrE0oMzyA/AQDKpCqNT9uupRT0TqrSFXb1sjmvWqE= +github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240401125932-8d6162aed60d h1:2eox5VzFfiUeELe1DJzBS9uCncQ+lFieZGDr6FGBFT4= +github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240401125932-8d6162aed60d/go.mod h1:d4lFj3oT9ZReHGT/ngbF8ViVnv3vnHs/nemKVubkBGA= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240401190259-4d30fdbf5531 h1:91Mwjt0eGtisBOiiB8fbu1i6Ow1bzd55/f1y89z1BcU= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240401190259-4d30fdbf5531/go.mod h1:ayvrE0oMzyA/AQDKpCqNT9uupRT0TqrSFXb1sjmvWqE= github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240403153039-29d27af23767 h1:He5McazPpzOM00VkSpwK85oUq5JMHdjT8o26HxwQamc= github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240403153039-29d27af23767/go.mod h1:SHv9v0wscyVv0yT3VD2UuPvw+kwRAEX/x/8fbnfZVpo= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240422132508-f70e0bce1bb6 h1:Hcf6zyRh0ADQuTffbzax6H7LEY+97JPWe24daC0rgQk= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240422132508-f70e0bce1bb6/go.mod h1:y2yrY1teeD2+PTEu/ofFQCQSHY11e5dWO2wwKQACq/g= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240422125749-ff05088a9c5f h1:u6ObZbLGIhYGAFZJauM+FVd65fbtTLryZVC/p6hAxQk= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240422125749-ff05088a9c5f/go.mod h1:WWQLMNr/X/scRxCGW93hLYO6s1g32RXBfnLfuj7K8eU= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240422122457-4fad41f6b28f h1:NX/jmQCBTAaNWlPVExTVQpW845CjSEfpvk5DepnS6xc= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240422122457-4fad41f6b28f/go.mod h1:WW4WSsJs7u1fD9G/o9PQcXXVKLUmW4DwY6XJRinoBsw= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240419144952-326611519a8c h1:1XKTGXW+xPyEo79987q2fQTS28/0WRFXUfvUC04vjWU= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240419144952-326611519a8c/go.mod h1:VM2T40zxWD8SmK8pt6g9R793GZIeQsJ6LaArHa3w9DQ= +github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240417165217-4dca406ca0a1 h1:8l+XpmKE7Mzxpz6i3HH2aSoqZrMHsrj+80gYqIuo4tI= +github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240417165217-4dca406ca0a1/go.mod h1:iF3kJKcUI+qmVJWwhkL9tL6eTfLkZaGA22UYr5uDGXU= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240416110211-aaba96840297 h1:BUV0fw1BemZVfdctYxFkJuq8Qp/r4AT6bDFbUSOGFl0= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240416110211-aaba96840297/go.mod h1:5s80kwHvLfdkYDBt0LoPyle1260XlsZZBOI8obhAYhY= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240417112606-3bc0fba1101d h1:wB2YI3wNyc+kLdkDVMshDMbrqL8EzgLrGbGEzS0LEm8= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240417112606-3bc0fba1101d/go.mod h1:WW4WSsJs7u1fD9G/o9PQcXXVKLUmW4DwY6XJRinoBsw= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240417142035-3e555cf09907 h1:Gy7M8Ycp1ZJrgUVpCKgVHvDBMQhhdhrx7Yy39PaUYuc= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240417142035-3e555cf09907/go.mod h1:CLzUBOsKBL7Oeq0Aloubq3NsQ61YDQ063Okub1Ze3A4= github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240408054123-cb7b79a22b47 h1:uAvsVOH8a+u8ulgQ9EnjGP5TPtE2brHnYSQ4U/YI5AU= github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240408054123-cb7b79a22b47/go.mod h1:qu/Kuk0zZNbdyAPCF1m+Amp9mU37ol2LyB+1Rvws948= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240422083029-9546ece5eb4f h1:bvqpsLsC8MHY+lMOQjaRtCKFvpH1d8SPq4o2ETzECY8= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240422083029-9546ece5eb4f/go.mod h1:ZaTdOGkpgKZpJWynyaFsUNO0s61hr3+swC6qdb7jp0g= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240420115137-a02d94f5aa66 h1:7ViJ/X0oJj5pICfMuM3QfZXtGrNsmlzEgqqlotiZc28= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240420115137-a02d94f5aa66/go.mod h1:xP/Em4RRsBK50m0HEhYfmn+JsBRqF/XDMUkH2n8gdyA= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240420115137-a02d94f5aa66 h1:qRWKTmi0kraGZ2TTRCwuaQ6l4OuvOzCduTVb1DVdKeM= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240420115137-a02d94f5aa66/go.mod h1:K5DoNjdBJ3SET1rCpGjKgflKmfO56t94iQSTecyQyXY= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240420115137-a02d94f5aa66 h1:8lukSV3gbWg2kZs0tJd9ckLTMHkrIcKzox7leJmaS/U= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240420115137-a02d94f5aa66/go.mod h1:l0LpKr9PiE0My9PfGwfE3CZvIH+bvfqIq3JxsmTcZ40= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240422122211-bccd8acbdde6 h1:CoJVNPdhu4AJj/QzFjzusplkigRckXKTl4tGd/0ikdE= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240422122211-bccd8acbdde6/go.mod h1:j7ShMWHeet3k7Ccn8y9IgIMInNAlFyaGeUIscUSt2T4= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240418060416-9de2d1f1915e h1:DnSo0dGQyS0BGPR+/1behQaiuO1trPh9g5G1CiHfOTk= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240418060416-9de2d1f1915e/go.mod h1:2wiOEd5wTbKQ00Js5pZx1ePwMM6xBkuZE+G4J38aYi0= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240422111921-f979f931e18c h1:f+f8LgZGAY97fI64xWt4BRmRWVbzmt0q9u6YgeATFEw= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240422111921-f979f931e18c/go.mod h1:1cceAi0KVrTEd9G0Gse8VypnNLPsyFWAIUcQ8KQhqvU= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240422112427-13e4c8de493e h1:XjA8oa6YnVZqM5Q21rnSGXNrxi8kxiZypigEFUC9onA= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240422112427-13e4c8de493e/go.mod h1:yPiHP+CMI2cp/W7URfZ6Ijz2Bw7fMhg/pNHlmseXifA= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240419104752-ab112a2c09f3 h1:PD991Vu4cFc1k/JuFxfuYDkSWBxnokjhJXgTU37dGDg= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240419104752-ab112a2c09f3/go.mod h1:EZymlUAhQzGNIAGrpGZ5P6oqfq2IhqY2lNPKLG9iKh8= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240422041901-293e48aceb9b h1:vYUli4j8G8Jx4P/k51zxWmvqSw/8eH+b4KsyqYT9EL4= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240422041901-293e48aceb9b/go.mod h1:GvcC0DTVVGt/Z/E1yFS1/uBxMq1CPU3pZNpJoN2uonI= -github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240422120541-8f652bde5abf h1:osrohM7xUghb3SiW35NwgMaT2mvQO+D6dpAv5jNeVBI= -github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240422120541-8f652bde5abf/go.mod h1:XcWfTvpTgvFRPRzYQ5PoZQ8vI25V72Q3nhOsEzbMKKQ= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240422140910-e68a45de92f4 h1:HfACJdoeykwJE0XpZd7B1DOhliB9yorl8mY9y7DO6PY= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240422140910-e68a45de92f4/go.mod h1:tAiGXFHzjvR7YuvPSZHFDXWpU+hZEZGc9WLljsn800s= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240422132507-fcac8d9e33fc h1:pPZon0HASYwMJ8ITMG34hbob9i7bqNUAoI/2O6+6pp4= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240422132507-fcac8d9e33fc/go.mod h1:UVWuWGl/k1vZlUuzTyYgN6R3VNLTeOQKNFLfvvdUesE= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240417151252-c5ede1e3eb6f h1:LYCcVaMMVtNiVCqyVeYJJ3jW8CfN6KBoE0PqQQf7AMk= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240417151252-c5ede1e3eb6f/go.mod h1:WTnBrcUDNSVF/5wxaAAXYjMXKBp5DdQ0tkGnrvk78fY= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240417144545-d24e7a32d33b h1:nswxmyTDWr4S3bmv1Rx032lAaI0TOFQvr07ieJULEbE= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240417144545-d24e7a32d33b/go.mod h1:bTHNTtdQMhUXUr6uR7GyLJFTu76UZrDdgRsmJC3Z3Bk= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240417144545-d24e7a32d33b h1:5FB1676oHz4zlFZ5birkqn/L3zZ/OBWefqX0Z9X+GHo= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240417144545-d24e7a32d33b/go.mod h1:K5DoNjdBJ3SET1rCpGjKgflKmfO56t94iQSTecyQyXY= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240417144545-d24e7a32d33b h1:IVVit5mLVmGsyl2LHFeMAhusaCb4IghgtL1NeSJV6YE= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240417144545-d24e7a32d33b/go.mod h1:f8Nf7akcL3l99LhxlFvBtOkZvgM5FzEkP2kNhtAH1VA= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240417164648-969367d7f690 h1:E7mN+pyisjV7GMjEJ11AyQeitNvgPuRcbOU2Pr1JteE= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240417164648-969367d7f690/go.mod h1:Rx07Oe0TZKrTcbhBP9IIMmf/TWdgl2NIOobKhMcEb74= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240411135034-a77c10351c47 h1:cITh0IC0SvFFgkHE0jz4DJyfIh3L6D52yjx8sJaLC8g= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240411135034-a77c10351c47/go.mod h1:f9IIyWeoskWoeWaDFF3qmAJ2Kqyovfi0Ar/QUfk3qag= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240416230751-051151b6f9e0 h1:oBRar195o+aDLQ/2UOxmTUljH7EZ2Eyl5h4dPa3Ld6k= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240416230751-051151b6f9e0/go.mod h1:1cceAi0KVrTEd9G0Gse8VypnNLPsyFWAIUcQ8KQhqvU= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240417151820-72ec42d52670 h1:1P0AsWFNn6UU3G9llUfgCaNJT8zE1ilRsh8ipFGui2I= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240417151820-72ec42d52670/go.mod h1:hyowLr4alfdMPfkBhqW6r1Eah7l45lGsznmJW6YF38Y= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240417135623-fc90a6fe7f86 h1:70Hcy4sOAEJcX9yomgLTUTcWdujA4BLSeMxp1wP56kA= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240417135623-fc90a6fe7f86/go.mod h1:EZymlUAhQzGNIAGrpGZ5P6oqfq2IhqY2lNPKLG9iKh8= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240409112939-b6f8f2f4e898 h1:Sg9YtTqIgJIzF9aqD8Gw0WfSzoj4f1Y37Razby2Zu6E= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240409112939-b6f8f2f4e898/go.mod h1:0pXOVlb+rmmYuJ7Sc96Kw1hOJ8d0d29yPIXzAHeEj+c= +github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240418083003-41031f2a1340 h1:8OdoUHOG2bKgCKokNsXyUqyeS+oofCgPCos7U5bMtAY= +github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240418083003-41031f2a1340/go.mod h1:wIkkaXWzP+NX0IRLIuxrwG0aWFmQX4KuaTHh/qzpQSk= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240415222517-eb816e08cb4a h1:DMc6a3vW2Hn51SflutJggKjWx1z1k49NcHkRsjieEs8= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240415222517-eb816e08cb4a/go.mod h1:BUPvHv4+dcNNT50Kvkj9ae8FX9VBht8+7wtpiBWUbm0= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240417101529-887edc53c417 h1:7I3V+nw8bd/k2qJMKsdzKO6rYTBkAU3rvQTSpqAgzco= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240417101529-887edc53c417/go.mod h1:NYOgk2HS4mSR+4WwsiexepNU1pjxeo7h2WTs8qtS9/0= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240313124519-961a0ee8bf7f h1:wWaOCAkCym4t+NZWXYT/LErGhKujDdKgc7Qy/3vX4uU= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240313124519-961a0ee8bf7f/go.mod h1:Zryxg5YgbPUFcLSCcKpf10il8kIRAK5HloNo6khhdis= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240418150616-4d9e60def8ba h1:/tX2SThqhFYnXhekiR5271oodYP/gXYFntk0ZTWwHKw= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240418150616-4d9e60def8ba/go.mod h1:Jyxa9ZtVrXUQgDbuCl9mGWByF5duJ3LOWcLYIzMbrtc= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240422130014-0607c4aa4a7b h1:NobP3xNJP7mnd4HLlrESGsSOZ7wxV/6R7+Fqv9kjeak= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240422130014-0607c4aa4a7b/go.mod h1:kiWsWO2Ue5w64gME1qbbdns/RdAI5kvR4DwXfM0nUHY= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240417131140-2e30bb18b13b h1:GaaEwq7a0zspjS6I8ZiSoru9Gn2Wi/0gvHPxdjpQG4s= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240417131140-2e30bb18b13b/go.mod h1:Jyxa9ZtVrXUQgDbuCl9mGWByF5duJ3LOWcLYIzMbrtc= +github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240417071438-ad7ce0d9da6a h1:Yytw+duTXXuvzM60Qs9GvBOKJOapcxBGECLpsvGSCO8= +github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240417071438-ad7ce0d9da6a/go.mod h1:kiWsWO2Ue5w64gME1qbbdns/RdAI5kvR4DwXfM0nUHY= 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= diff --git a/api/v1beta1/openstackdataplanenodeset_types.go b/api/v1beta1/openstackdataplanenodeset_types.go index 0da04ed29..cc9dc83cb 100644 --- a/api/v1beta1/openstackdataplanenodeset_types.go +++ b/api/v1beta1/openstackdataplanenodeset_types.go @@ -17,9 +17,11 @@ limitations under the License. package v1beta1 import ( + "context" "fmt" "golang.org/x/exp/slices" + "sigs.k8s.io/controller-runtime/pkg/client" infranetworkv1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1" condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition" @@ -28,6 +30,7 @@ import ( openstackv1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/validation/field" ) @@ -83,6 +86,10 @@ type OpenStackDataPlaneNodeSetSpec struct { // +kubebuilder:default=true // +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"} TLSEnabled bool `json:"tlsEnabled" yaml:"tlsEnabled"` + + // ControlPlane - Name of the Control Plane associated with the node set + // +kubebuilder:validation:Optional + ControlPlane string `json:"controlPlane,omitempty"` } //+kubebuilder:object:root=true @@ -282,3 +289,56 @@ func (r *OpenStackDataPlaneNodeSetSpec) duplicateNodeCheck(nodeSetList *OpenStac return } + +// Compare TLS settings of control plane and data plane +// if control plane name is specified attempt to retrieve it +// otherwise get any control plane in the namespace +func (r *OpenStackDataPlaneNodeSetSpec) ValidateTLS(namespace string, reconcilerClient client.Client, ctx context.Context) error { + var err error + + controlPlane := openstackv1.OpenStackControlPlane{} + if len(r.ControlPlane) > 0 { + controlPlaneName := types.NamespacedName{ + Name: r.ControlPlane, + Namespace: namespace, + } + err = reconcilerClient.Get(ctx, controlPlaneName, &controlPlane) + if err == nil { + err = r.TLSMatch(controlPlane) + } + + } else { + controlPlanes := openstackv1.OpenStackControlPlaneList{} + opts := client.ListOptions{ + Namespace: namespace, + } + + _ = reconcilerClient.List(ctx, &controlPlanes, &opts) + // Verify TLS status of control plane only if there is a single one + // report error if there are multiple, or proceed if there are none + if len(controlPlanes.Items) > 1 { + err = fmt.Errorf("multiple control planes found in the namespace %v", namespace) + } else if len(controlPlanes.Items) == 1 { + controlPlane = controlPlanes.Items[0] + err = r.TLSMatch(controlPlane) + } + } + return err +} + +// Do TLS flags match in control plane ingress, pods and data plane +func (r *OpenStackDataPlaneNodeSetSpec) TLSMatch(controlPlane openstackv1.OpenStackControlPlane) *field.Error { + + if controlPlane.Spec.TLS.Ingress.Enabled != r.TLSEnabled || controlPlane.Spec.TLS.PodLevel.Enabled != r.TLSEnabled { + + return field.Forbidden( + field.NewPath("spec.tlsEnabled"), + fmt.Sprintf( + "TLS settings on Data Plane node set and Control Plane %s do not match, Node set: %t Control Plane Ingress: %t Control Plane PodLevel: %t", + controlPlane.Name, + r.TLSEnabled, + controlPlane.Spec.TLS.Ingress.Enabled, + controlPlane.Spec.TLS.PodLevel.Enabled)) + } + return nil +} diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml index 05ce3f662..5d2d0e9f6 100644 --- a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml +++ b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml @@ -199,6 +199,8 @@ spec: - ctlplaneInterface - deploymentSSHSecret type: object + controlPlane: + type: string env: items: properties: diff --git a/controllers/openstackdataplanedeployment_controller.go b/controllers/openstackdataplanedeployment_controller.go index 784f2f0f3..3e0cdc87a 100644 --- a/controllers/openstackdataplanedeployment_controller.go +++ b/controllers/openstackdataplanedeployment_controller.go @@ -183,6 +183,17 @@ func (r *OpenStackDataPlaneDeploymentReconciler) Reconcile(ctx context.Context, // Error reading the object - requeue the request. return ctrl.Result{}, err } + err = nodeSetInstance.Spec.ValidateTLS(instance.GetNamespace(), r.Client, ctx) + if err != nil { + Log.Info("nodeset %s TLS settings in conflict with control plane: %w", nodeSet, err) + instance.Status.Conditions.MarkFalse( + dataplanev1.SetupReadyCondition, + condition.ErrorReason, + condition.SeverityError, + dataplanev1.DataPlaneNodeSetErrorMessage, + err.Error()) + return ctrl.Result{}, err + } nodeSets.Items = append(nodeSets.Items, *nodeSetInstance) } diff --git a/docs/assemblies/custom_resources.adoc b/docs/assemblies/custom_resources.adoc index 924ab4f0c..84c1c95e0 100644 --- a/docs/assemblies/custom_resources.adoc +++ b/docs/assemblies/custom_resources.adoc @@ -503,6 +503,11 @@ OpenStackDataPlaneNodeSetSpec defines the desired state of OpenStackDataPlaneNod | TLSEnabled - Whether the node set has TLS enabled. | bool | true + +| controlPlane +| ControlPlane - Name of the Control Plane associated with the node set +| string +| false |=== <> diff --git a/go.mod b/go.mod index b9cccfbbc..6e8029ec4 100644 --- a/go.mod +++ b/go.mod @@ -12,17 +12,17 @@ require ( github.com/iancoleman/strcase v0.3.0 github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0 github.com/onsi/ginkgo/v2 v2.17.1 - github.com/onsi/gomega v1.33.0 + github.com/onsi/gomega v1.32.0 github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-00010101000000-000000000000 - github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240419144952-326611519a8c - github.com/openstack-k8s-operators/lib-common/modules/ansible v0.3.1-0.20240420115137-a02d94f5aa66 - github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240420115137-a02d94f5aa66 - github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240420115137-a02d94f5aa66 - github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240420115137-a02d94f5aa66 - github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240420115137-a02d94f5aa66 - github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240422131415-6c1c6fa8bbc9 - github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240422041901-293e48aceb9b - github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240422120541-8f652bde5abf + github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240417142035-3e555cf09907 + github.com/openstack-k8s-operators/lib-common/modules/ansible v0.3.1-0.20240408095526-357d8fffa034 + github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240417144545-d24e7a32d33b + github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240417144545-d24e7a32d33b + github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240417144545-d24e7a32d33b + github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240408095526-357d8fffa034 + github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240405191225-a61ca8697bf2 + github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240409112939-b6f8f2f4e898 + github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240418083003-41031f2a1340 golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.28.9 @@ -66,24 +66,24 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/openshift/api v3.9.0+incompatible // indirect - github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240422095355-066b5ce845c1 // indirect - github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240422110332-6ed2fef78115 // indirect + github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240401125932-8d6162aed60d // indirect + github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240401190259-4d30fdbf5531 // indirect github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240403153039-29d27af23767 // indirect - github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240422132508-f70e0bce1bb6 // indirect - github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240422125749-ff05088a9c5f // indirect - github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240422122457-4fad41f6b28f // indirect + github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240417165217-4dca406ca0a1 // indirect + github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240416110211-aaba96840297 // indirect + github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240417112606-3bc0fba1101d // indirect github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240408054123-cb7b79a22b47 // indirect - github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240422083029-9546ece5eb4f // indirect - github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240420115137-a02d94f5aa66 // indirect - github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240422122211-bccd8acbdde6 // indirect - github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240418060416-9de2d1f1915e // indirect - github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240422111921-f979f931e18c // indirect - github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240422112427-13e4c8de493e // indirect - github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240419104752-ab112a2c09f3 // indirect - github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240422140910-e68a45de92f4 // indirect - github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240422132507-fcac8d9e33fc // indirect - github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240418150616-4d9e60def8ba // indirect - github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240422130014-0607c4aa4a7b // indirect + github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240417151252-c5ede1e3eb6f // indirect + github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240417144545-d24e7a32d33b // indirect + github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240417164648-969367d7f690 // indirect + github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240411135034-a77c10351c47 // indirect + github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240416230751-051151b6f9e0 // indirect + github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240417151820-72ec42d52670 // indirect + github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240417135623-fc90a6fe7f86 // indirect + github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240415222517-eb816e08cb4a // indirect + github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240417101529-887edc53c417 // indirect + github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240417131140-2e30bb18b13b // indirect + github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240417071438-ad7ce0d9da6a // indirect github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.18.0 // indirect github.com/prometheus/client_model v0.5.0 // indirect diff --git a/go.sum b/go.sum index 6bc20930c..6d789430c 100644 --- a/go.sum +++ b/go.sum @@ -90,66 +90,66 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8= github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= -github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= -github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= +github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk= +github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg= 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-20240422095355-066b5ce845c1 h1:EwG1yy1KPgnRsDsul0MHwPzDoGbUG7WYjXsM2ZHutyM= -github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240422095355-066b5ce845c1/go.mod h1:d4lFj3oT9ZReHGT/ngbF8ViVnv3vnHs/nemKVubkBGA= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240422110332-6ed2fef78115 h1:HcszbRCYBLl7gFOOPWvg+QINL+rCQdp3yQZ4iNkDjLs= -github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240422110332-6ed2fef78115/go.mod h1:ayvrE0oMzyA/AQDKpCqNT9uupRT0TqrSFXb1sjmvWqE= +github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240401125932-8d6162aed60d h1:2eox5VzFfiUeELe1DJzBS9uCncQ+lFieZGDr6FGBFT4= +github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240401125932-8d6162aed60d/go.mod h1:d4lFj3oT9ZReHGT/ngbF8ViVnv3vnHs/nemKVubkBGA= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240401190259-4d30fdbf5531 h1:91Mwjt0eGtisBOiiB8fbu1i6Ow1bzd55/f1y89z1BcU= +github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240401190259-4d30fdbf5531/go.mod h1:ayvrE0oMzyA/AQDKpCqNT9uupRT0TqrSFXb1sjmvWqE= github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240403153039-29d27af23767 h1:He5McazPpzOM00VkSpwK85oUq5JMHdjT8o26HxwQamc= github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240403153039-29d27af23767/go.mod h1:SHv9v0wscyVv0yT3VD2UuPvw+kwRAEX/x/8fbnfZVpo= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240422132508-f70e0bce1bb6 h1:Hcf6zyRh0ADQuTffbzax6H7LEY+97JPWe24daC0rgQk= -github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240422132508-f70e0bce1bb6/go.mod h1:y2yrY1teeD2+PTEu/ofFQCQSHY11e5dWO2wwKQACq/g= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240422125749-ff05088a9c5f h1:u6ObZbLGIhYGAFZJauM+FVd65fbtTLryZVC/p6hAxQk= -github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240422125749-ff05088a9c5f/go.mod h1:WWQLMNr/X/scRxCGW93hLYO6s1g32RXBfnLfuj7K8eU= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240422122457-4fad41f6b28f h1:NX/jmQCBTAaNWlPVExTVQpW845CjSEfpvk5DepnS6xc= -github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240422122457-4fad41f6b28f/go.mod h1:WW4WSsJs7u1fD9G/o9PQcXXVKLUmW4DwY6XJRinoBsw= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240419144952-326611519a8c h1:1XKTGXW+xPyEo79987q2fQTS28/0WRFXUfvUC04vjWU= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240419144952-326611519a8c/go.mod h1:VM2T40zxWD8SmK8pt6g9R793GZIeQsJ6LaArHa3w9DQ= +github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240417165217-4dca406ca0a1 h1:8l+XpmKE7Mzxpz6i3HH2aSoqZrMHsrj+80gYqIuo4tI= +github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240417165217-4dca406ca0a1/go.mod h1:iF3kJKcUI+qmVJWwhkL9tL6eTfLkZaGA22UYr5uDGXU= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240416110211-aaba96840297 h1:BUV0fw1BemZVfdctYxFkJuq8Qp/r4AT6bDFbUSOGFl0= +github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240416110211-aaba96840297/go.mod h1:5s80kwHvLfdkYDBt0LoPyle1260XlsZZBOI8obhAYhY= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240417112606-3bc0fba1101d h1:wB2YI3wNyc+kLdkDVMshDMbrqL8EzgLrGbGEzS0LEm8= +github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240417112606-3bc0fba1101d/go.mod h1:WW4WSsJs7u1fD9G/o9PQcXXVKLUmW4DwY6XJRinoBsw= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240417142035-3e555cf09907 h1:Gy7M8Ycp1ZJrgUVpCKgVHvDBMQhhdhrx7Yy39PaUYuc= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240417142035-3e555cf09907/go.mod h1:CLzUBOsKBL7Oeq0Aloubq3NsQ61YDQ063Okub1Ze3A4= github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240408054123-cb7b79a22b47 h1:uAvsVOH8a+u8ulgQ9EnjGP5TPtE2brHnYSQ4U/YI5AU= github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240408054123-cb7b79a22b47/go.mod h1:qu/Kuk0zZNbdyAPCF1m+Amp9mU37ol2LyB+1Rvws948= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240422083029-9546ece5eb4f h1:bvqpsLsC8MHY+lMOQjaRtCKFvpH1d8SPq4o2ETzECY8= -github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240422083029-9546ece5eb4f/go.mod h1:ZaTdOGkpgKZpJWynyaFsUNO0s61hr3+swC6qdb7jp0g= -github.com/openstack-k8s-operators/lib-common/modules/ansible v0.3.1-0.20240420115137-a02d94f5aa66 h1:KE7xA67JJTKvbSBy4zAYBII94N5zLBuJEoTWp1I47JQ= -github.com/openstack-k8s-operators/lib-common/modules/ansible v0.3.1-0.20240420115137-a02d94f5aa66/go.mod h1:tP+nxk95PisCKJaXE/an2igG9lluxuOVhdmV9WtkR2s= -github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240420115137-a02d94f5aa66 h1:NnBjG3HbZijCk12i42KDxO7zQQa3Jez3fb0qLBFqsoo= -github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240420115137-a02d94f5aa66/go.mod h1:t7kNdGn28WRKtFh+F53SffwG7IuWuTdUWR6VfR9TLzI= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240420115137-a02d94f5aa66 h1:7ViJ/X0oJj5pICfMuM3QfZXtGrNsmlzEgqqlotiZc28= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240420115137-a02d94f5aa66/go.mod h1:xP/Em4RRsBK50m0HEhYfmn+JsBRqF/XDMUkH2n8gdyA= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240420115137-a02d94f5aa66 h1:qRWKTmi0kraGZ2TTRCwuaQ6l4OuvOzCduTVb1DVdKeM= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240420115137-a02d94f5aa66/go.mod h1:K5DoNjdBJ3SET1rCpGjKgflKmfO56t94iQSTecyQyXY= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240420115137-a02d94f5aa66 h1:8lukSV3gbWg2kZs0tJd9ckLTMHkrIcKzox7leJmaS/U= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240420115137-a02d94f5aa66/go.mod h1:l0LpKr9PiE0My9PfGwfE3CZvIH+bvfqIq3JxsmTcZ40= -github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240420115137-a02d94f5aa66 h1:sjNYkYD4FlS/TKAPC2IkowbiFogG8czt57k+gYguQck= -github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240420115137-a02d94f5aa66/go.mod h1:kgNJzwudmICAm2qIy+XHt8Azzmm/wMdYxT1roC8Lojg= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240422122211-bccd8acbdde6 h1:CoJVNPdhu4AJj/QzFjzusplkigRckXKTl4tGd/0ikdE= -github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240422122211-bccd8acbdde6/go.mod h1:j7ShMWHeet3k7Ccn8y9IgIMInNAlFyaGeUIscUSt2T4= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240418060416-9de2d1f1915e h1:DnSo0dGQyS0BGPR+/1behQaiuO1trPh9g5G1CiHfOTk= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240418060416-9de2d1f1915e/go.mod h1:2wiOEd5wTbKQ00Js5pZx1ePwMM6xBkuZE+G4J38aYi0= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240422111921-f979f931e18c h1:f+f8LgZGAY97fI64xWt4BRmRWVbzmt0q9u6YgeATFEw= -github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240422111921-f979f931e18c/go.mod h1:1cceAi0KVrTEd9G0Gse8VypnNLPsyFWAIUcQ8KQhqvU= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240422112427-13e4c8de493e h1:XjA8oa6YnVZqM5Q21rnSGXNrxi8kxiZypigEFUC9onA= -github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240422112427-13e4c8de493e/go.mod h1:yPiHP+CMI2cp/W7URfZ6Ijz2Bw7fMhg/pNHlmseXifA= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240419104752-ab112a2c09f3 h1:PD991Vu4cFc1k/JuFxfuYDkSWBxnokjhJXgTU37dGDg= -github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240419104752-ab112a2c09f3/go.mod h1:EZymlUAhQzGNIAGrpGZ5P6oqfq2IhqY2lNPKLG9iKh8= -github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240422131415-6c1c6fa8bbc9 h1:65Wzh0fZzLVkU1r8T2Tp1Rwy7oBew0vYoBeV5ivbuFg= -github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240422131415-6c1c6fa8bbc9/go.mod h1:cz/ZnjZe/w9MISo3PZEmMpW20Ci82iFWkEKWxQPC6EY= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240422041901-293e48aceb9b h1:vYUli4j8G8Jx4P/k51zxWmvqSw/8eH+b4KsyqYT9EL4= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240422041901-293e48aceb9b/go.mod h1:GvcC0DTVVGt/Z/E1yFS1/uBxMq1CPU3pZNpJoN2uonI= -github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240422120541-8f652bde5abf h1:osrohM7xUghb3SiW35NwgMaT2mvQO+D6dpAv5jNeVBI= -github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240422120541-8f652bde5abf/go.mod h1:XcWfTvpTgvFRPRzYQ5PoZQ8vI25V72Q3nhOsEzbMKKQ= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240422140910-e68a45de92f4 h1:HfACJdoeykwJE0XpZd7B1DOhliB9yorl8mY9y7DO6PY= -github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240422140910-e68a45de92f4/go.mod h1:tAiGXFHzjvR7YuvPSZHFDXWpU+hZEZGc9WLljsn800s= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240422132507-fcac8d9e33fc h1:pPZon0HASYwMJ8ITMG34hbob9i7bqNUAoI/2O6+6pp4= -github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240422132507-fcac8d9e33fc/go.mod h1:UVWuWGl/k1vZlUuzTyYgN6R3VNLTeOQKNFLfvvdUesE= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240417151252-c5ede1e3eb6f h1:LYCcVaMMVtNiVCqyVeYJJ3jW8CfN6KBoE0PqQQf7AMk= +github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240417151252-c5ede1e3eb6f/go.mod h1:WTnBrcUDNSVF/5wxaAAXYjMXKBp5DdQ0tkGnrvk78fY= +github.com/openstack-k8s-operators/lib-common/modules/ansible v0.3.1-0.20240408095526-357d8fffa034 h1:kkaDQ3eiXmronp5hYQIGFecq+NftfwPUoo5rdb67+b8= +github.com/openstack-k8s-operators/lib-common/modules/ansible v0.3.1-0.20240408095526-357d8fffa034/go.mod h1:tP+nxk95PisCKJaXE/an2igG9lluxuOVhdmV9WtkR2s= +github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240417144545-d24e7a32d33b h1:1oUektOUcnAvy5kj8C1owY34HhDR4mlCQAVvmGgUK1w= +github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240417144545-d24e7a32d33b/go.mod h1:JiHsE8g5qYKDkjCyp5QQHYVWEwreY133DBoIIBVnTSA= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240417144545-d24e7a32d33b h1:nswxmyTDWr4S3bmv1Rx032lAaI0TOFQvr07ieJULEbE= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240417144545-d24e7a32d33b/go.mod h1:bTHNTtdQMhUXUr6uR7GyLJFTu76UZrDdgRsmJC3Z3Bk= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240417144545-d24e7a32d33b h1:5FB1676oHz4zlFZ5birkqn/L3zZ/OBWefqX0Z9X+GHo= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240417144545-d24e7a32d33b/go.mod h1:K5DoNjdBJ3SET1rCpGjKgflKmfO56t94iQSTecyQyXY= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240417144545-d24e7a32d33b h1:IVVit5mLVmGsyl2LHFeMAhusaCb4IghgtL1NeSJV6YE= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240417144545-d24e7a32d33b/go.mod h1:f8Nf7akcL3l99LhxlFvBtOkZvgM5FzEkP2kNhtAH1VA= +github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240408095526-357d8fffa034 h1:7w1LR0sHlXAG7NbTJVjJS/fxGXm5eyAqJjqafIo32q0= +github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240408095526-357d8fffa034/go.mod h1:ejPUK2xqh49WTnrLBPJyBAkMn3ZizO9pai39Aufg6C0= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240417164648-969367d7f690 h1:E7mN+pyisjV7GMjEJ11AyQeitNvgPuRcbOU2Pr1JteE= +github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240417164648-969367d7f690/go.mod h1:Rx07Oe0TZKrTcbhBP9IIMmf/TWdgl2NIOobKhMcEb74= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240411135034-a77c10351c47 h1:cITh0IC0SvFFgkHE0jz4DJyfIh3L6D52yjx8sJaLC8g= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240411135034-a77c10351c47/go.mod h1:f9IIyWeoskWoeWaDFF3qmAJ2Kqyovfi0Ar/QUfk3qag= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240416230751-051151b6f9e0 h1:oBRar195o+aDLQ/2UOxmTUljH7EZ2Eyl5h4dPa3Ld6k= +github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240416230751-051151b6f9e0/go.mod h1:1cceAi0KVrTEd9G0Gse8VypnNLPsyFWAIUcQ8KQhqvU= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240417151820-72ec42d52670 h1:1P0AsWFNn6UU3G9llUfgCaNJT8zE1ilRsh8ipFGui2I= +github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240417151820-72ec42d52670/go.mod h1:hyowLr4alfdMPfkBhqW6r1Eah7l45lGsznmJW6YF38Y= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240417135623-fc90a6fe7f86 h1:70Hcy4sOAEJcX9yomgLTUTcWdujA4BLSeMxp1wP56kA= +github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240417135623-fc90a6fe7f86/go.mod h1:EZymlUAhQzGNIAGrpGZ5P6oqfq2IhqY2lNPKLG9iKh8= +github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240405191225-a61ca8697bf2 h1:bSaKuBQAl1hwcDmDDsygjbMIbnfRXb+5gGSa7NCdMQ8= +github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240405191225-a61ca8697bf2/go.mod h1:LlYu56B20n7SQPqgKaOsqXb3qNcjtR7Gd7ppYwz60kk= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240409112939-b6f8f2f4e898 h1:Sg9YtTqIgJIzF9aqD8Gw0WfSzoj4f1Y37Razby2Zu6E= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240409112939-b6f8f2f4e898/go.mod h1:0pXOVlb+rmmYuJ7Sc96Kw1hOJ8d0d29yPIXzAHeEj+c= +github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240418083003-41031f2a1340 h1:8OdoUHOG2bKgCKokNsXyUqyeS+oofCgPCos7U5bMtAY= +github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240418083003-41031f2a1340/go.mod h1:wIkkaXWzP+NX0IRLIuxrwG0aWFmQX4KuaTHh/qzpQSk= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240415222517-eb816e08cb4a h1:DMc6a3vW2Hn51SflutJggKjWx1z1k49NcHkRsjieEs8= +github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240415222517-eb816e08cb4a/go.mod h1:BUPvHv4+dcNNT50Kvkj9ae8FX9VBht8+7wtpiBWUbm0= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240417101529-887edc53c417 h1:7I3V+nw8bd/k2qJMKsdzKO6rYTBkAU3rvQTSpqAgzco= +github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240417101529-887edc53c417/go.mod h1:NYOgk2HS4mSR+4WwsiexepNU1pjxeo7h2WTs8qtS9/0= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240313124519-961a0ee8bf7f h1:wWaOCAkCym4t+NZWXYT/LErGhKujDdKgc7Qy/3vX4uU= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240313124519-961a0ee8bf7f/go.mod h1:Zryxg5YgbPUFcLSCcKpf10il8kIRAK5HloNo6khhdis= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240418150616-4d9e60def8ba h1:/tX2SThqhFYnXhekiR5271oodYP/gXYFntk0ZTWwHKw= -github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240418150616-4d9e60def8ba/go.mod h1:Jyxa9ZtVrXUQgDbuCl9mGWByF5duJ3LOWcLYIzMbrtc= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240422130014-0607c4aa4a7b h1:NobP3xNJP7mnd4HLlrESGsSOZ7wxV/6R7+Fqv9kjeak= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240422130014-0607c4aa4a7b/go.mod h1:kiWsWO2Ue5w64gME1qbbdns/RdAI5kvR4DwXfM0nUHY= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240417131140-2e30bb18b13b h1:GaaEwq7a0zspjS6I8ZiSoru9Gn2Wi/0gvHPxdjpQG4s= +github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240417131140-2e30bb18b13b/go.mod h1:Jyxa9ZtVrXUQgDbuCl9mGWByF5duJ3LOWcLYIzMbrtc= +github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240417071438-ad7ce0d9da6a h1:Yytw+duTXXuvzM60Qs9GvBOKJOapcxBGECLpsvGSCO8= +github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240417071438-ad7ce0d9da6a/go.mod h1:kiWsWO2Ue5w64gME1qbbdns/RdAI5kvR4DwXfM0nUHY= 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= diff --git a/tests/functional/base_test.go b/tests/functional/base_test.go index 82d2421d4..37f6957db 100644 --- a/tests/functional/base_test.go +++ b/tests/functional/base_test.go @@ -9,6 +9,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/client" dataplanev1 "github.com/openstack-k8s-operators/dataplane-operator/api/v1beta1" infrav1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1" @@ -273,6 +274,38 @@ func DefaultDataplaneGlobalService(name types.NamespacedName) map[string]interfa } } +// Create simple OpenStackControlPlane +func CreateOpenStackControlPlane(name types.NamespacedName, tlsEnabled bool) client.Object { + + raw := map[string]interface{}{ + "apiVersion": "core.openstack.org/v1beta1", + "kind": "OpenStackControlPlane", + "metadata": map[string]interface{}{ + "name": name.Name, + "namespace": name.Namespace, + }, + "spec": map[string]interface{}{ + "secret": "osp-secret", + "storageClass": "local-storage", + "tls": map[string]interface{}{ + "ingress": map[string]interface{}{ + "enabled": tlsEnabled, + "ca": map[string]interface{}{ + "duration": "100h", + }, + "cert": map[string]interface{}{ + "duration": "10h", + }, + }, + "podLevel": map[string]interface{}{ + "enabled": tlsEnabled, + }, + }, + }, + } + return th.CreateUnstructured(raw) +} + // Get resources // Retrieve OpenStackDataPlaneDeployment and check for errors diff --git a/tests/functional/openstackdataplanedeployment_controller_test.go b/tests/functional/openstackdataplanedeployment_controller_test.go index f73cce000..def9e8e9e 100644 --- a/tests/functional/openstackdataplanedeployment_controller_test.go +++ b/tests/functional/openstackdataplanedeployment_controller_test.go @@ -33,6 +33,7 @@ var _ = Describe("Dataplane Deployment Test", func() { var dataplaneMultiNodesetDeploymentName types.NamespacedName var dataplaneServiceName types.NamespacedName var dataplaneGlobalServiceName types.NamespacedName + var controlPlaneName types.NamespacedName BeforeEach(func() { dataplaneDeploymentName = types.NamespacedName{ @@ -664,4 +665,101 @@ var _ = Describe("Dataplane Deployment Test", func() { ) }) }) + + When("A user sets TLSEnabled to true with control plane TLS disabled", func() { + BeforeEach(func() { + controlPlaneName = types.NamespacedName{ + Name: "mock-control-plane", + Namespace: namespace, + } + CreateSSHSecret(dataplaneSSHSecretName) + DeferCleanup(th.DeleteInstance, th.CreateSecret(neutronOvnMetadataSecretName, map[string][]byte{ + "fake_keys": []byte("blih"), + })) + DeferCleanup(th.DeleteInstance, th.CreateSecret(novaNeutronMetadataSecretName, map[string][]byte{ + "fake_keys": []byte("blih"), + })) + DeferCleanup(th.DeleteInstance, th.CreateSecret(novaCellComputeConfigSecretName, map[string][]byte{ + "fake_keys": []byte("blih"), + })) + DeferCleanup(th.DeleteInstance, th.CreateSecret(novaMigrationSSHKey, map[string][]byte{ + "ssh-privatekey": []byte("fake-ssh-private-key"), + "ssh-publickey": []byte("fake-ssh-public-key"), + })) + DeferCleanup(th.DeleteInstance, th.CreateSecret(ceilometerConfigSecretName, map[string][]byte{ + "fake_keys": []byte("blih"), + })) + // DefaultDataPlanenodeSetSpec comes with two mock services, one marked for deployment on all nodesets + CreateDataplaneService(dataplaneServiceName, false) + CreateDataplaneService(dataplaneGlobalServiceName, true) + + DeferCleanup(th.DeleteService, dataplaneServiceName) + DeferCleanup(th.DeleteService, dataplaneGlobalServiceName) + DeferCleanup(th.DeleteInstance, CreateNetConfig(dataplaneNetConfigName, DefaultNetConfigSpec())) + DeferCleanup(th.DeleteInstance, CreateDataplaneNodeSet(dataplaneNodeSetName, DefaultDataPlaneNodeSetSpec(dataplaneNodeSetName.Name))) + DeferCleanup(th.DeleteInstance, CreateDataplaneDeployment(dataplaneDeploymentName, DefaultDataPlaneDeploymentSpec())) + + DeferCleanup(th.DeleteInstance, CreateOpenStackControlPlane(controlPlaneName, false)) + }) + + It("Should have Spec fields initialized", func() { + dataplaneDeploymentInstance := GetDataplaneDeployment(dataplaneDeploymentName) + expectedSpec := dataplanev1.OpenStackDataPlaneDeploymentSpec{ + NodeSets: []string{"edpm-compute-nodeset"}, + AnsibleTags: "", + AnsibleLimit: "", + AnsibleSkipTags: "", + DeploymentRequeueTime: 15, + ServicesOverride: nil, + } + Expect(dataplaneDeploymentInstance.Spec).Should(Equal(expectedSpec)) + }) + + It("should have ready condiction set to false and input condition set to unknown", func() { + + nodeSet := dataplanev1.OpenStackDataPlaneNodeSet{} + baremetal := baremetalv1.OpenStackBaremetalSet{ + ObjectMeta: metav1.ObjectMeta{ + Name: nodeSet.Name, + Namespace: nodeSet.Namespace, + }, + } + // Create config map for OVN service + ovnConfigMapName := types.NamespacedName{ + Namespace: namespace, + Name: "ovncontroller-config", + } + mapData := map[string]interface{}{ + "ovsdb-config": "test-ovn-config", + } + th.CreateConfigMap(ovnConfigMapName, mapData) + + nodeSet = *GetDataplaneNodeSet(dataplaneNodeSetName) + + // Set baremetal provisioning conditions to True + Eventually(func(g Gomega) { + // OpenStackBaremetalSet has the same name as OpenStackDataPlaneNodeSet + g.Expect(th.K8sClient.Get(th.Ctx, dataplaneNodeSetName, &baremetal)).To(Succeed()) + baremetal.Status.Conditions.MarkTrue( + condition.ReadyCondition, + condition.ReadyMessage) + g.Expect(th.K8sClient.Status().Update(th.Ctx, &baremetal)).To(Succeed()) + + }, th.Timeout, th.Interval).Should(Succeed()) + + th.ExpectCondition( + dataplaneDeploymentName, + ConditionGetterFunc(DataplaneDeploymentConditionGetter), + condition.ReadyCondition, + corev1.ConditionFalse, + ) + th.ExpectCondition( + dataplaneDeploymentName, + ConditionGetterFunc(DataplaneDeploymentConditionGetter), + condition.InputReadyCondition, + corev1.ConditionUnknown, + ) + }) + + }) }) diff --git a/tests/functional/suite_test.go b/tests/functional/suite_test.go index ef62249b2..f6e45bc97 100644 --- a/tests/functional/suite_test.go +++ b/tests/functional/suite_test.go @@ -26,6 +26,7 @@ import ( "github.com/google/uuid" . "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports . "github.com/onsi/gomega" //revive:disable:dot-imports + openstackv1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" @@ -46,7 +47,6 @@ import ( infrav1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1" aee "github.com/openstack-k8s-operators/openstack-ansibleee-operator/api/v1beta1" baremetalv1 "github.com/openstack-k8s-operators/openstack-baremetal-operator/api/v1beta1" - openstackv1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1" //revive:disable-next-line:dot-imports . "github.com/openstack-k8s-operators/lib-common/modules/common/test/helpers"