Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pkgs/generators/crd/crd2jsonschema.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,14 @@ def flatten_ref(definition, key, root=True):

# If a definition contains `x-kubernetes-preserve-unknown-fields` without
# any `type` set, we assume the `type` is `object`.
elif (
"type" not in definition
and definition.get("x-kubernetes-preserve-unknown-fields", False)
== True
):
elif "type" not in definition:
if definition.get("x-kubernetes-preserve-unknown-fields", False) == True:
definition["type"] = "object"
return definition

if definition.get("x-kubernetes-int-or-string", False) == True:
definition["type"] = "string"
definition["format"] = "int-or-string"
return definition
# The nix generator doesn't support anyOf
elif "anyOf" in definition:
if definition.get("x-kubernetes-int-or-string", False):
Expand Down