feat: properly handle CRDs that are type Secret

nicolerenee · nicolerenee · commit 2f28cb10df43 · 2025-09-05T20:01:28.000-05:00
diff --git a/flux_local/git_repo.py b/flux_local/git_repo.py
@@ -520,7 +520,7 @@ async def visit_kustomization(
             if doc.get("kind") == CONFIG_MAP_KIND
         ],
         secrets=[
-            Secret.parse_doc(doc) for doc in cfg_docs if doc.get("kind") == SECRET_KIND
+            Secret.parse_doc(doc) for doc in cfg_docs if doc.get("kind") == SECRET_KIND and doc.get("apiVersion") == "v1"
         ],
     )
 
@@ -709,7 +709,7 @@ async def build_kustomization(
             if doc.get("kind") == CONFIG_MAP_KIND
         ]
         kustomization.secrets = [
-            Secret.parse_doc(doc) for doc in docs if doc.get("kind") == SECRET_KIND
+            Secret.parse_doc(doc) for doc in docs if doc.get("kind") == SECRET_KIND and doc.get("apiVersion") == "v1"
         ]
 
 
diff --git a/flux_local/manifest.py b/flux_local/manifest.py
@@ -1018,7 +1018,7 @@ def parse_raw_obj(obj: dict[str, Any], *, wipe_secrets: bool = True) -> BaseMani
         return OCIRepository.parse_doc(obj)
     if kind == CONFIG_MAP_KIND:
         return ConfigMap.parse_doc(obj)
-    if kind == SECRET_KIND:
+    if kind == SECRET_KIND and api_version == "v1":
         return Secret.parse_doc(obj, wipe_secrets=wipe_secrets)
     return RawObject.parse_doc(obj)
 

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ async def visit_kustomization(`
`520`	`520`	`if doc.get("kind") == CONFIG_MAP_KIND`
`521`	`521`	`],`
`522`	`522`	`secrets=[`
`523`		`- Secret.parse_doc(doc) for doc in cfg_docs if doc.get("kind") == SECRET_KIND`
	`523`	`+ Secret.parse_doc(doc) for doc in cfg_docs if doc.get("kind") == SECRET_KIND and doc.get("apiVersion") == "v1"`
`524`	`524`	`],`
`525`	`525`	`)`
`526`	`526`
`@@ -709,7 +709,7 @@ async def build_kustomization(`
`709`	`709`	`if doc.get("kind") == CONFIG_MAP_KIND`
`710`	`710`	`]`
`711`	`711`	`kustomization.secrets = [`
`712`		`- Secret.parse_doc(doc) for doc in docs if doc.get("kind") == SECRET_KIND`
	`712`	`+ Secret.parse_doc(doc) for doc in docs if doc.get("kind") == SECRET_KIND and doc.get("apiVersion") == "v1"`
`713`	`713`	`]`
`714`	`714`
`715`	`715`