Skip remote clusters in flux tree cmd

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
pull/2071/head
Stefan Prodan 3 years ago
parent b6a95be5d0
commit f03c24565f
No known key found for this signature in database
GPG Key ID: 3299AEB0E4085BAF

@ -169,7 +169,9 @@ func treeKustomization(ctx context.Context, tree tree.ObjMetadataTree, item *kus
} }
if objMetadata.GroupKind.Group == kustomizev1.GroupVersion.Group && if objMetadata.GroupKind.Group == kustomizev1.GroupVersion.Group &&
objMetadata.GroupKind.Kind == kustomizev1.KustomizationKind { objMetadata.GroupKind.Kind == kustomizev1.KustomizationKind &&
// skip kustomization if it targets a remote clusters
item.Spec.KubeConfig == nil {
k := &kustomizev1.Kustomization{} k := &kustomizev1.Kustomization{}
err = kubeClient.Get(ctx, client.ObjectKey{ err = kubeClient.Get(ctx, client.ObjectKey{
Namespace: objMetadata.Namespace, Namespace: objMetadata.Namespace,
@ -199,6 +201,11 @@ func getHelmReleaseInventory(ctx context.Context, objectKey client.ObjectKey, ku
return nil, err return nil, err
} }
// skip release if it targets a remote clusters
if hr.Spec.KubeConfig != nil {
return nil, nil
}
storageNamespace := hr.GetNamespace() storageNamespace := hr.GetNamespace()
if hr.Spec.StorageNamespace != "" { if hr.Spec.StorageNamespace != "" {
storageNamespace = hr.Spec.StorageNamespace storageNamespace = hr.Spec.StorageNamespace

Loading…
Cancel
Save