Skip to content

[18.0-fr2] Propagate top-level extraMounts to Horizon and Keystone #1446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
openshift-cherrypick-robot wants to merge 1 commit into from
Closed

[18.0-fr2] Propagate top-level extraMounts to Horizon and Keystone #1446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions pkg/openstack/horizon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,15 @@ func ReconcileHorizon(ctx context.Context, instance *corev1beta1.OpenStackContro
horizon.Spec.Secret = instance.Spec.Secret
}

// Append globally defined extraMounts to the service's own list.
for _, ev := range instance.Spec.ExtraMounts {
horizon.Spec.ExtraMounts = append(horizon.Spec.ExtraMounts, horizonv1.HorizonExtraVolMounts{
Name: ev.Name,
Region: ev.Region,
VolMounts: ev.VolMounts,
})
}

err := controllerutil.SetControllerReference(helper.GetBeforeObject(), horizon, helper.GetScheme())
if err != nil {
return err
Expand Down
9 changes: 9 additions & 0 deletions pkg/openstack/keystone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,15 @@ func ReconcileKeystoneAPI(ctx context.Context, instance *corev1beta1.OpenStackCo
keystoneAPI.Spec.DatabaseInstance = "openstack" //FIXME: see above
}

// Append globally defined extraMounts to the service's own list.
for _, ev := range instance.Spec.ExtraMounts {
keystoneAPI.Spec.ExtraMounts = append(keystoneAPI.Spec.ExtraMounts, keystonev1.KeystoneExtraMounts{
Name: ev.Name,
Region: ev.Region,
VolMounts: ev.VolMounts,
})
}

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