Skip to content

Marshal servicesOverride to JSON before formatting #1731

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

Open
slagle wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −3
Open

Marshal servicesOverride to JSON before formatting #1731

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
3 changes: 2 additions & 1 deletion internal/dataplane/util/ansible_execution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,8 @@ func (a *EEJob) FormatAEEExtraVars(
}

if len(deployment.Spec.ServicesOverride) > 0 {
a.ExtraVars["edpm_services_override"] = json.RawMessage([]byte(fmt.Sprintf("\"%s\"", deployment.Spec.ServicesOverride)))
extraVarsJSON, _ := json.Marshal(deployment.Spec.ServicesOverride)
Copy link
Contributor

@bshephar bshephar Jan 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this err should probably be checked, no?

I understand that is complicated by the fact that this function doesn't return anything and changing the signature of the function isn't nice. It is only used in one place though, so probably not the end of the world to update the signature to:

func (a *EEJob) FormatAEEExtraVars(
	aeeSpec *dataplanev1.AnsibleEESpec,
	service *dataplanev1.OpenStackDataPlaneService,
	deployment *dataplanev1.OpenStackDataPlaneDeployment,
	nodeSet client.Object,
) error {
}

Which does also necessitate changing the signature of BuildAeeJobSpec to also return an error to facilitate back propagating the error. But I think it would probably be nicer if the error was captured and returned rather than silently dropped.

a.ExtraVars["edpm_services_override"] = json.RawMessage([]byte(fmt.Sprintf("\"%s\"", extraVarsJSON)))
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/kuttl/tests/dataplane-deploy-tls-test/03-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ spec:

edpm_override_hosts: openstack-edpm-tls
edpm_service_type: tls-dns-ips
edpm_services_override: [install-certs-ovrd tls-dns-ips custom-tls-dns]
edpm_services_override: [install-certs-ovrd, tls-dns-ips, custom-tls-dns]


imagePullPolicy: Always
Expand Down Expand Up @@ -315,7 +315,7 @@ spec:

edpm_override_hosts: openstack-edpm-tls
edpm_service_type: custom-tls-dns
edpm_services_override: [install-certs-ovrd tls-dns-ips custom-tls-dns]
edpm_services_override: [install-certs-ovrd, tls-dns-ips, custom-tls-dns]


imagePullPolicy: Always
Expand Down