Exclude CiliumIdentity kind during listing resources (#751)

Signed-off-by: Praveen Rewar <[email protected]>
carvel-dev · May 15, 2023 · 949012e · 949012e
1 parent 3e2edfa
commit 949012e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/pkg/kapp/resources/identified_resources_list.go b/pkg/kapp/resources/identified_resources_list.go
@@ -38,6 +38,10 @@ func (r IdentifiedResources) List(labelSelector labels.Selector, resRefs []Resou
 		schema.GroupVersionResource{Version: "v1", Resource: "componentstatuses"},
 	})
 
+	// https://github.com/carvel-dev/kapp/issues/748
+	// TODO provide a way to exclude resource via configuration
+	resTypes = NonMatchingGK(resTypes, schema.GroupKind{Group: "cilium.io", Kind: "CiliumIdentity"})
+
 	if len(opts.GKsScope) > 0 {
 		resTypes = MatchingAnyGK(resTypes, opts.GKsScope)
 	}

diff --git a/pkg/kapp/resources/resource_types.go b/pkg/kapp/resources/resource_types.go
@@ -270,6 +270,16 @@ func NonMatching(in []ResourceType, ref ResourceRef) []ResourceType {
 	return out
 }
 
+func NonMatchingGK(in []ResourceType, gk schema.GroupKind) []ResourceType {
+	var out []ResourceType
+	for _, item := range in {
+		if !(GKResourceRef{gk}).Matches(item) {
+			out = append(out, item)
+		}
+	}
+	return out
+}
+
 // TODO: Extend ResourceRef and PartialResourceRefd to allow GVK matching
 func MatchingAnyGK(in []ResourceType, gks []schema.GroupKind) []ResourceType {
 	var out []ResourceType