[sdk/python] Handle CRDs with status field input (#2183)

Although .status is an output-only field for CRDs, this is a frequent occurrence in real-world manifests. Manually delete the status field in the YAML handler to avoid an error on deserialization.
pulumi · Sep 21, 2022 · bb1c93d · bb1c93d
1 parent e0e2db6
commit bb1c93d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Unreleased
+
 - Fix Helm Chart preview with unconfigured provider (C#) (https://github.com/pulumi/pulumi-kubernetes/issues/2162)
+- [sdk/python] Handle CRDs with status field input (https://github.com/pulumi/pulumi-kubernetes/issues/2183)
 
 ## 3.21.2 (September 1, 2022)
 

diff --git a/provider/cmd/pulumi-gen-kubernetes/main.go b/provider/cmd/pulumi-gen-kubernetes/main.go
@@ -245,6 +245,9 @@ func writePythonClient(pkg *schema.Package, outdir string, templateDir string) {
 		if resourcesToFilterFromTemplate.Has(tok) {
 			continue
 		}
+		if resource.Name == "CustomResourceDefinition" { // Use manual overlay in yaml.tmpl
+			continue
+		}
 		if strings.HasSuffix(resource.Name, "Patch") {
 			continue
 		}

diff --git a/provider/pkg/gen/python-templates/yaml/yaml.tmpl b/provider/pkg/gen/python-templates/yaml/yaml.tmpl
@@ -499,6 +499,20 @@ def _parse_yaml_object(
             lambda x: (f"{{.GVK}}:{x}",
                        {{.Name}}(f"{x}", opts, **obj)))]
 {{- end}}
+    if gvk == "apiextensions.k8s.io/v1/CustomResourceDefinition":
+        # Import locally to avoid name collisions.
+        from pulumi_kubernetes.apiextensions.v1 import CustomResourceDefinition
+        obj.pop("status", None) # Delete output-only status field to avoid errors.
+        return [identifier.apply(
+            lambda x: (f"apiextensions.k8s.io/v1/CustomResourceDefinition:{x}",
+                       CustomResourceDefinition(f"{x}", opts, **obj)))]
+    if gvk == "apiextensions.k8s.io/v1beta1/CustomResourceDefinition":
+        # Import locally to avoid name collisions.
+        from pulumi_kubernetes.apiextensions.v1beta1 import CustomResourceDefinition
+        obj.pop("status", None) # Delete output-only status field to avoid errors.
+        return [identifier.apply(
+            lambda x: (f"apiextensions.k8s.io/v1beta1/CustomResourceDefinition:{x}",
+                       CustomResourceDefinition(f"{x}", opts, **obj)))]
     return [identifier.apply(
         lambda x: (f"{gvk}:{x}",
                    CustomResource(f"{x}", api_version, kind, spec, metadata, opts)))]
diff --git a/sdk/python/pulumi_kubernetes/yaml/yaml.py b/sdk/python/pulumi_kubernetes/yaml/yaml.py
@@ -539,24 +539,12 @@ def _parse_yaml_object(
         return [identifier.apply(
             lambda x: (f"admissionregistration.k8s.io/v1beta1/ValidatingWebhookConfigurationList:{x}",
                        ValidatingWebhookConfigurationList(f"{x}", opts, **obj)))]
-    if gvk == "apiextensions.k8s.io/v1/CustomResourceDefinition":
-        # Import locally to avoid name collisions.
-        from pulumi_kubernetes.apiextensions.v1 import CustomResourceDefinition
-        return [identifier.apply(
-            lambda x: (f"apiextensions.k8s.io/v1/CustomResourceDefinition:{x}",
-                       CustomResourceDefinition(f"{x}", opts, **obj)))]
     if gvk == "apiextensions.k8s.io/v1/CustomResourceDefinitionList":
         # Import locally to avoid name collisions.
         from pulumi_kubernetes.apiextensions.v1 import CustomResourceDefinitionList
         return [identifier.apply(
             lambda x: (f"apiextensions.k8s.io/v1/CustomResourceDefinitionList:{x}",
                        CustomResourceDefinitionList(f"{x}", opts, **obj)))]
-    if gvk == "apiextensions.k8s.io/v1beta1/CustomResourceDefinition":
-        # Import locally to avoid name collisions.
-        from pulumi_kubernetes.apiextensions.v1beta1 import CustomResourceDefinition
-        return [identifier.apply(
-            lambda x: (f"apiextensions.k8s.io/v1beta1/CustomResourceDefinition:{x}",
-                       CustomResourceDefinition(f"{x}", opts, **obj)))]
     if gvk == "apiextensions.k8s.io/v1beta1/CustomResourceDefinitionList":
         # Import locally to avoid name collisions.
         from pulumi_kubernetes.apiextensions.v1beta1 import CustomResourceDefinitionList
@@ -1817,6 +1805,20 @@ def _parse_yaml_object(
         return [identifier.apply(
             lambda x: (f"storage.k8s.io/v1beta1/VolumeAttachmentList:{x}",
                        VolumeAttachmentList(f"{x}", opts, **obj)))]
+    if gvk == "apiextensions.k8s.io/v1/CustomResourceDefinition":
+        # Import locally to avoid name collisions.
+        from pulumi_kubernetes.apiextensions.v1 import CustomResourceDefinition
+        obj.pop("status", None) # Delete output-only status field to avoid errors.
+        return [identifier.apply(
+            lambda x: (f"apiextensions.k8s.io/v1/CustomResourceDefinition:{x}",
+                       CustomResourceDefinition(f"{x}", opts, **obj)))]
+    if gvk == "apiextensions.k8s.io/v1beta1/CustomResourceDefinition":
+        # Import locally to avoid name collisions.
+        from pulumi_kubernetes.apiextensions.v1beta1 import CustomResourceDefinition
+        obj.pop("status", None) # Delete output-only status field to avoid errors.
+        return [identifier.apply(
+            lambda x: (f"apiextensions.k8s.io/v1beta1/CustomResourceDefinition:{x}",
+                       CustomResourceDefinition(f"{x}", opts, **obj)))]
     return [identifier.apply(
         lambda x: (f"{gvk}:{x}",
                    CustomResource(f"{x}", api_version, kind, spec, metadata, opts)))]