Merge pull request #30 from zaninime/allow-int-string

Handle a specific case of anyOf
arnarg · Jan 4, 2025 · a6fd2eb · a6fd2eb
2 parents 18219e7 + 76333f5
commit a6fd2eb
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/pkgs/generators/crd2jsonschema.py b/pkgs/generators/crd2jsonschema.py
@@ -65,9 +65,13 @@ def flatten_ref(definition, key, root=True):
             if 'type' in definition and definition['type'] == 'object':
                 if not 'properties' in definition:
                     if 'additionalProperties' in definition:
-                        # The nix generator doesn't support anyOf
                         if 'anyOf' in definition['additionalProperties']:
-                            definition['additionalProperties'] = definition['additionalProperties']['anyOf'][0]
+                            if definition['additionalProperties'].get('x-kubernetes-int-or-string', False):
+                                # Patch the definition based on the custom x-kubernetes-int-or-string
+                                definition['additionalProperties'] = { 'type': 'string', 'format': 'int-or-string' }
+                            else:
+                                # The nix generator doesn't support anyOf
+                                definition['additionalProperties'] = definition['additionalProperties']['anyOf'][0]
 
                         # If additionalProperties only contains 'x-kubernetes-preserve-unknown-fields'
                         # we can just drop the `additionalProperties` entirely and the generator