Merge pull request #488 from stuggi/handle_ingress_v3_ironic_octavia

Create Ironic and Octavia services routes based on annotations on the svc endpoint

apis/core/v1beta1/conditions.go

@@ -78,6 +78,9 @@ const (
 	// OpenStackControlPlaneIronicReadyCondition Status=True condition which indicates if Ironic is configured and operational
 	OpenStackControlPlaneIronicReadyCondition condition.Type = "OpenStackControlPlaneIronicReady"
 
+	// OpenStackControlPlaneExposeIronicReadyCondition Status=True condition which indicates if Ironic is exposed via a route
+	OpenStackControlPlaneExposeIronicReadyCondition condition.Type = "OpenStackControlPlaneExposeIronicReady"
+
 	// OpenStackControlPlaneHorizonReadyCondition Status=True condition which indicates if Horizon is configured and operational
 	OpenStackControlPlaneHorizonReadyCondition condition.Type = "OpenStackControlPlaneHorizonReady"
 
@@ -140,6 +143,9 @@ const (
 
 	// OpenStackControlPlaneRedisReadyCondition Status=True condition which indicates if Redis is configured and operational
 	OpenStackControlPlaneRedisReadyCondition condition.Type = "OpenStackControlPlaneRedisReady"
+
+	// OpenStackControlPlaneExposeOctaviaReadyCondition Status=True condition which indicates if Octavia is exposed via a route
+	OpenStackControlPlaneExposeOctaviaReadyCondition condition.Type = "OpenStackControlPlaneExposeOctaviaReady"
 )
 
 // OpenStackControlPlane Reasons used by API objects.

apis/core/v1beta1/openstackcontrolplane_types.go

@@ -448,6 +448,16 @@ type IronicSection struct {
 	//+operator-sdk:csv:customresourcedefinitions:type=spec
 	// Template - Overrides to use when creating the Ironic services
 	Template ironicv1.IronicSpec `json:"template,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// APIOverride, provides the ability to override the generated manifest of several child resources.
+	APIOverride Override `json:"apiOverride,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// InspectorOverride, provides the ability to override the generated manifest of several child resources.
+	InspectorOverride Override `json:"inspectorOverride,omitempty"`
 }
 
 // ManilaSection defines the desired state of Manila service
@@ -530,6 +540,11 @@ type OctaviaSection struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// Template - Overrides to use when creating Octavia Resources
 	Template octaviav1.OctaviaSpec `json:"template,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// APIOverride, provides the ability to override the generated manifest of several child resources.
+	APIOverride Override `json:"apiOverride,omitempty"`
 }
 
 // RedisSection defines the desired state of the Redis service

apis/go.mod

@@ -3,21 +3,21 @@ module github.com/openstack-k8s-operators/openstack-operator/apis
 go 1.19
 
 require (
-	github.com/onsi/ginkgo/v2 v2.12.0
+	github.com/onsi/ginkgo/v2 v2.12.1
 	github.com/onsi/gomega v1.27.10
 	github.com/openstack-k8s-operators/cinder-operator/api v0.1.2-0.20230921082510-1b9a7de3d088
 	github.com/openstack-k8s-operators/glance-operator/api v0.1.2-0.20230921081203-89164087dac9
 	github.com/openstack-k8s-operators/heat-operator/api v0.1.1-0.20230920142821-e84784bede25
 	github.com/openstack-k8s-operators/horizon-operator/api v0.1.1-0.20230920143411-511d89a0e6cc
 	github.com/openstack-k8s-operators/infra-operator/apis v0.1.1-0.20230920125017-2c76cd203b44
-	github.com/openstack-k8s-operators/ironic-operator/api v0.1.1-0.20230915140049-df437872b34f
+	github.com/openstack-k8s-operators/ironic-operator/api v0.1.1-0.20230926121739-27e75237b3c8
 	github.com/openstack-k8s-operators/keystone-operator/api v0.1.1-0.20230920085319-92ae0260bbf3
-	github.com/openstack-k8s-operators/lib-common/modules/common v0.1.1-0.20230919113507-d74c2f31d216
+	github.com/openstack-k8s-operators/lib-common/modules/common v0.1.1-0.20230925103424-7dcb605ea0bb
 	github.com/openstack-k8s-operators/manila-operator/api v0.1.1-0.20230921081246-996d4e390998
 	github.com/openstack-k8s-operators/mariadb-operator/api v0.1.1-0.20230918111825-8999b3b2dc3c
 	github.com/openstack-k8s-operators/neutron-operator/api v0.1.1-0.20230920145429-537b5afebd07
 	github.com/openstack-k8s-operators/nova-operator/api v0.1.2-0.20230921152245-4a535c8f3e9a
-	github.com/openstack-k8s-operators/octavia-operator/api v0.0.0-20230915083637-79fc51fd4dcf
+	github.com/openstack-k8s-operators/octavia-operator/api v0.0.0-20230926130236-dece63badbab
 	github.com/openstack-k8s-operators/ovn-operator/api v0.1.1-0.20230913151226-aab30786ed97
 	github.com/openstack-k8s-operators/placement-operator/api v0.1.1-0.20230920125340-3c99d09c7033
 	github.com/openstack-k8s-operators/swift-operator/api v0.1.1-0.20230920144258-a37c476a2829

apis/go.sum

@@ -122,8 +122,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 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.12.0 h1:UIVDowFPwpg6yMUpPjGkYvf06K3RAiJXUhCxEwQVHRI=
-github.com/onsi/ginkgo/v2 v2.12.0/go.mod h1:ZNEzXISYlqpb8S36iN71ifqLi3vVD1rVJGvWRCJOUpQ=
+github.com/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA=
+github.com/onsi/ginkgo/v2 v2.12.1/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
 github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
 github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 h1:rncLxJBpFGqBztyxCMwNRnMjhhIDOWHJowi6q8G6koI=
@@ -138,12 +138,12 @@ github.com/openstack-k8s-operators/horizon-operator/api v0.1.1-0.20230920143411-
 github.com/openstack-k8s-operators/horizon-operator/api v0.1.1-0.20230920143411-511d89a0e6cc/go.mod h1:rFtiDTgkoNa+Z+F0q87SIRINWm6gbgeaK3Uyl3bl/Tg=
 github.com/openstack-k8s-operators/infra-operator/apis v0.1.1-0.20230920125017-2c76cd203b44 h1:W2HZy+uk5fnVwvw3+/Jd/k7sNiVXCOd8SiV0dMvmjys=
 github.com/openstack-k8s-operators/infra-operator/apis v0.1.1-0.20230920125017-2c76cd203b44/go.mod h1:fOJ95wMSymtfoellY/TFKcrzW6bu/nTCTzEnFEgCGCc=
-github.com/openstack-k8s-operators/ironic-operator/api v0.1.1-0.20230915140049-df437872b34f h1:dDlJMlhvM6csW24Tf3X8SEW3rG2k08SBgV0ORR1Ts6w=
-github.com/openstack-k8s-operators/ironic-operator/api v0.1.1-0.20230915140049-df437872b34f/go.mod h1:51ig7IbGf7AjxeWi7+qvmRp0C5lp91e+HhXYTYlhVng=
+github.com/openstack-k8s-operators/ironic-operator/api v0.1.1-0.20230926121739-27e75237b3c8 h1:8oUx3FiVAOYgyTjdYwlE5AJ84K/LorLwbVuvsXkVGs8=
+github.com/openstack-k8s-operators/ironic-operator/api v0.1.1-0.20230926121739-27e75237b3c8/go.mod h1:TCsXzuQMxg9HAOfwPtc4NtaQ0ac+NJDqwuLFYOpWw7k=
 github.com/openstack-k8s-operators/keystone-operator/api v0.1.1-0.20230920085319-92ae0260bbf3 h1:6VCz/ZBTJEQJTx4+z8UxLv3WITa4Bgx5CSP237wJ5xM=
 github.com/openstack-k8s-operators/keystone-operator/api v0.1.1-0.20230920085319-92ae0260bbf3/go.mod h1:ta6w/29i4WuWkQp6I4cOLwMGQ5/vJI0y8Em7u+M34jo=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.1.1-0.20230919113507-d74c2f31d216 h1:arYbQA6bLyXJkHm+6M6gPc4YpWMFjs5qkG16Yii4UDo=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.1.1-0.20230919113507-d74c2f31d216/go.mod h1:Ge7Yf6AUmjEvJK9AIW2bT5udLzBIcK59b1QxqymncaQ=
+github.com/openstack-k8s-operators/lib-common/modules/common v0.1.1-0.20230925103424-7dcb605ea0bb h1:MRd/OrTTZeU/KXAzlIH003wPLmjZ4PHaQ7HisJC9hGY=
+github.com/openstack-k8s-operators/lib-common/modules/common v0.1.1-0.20230925103424-7dcb605ea0bb/go.mod h1:kZS5rqVWBZeCyYor2PeQB9IEZ19mGaeL/to3x8F9OJg=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.1.1-0.20230919113507-d74c2f31d216 h1:h76faqi4WAXBs3D2B0GLUdlCjS0dh78wRL0d5RZUwhk=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.1.1-0.20230919113507-d74c2f31d216/go.mod h1:GHi64tgyC75/vuT8Crda0yN5iCIYiSyS4bpzYJjX7MA=
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.1.1-0.20230919113507-d74c2f31d216 h1:1dMwzjuZJSRgHcwblOo6jHrWAe2anwWu4w35Rukz1kw=
@@ -156,8 +156,8 @@ github.com/openstack-k8s-operators/neutron-operator/api v0.1.1-0.20230920145429-
 github.com/openstack-k8s-operators/neutron-operator/api v0.1.1-0.20230920145429-537b5afebd07/go.mod h1:gyme//YzQKEWSn3i3S0oaNBjnMu/m2m0N13boSShBfE=
 github.com/openstack-k8s-operators/nova-operator/api v0.1.2-0.20230921152245-4a535c8f3e9a h1:yBEEaxtR4RWH/M9dAHUQPJ/TBbFDiRkQB4YJcKCcqGE=
 github.com/openstack-k8s-operators/nova-operator/api v0.1.2-0.20230921152245-4a535c8f3e9a/go.mod h1:kyi9gsAg4d8hxjUxnjDTMZeps3xTutH2+FcAnz783m8=
-github.com/openstack-k8s-operators/octavia-operator/api v0.0.0-20230915083637-79fc51fd4dcf h1:e6peuUus9UjB8qpVH0MAUpwog7pHgSAH80cYpaLVKvU=
-github.com/openstack-k8s-operators/octavia-operator/api v0.0.0-20230915083637-79fc51fd4dcf/go.mod h1:r8xZ27TZ5EPgH+EL6VRQRv0tIxlu0zNNvTnz9PjjZUg=
+github.com/openstack-k8s-operators/octavia-operator/api v0.0.0-20230926130236-dece63badbab h1:5b79D/nCq6g6LSUiGahY8Uqada7OfMIYPRjIX+C0UDs=
+github.com/openstack-k8s-operators/octavia-operator/api v0.0.0-20230926130236-dece63badbab/go.mod h1:0CM3dV0tMkluHm84zlcj4L+ToFon7Pe767wKIEkYPKM=
 github.com/openstack-k8s-operators/ovn-operator/api v0.1.1-0.20230913151226-aab30786ed97 h1:+nrBob4GwmRqhISqPiP7lhMwys2kJz1vYmLzKap+B7E=
 github.com/openstack-k8s-operators/ovn-operator/api v0.1.1-0.20230913151226-aab30786ed97/go.mod h1:0zpkMBsrFbFP+AfaJKvREHomqsXcPnUCOT0/LzKmga0=
 github.com/openstack-k8s-operators/placement-operator/api v0.1.1-0.20230920125340-3c99d09c7033 h1:/oIWCEllgIXQbjIj6i8NFK3yC5IHkflnMDSmdz2PeCs=