actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-04-16 08:45:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

flux tree: Add namespaces to objects reconcile from HRs

Browse source 
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
Stefan Prodan 2023-01-31 15:52:18 +02:00
parent 023a709b6a
commit 06b8ad2402
No known key found for this signature in database
GPG key ID: 3299AEB0E4085BAF
3 changed files with 75 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cmd/flux/tree_kustomization.go
View file

@ -272,5 +272,17 @@ func getHelmReleaseInventory(ctx context.Context, objectKey client.ObjectKey, ku
return nil, fmt.Errorf("failed to read the Helm storage object for HelmRelease '%s': %w", objectKey.String(), err)
}
for _, obj := range objects {
if obj.GetNamespace() == "" {
if isNamespaced, _ := utils.IsAPINamespaced(obj, kubeClient.Scheme(), kubeClient.RESTMapper()); isNamespaced {
if hr.Spec.TargetNamespace != "" {
obj.SetNamespace(hr.Spec.TargetNamespace)
} else {
obj.SetNamespace(hr.GetNamespace())
}
}
}
}
return object.UnstructuredSetToObjMetadataSet(objects), nil
}