Skip to content

Commit

Permalink
Add Butane 1.6.0 support + fix 1.5.0 missing property
Browse files Browse the repository at this point in the history
  • Loading branch information
Nemric committed Dec 5, 2024
1 parent 8efc146 commit 25beb34
Show file tree
Hide file tree
Showing 8 changed files with 1,525 additions and 8 deletions.
18 changes: 16 additions & 2 deletions Butane-Schema-dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"$id": "#/properties/version",
"type": "string",
"title": "version (string):",
"enum": ["1.4.0", "1.5.0"],
"default": "1.5.0"
"enum": ["1.4.0", "1.5.0", "1.6.0"],
"default": "1.6.0"
}
},
"oneOf": [
Expand Down Expand Up @@ -51,6 +51,20 @@
"$ref": "./v1.5.0/butane-v1.5.0.json"
}
]
},
{
"allOf": [
{
"properties": {
"version": {
"const": "1.6.0"
}
}
},
{
"$ref": "./v1.6.0/butane-v1.6.0.json"
}
]
}
]
}
18 changes: 16 additions & 2 deletions Butane-Schema-main.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"$id": "#/properties/version",
"type": "string",
"title": "version (string):",
"enum": ["1.4.0", "1.5.0"],
"default": "1.5.0"
"enum": ["1.4.0", "1.5.0", "1.6.0"],
"default": "1.6.0"
}
},
"oneOf": [
Expand Down Expand Up @@ -51,6 +51,20 @@
"$ref": "https://raw.githubusercontent.com/Relativ-IT/Butane-Schemas/main/v1.5.0/butane-v1.5.0.json"
}
]
},
{
"allOf": [
{
"properties": {
"version": {
"const": "1.6.0"
}
}
},
{
"$ref": "https://raw.githubusercontent.com/Relativ-IT/Butane-Schemas/main/v1.6.0/butane-v1.6.0.json"
}
]
}
]
}
18 changes: 16 additions & 2 deletions Butane-Schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"$id": "#/properties/version",
"type": "string",
"title": "version (string):",
"enum": ["1.4.0", "1.5.0"],
"default": "1.5.0"
"enum": ["1.4.0", "1.5.0", "1.6.0"],
"default": "1.6.0"
}
},
"oneOf": [
Expand Down Expand Up @@ -51,6 +51,20 @@
"$ref": "https://raw.githubusercontent.com/Relativ-IT/Butane-Schemas/Release/v1.5.0/butane-v1.5.0.json"
}
]
},
{
"allOf": [
{
"properties": {
"version": {
"const": "1.6.0"
}
}
},
{
"$ref": "https://raw.githubusercontent.com/Relativ-IT/Butane-Schemas/Release/v1.6.0/butane-v1.6.0.json"
}
]
}
]
}
3 changes: 2 additions & 1 deletion v1.4.0/butane-v1.4.0.json
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,8 @@
"type": "string",
"title": "layout (string):",
"description": "The disk layout of the target OS image. Supported values are aarch64, ppc64le, and x86_64. Defaults to x86_64.",
"enum": ["aarch64","ppc64le","x86_64"]
"enum": ["aarch64","ppc64le","x86_64"],
"default": "x86_64"
},
"luks": {
"$id": "#/properties/boot_device/luks",
Expand Down
8 changes: 7 additions & 1 deletion v1.5.0/butane-v1.5.0.json
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,8 @@
"type": "string",
"title": "layout (string):",
"description": "The disk layout of the target OS image. Supported values are aarch64, ppc64le, and x86_64. Defaults to x86_64.",
"enum": ["aarch64","ppc64le","x86_64"]
"enum": ["aarch64","ppc64le","x86_64"],
"default": "x86_64"
},
"luks": {
"$id": "#/properties/boot_device/luks",
Expand All @@ -1122,6 +1123,11 @@
"type": "integer",
"title": "threshold (integer):",
"description": "Sets the minimum number of pieces required to decrypt the device. Default is 1."
},
"discard": {
"type": "boolean",
"title": "discard (boolean):",
"description": "Whether to issue discard commands to the underlying block device when blocks are freed. Enabling this improves performance and device longevity on SSDs and space utilization on thinly provisioned SAN devices, but leaks information about which disk blocks contain data. If omitted, it defaults to false."
}
}
},
Expand Down
1 change: 1 addition & 0 deletions v1.5.0/testconfig.bu
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ boot_device:
luks:
tpm2: true
threshold: 0
discard: false
tang:
- url: http://url.com
advertisement: be carefull
Expand Down
Loading

0 comments on commit 25beb34

Please sign in to comment.