Make deprecated parameter optional

Author: lmiccini

api/bases/octavia.openstack.org_octavias.yaml

@@ -1588,11 +1588,10 @@ spec:
                   e.g. to check logs
                 type: boolean
               rabbitMqClusterName:
-                default: rabbitmq
                 description: |-
                   RabbitMQ instance name
                   Needed to request a transportURL that is created and used in Octavia
-                  Deprecated: use MessagingBus.Cluster instead
+                  Deprecated: Use MessagingBus.Cluster instead
                 type: string
               redisServiceName:
                 default: octavia-redis
@@ -1712,7 +1711,6 @@ spec:
             - databaseInstance
             - octaviaAPI
             - octaviaNetworkAttachment
-            - rabbitMqClusterName
             - secret
             type: object
           status:

api/v1beta1/octavia_types.go

@@ -127,12 +127,11 @@ type OctaviaSpecBase struct {
 	// to connect for the persistence database
 	PersistenceDatabaseAccount string `json:"persistenceDatabaseAccount"`
 
-	// +kubebuilder:validation:Required
-	// +kubebuilder:default=rabbitmq
+	// +kubebuilder:validation:Optional
 	// RabbitMQ instance name
 	// Needed to request a transportURL that is created and used in Octavia
-	// Deprecated: use MessagingBus.Cluster instead
-	RabbitMqClusterName string `json:"rabbitMqClusterName" deprecated:"messagingBus.cluster"`
+	// Deprecated: Use MessagingBus.Cluster instead
+	RabbitMqClusterName string `json:"rabbitMqClusterName,omitempty"`
 
 	// +kubebuilder:validation:Optional
 	// MessagingBus configuration (cluster, username, and vhost)

api/v1beta1/octavia_webhook.go

@@ -19,7 +19,6 @@ package v1beta1
 import (
 	"fmt"
 
-	rabbitmqv1 "github.com/openstack-k8s-operators/infra-operator/apis/rabbitmq/v1beta1"
 	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	common_webhook "github.com/openstack-k8s-operators/lib-common/modules/common/webhook"
@@ -65,10 +64,10 @@ func (r *Octavia) Default() {
 
 // Default - set defaults for this Octavia spec
 func (spec *OctaviaSpec) Default() {
-	// Set default RabbitMQ configuration and migrate from RabbitMqClusterName if needed
-	// Only migrate from deprecated field if the new field is not already set
+	// Default MessagingBus.Cluster if not set
+	// Migration from deprecated fields is handled by openstack-operator
 	if spec.MessagingBus.Cluster == "" {
-		rabbitmqv1.DefaultRabbitMqConfig(&spec.MessagingBus, spec.RabbitMqClusterName)
+		spec.MessagingBus.Cluster = "rabbitmq"
 	}
 
 	if spec.OctaviaAPI.ContainerImage == "" {
@@ -99,10 +98,10 @@ func (spec *OctaviaSpec) Default() {
 
 // Default - set defaults for this Octavia core spec (this version is used by the OpenStackControlplane webhook)
 func (spec *OctaviaSpecCore) Default() {
-	// Set default RabbitMQ configuration and migrate from RabbitMqClusterName if needed
-	// Only migrate from deprecated field if the new field is not already set
+	// Default MessagingBus.Cluster if not set
+	// Migration from deprecated fields is handled by openstack-operator
 	if spec.MessagingBus.Cluster == "" {
-		rabbitmqv1.DefaultRabbitMqConfig(&spec.MessagingBus, spec.RabbitMqClusterName)
+		spec.MessagingBus.Cluster = "rabbitmq"
 	}
 }
 

config/crd/bases/octavia.openstack.org_octavias.yaml

@@ -1588,11 +1588,10 @@ spec:
                   e.g. to check logs
                 type: boolean
               rabbitMqClusterName:
-                default: rabbitmq
                 description: |-
                   RabbitMQ instance name
                   Needed to request a transportURL that is created and used in Octavia
-                  Deprecated: use MessagingBus.Cluster instead
+                  Deprecated: Use MessagingBus.Cluster instead
                 type: string
               redisServiceName:
                 default: octavia-redis
@@ -1712,7 +1711,6 @@ spec:
             - databaseInstance
             - octaviaAPI
             - octaviaNetworkAttachment
-            - rabbitMqClusterName
             - secret
             type: object
           status:

test/kuttl/tests/octavia_tls/02-deploy.yaml

@@ -6,7 +6,8 @@ spec:
   databaseInstance: openstack
   databaseUser: octavia
   serviceUser: octavia
-  rabbitMqClusterName: rabbitmq
+  messagingBus:
+    cluster: rabbitmq
   secret: osp-secret
   preserveJobs: false
   customServiceConfig: |

test/kuttl/tests/octavia_topology/01-deploy-octavia.yaml

@@ -8,7 +8,8 @@ spec:
   databaseInstance: openstack
   databaseUser: octavia
   serviceUser: octavia
-  rabbitMqClusterName: rabbitmq
+  messagingBus:
+    cluster: rabbitmq
   secret: osp-secret
   preserveJobs: false
   customServiceConfig: |