Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-03-19 17:26:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2071 from fluxcd/flux-tree-exclude-remote-clusters

Browse Source 
Skip remote clusters in flux tree cmd
This commit is contained in:
Stefan Prodan
2021-11-10 11:41:16 +02:00
committed by GitHub
parent b6a95be5d0 f03c24565f
commit 789aa322f1
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/flux/tree_kustomization.go
View File

@@ -169,7 +169,9 @@ func treeKustomization(ctx context.Context, tree tree.ObjMetadataTree, item *kus
}
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{}
err = kubeClient.Get(ctx, client.ObjectKey{
Namespace: objMetadata.Namespace,
@@ -199,6 +201,11 @@ func getHelmReleaseInventory(ctx context.Context, objectKey client.ObjectKey, ku
return nil, err
}
// skip release if it targets a remote clusters
if hr.Spec.KubeConfig != nil {
return nil, nil
}
storageNamespace := hr.GetNamespace()
if hr.Spec.StorageNamespace != "" {
storageNamespace = hr.Spec.StorageNamespace