Skip to content

Commit

Permalink
Merge pull request #1233 from openshift-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history
…1222-to-18.0-fr1

[18.0-fr1] Provide DatabaseInstance for Octavia if not explicitly set
  • Loading branch information
openshift-merge-bot[bot] authored Jan 8, 2025
2 parents 4b1d475 + 45615b2 commit 1a69d98
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions pkg/openstack/octavia.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,11 @@ func ReconcileOctavia(ctx context.Context, instance *corev1beta1.OpenStackContro
octavia.Spec.Secret = instance.Spec.Secret
}

if octavia.Spec.DatabaseInstance == "" {
// octavia.Spec.DatabaseInstance = instance.Name // name of MariaDB we create here
octavia.Spec.DatabaseInstance = "openstack" // FIXME: see above
}

err := controllerutil.SetControllerReference(helper.GetBeforeObject(), octavia, helper.GetScheme())
if err != nil {
return err
Expand Down

0 comments on commit 1a69d98

Please sign in to comment.