actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-26 01:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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
commit 789aa322f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats 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 && 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