Skip to content

Commit b860d26

Browse files
committed
Add ci jsonschema patch for ssh-authorized-keys
Signed-off-by: Anders F Björklund <[email protected]>
1 parent 2d45b03 commit b860d26

File tree

3 files changed

+44
-0
lines changed

3 files changed

+44
-0
lines changed

pkg/cidata/schemas/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ all: versions.schema.cloud-config.json schema-cloud-config-v1.json
55

66
%.json:
77
curl -fsSLO https://raw.githubusercontent.com/canonical/cloud-init/$(CLOUD_INIT_VERSION)/cloudinit/config/schemas/$@
8+
if [ "$@" = "schema-cloud-config-v1.json" ]; then patch -N $@ ssh-authorized-keys.patch; fi

pkg/cidata/schemas/schema-cloud-config-v1.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,22 @@
361361
},
362362
"minItems": 1
363363
},
364+
"ssh-authorized-keys": {
365+
"allOf": [
366+
{
367+
"type": "array",
368+
"items": {
369+
"type": "string"
370+
},
371+
"minItems": 1
372+
},
373+
{
374+
"deprecated": true,
375+
"deprecated_version": "18.3",
376+
"deprecated_description": "Use ``ssh_authorized_keys`` instead."
377+
}
378+
]
379+
},
364380
"ssh_import_id": {
365381
"description": "List of ssh ids to import for user. Can not be combined with ``ssh_redirect_user``. See the man page[1] for more details. [1] https://manpages.ubuntu.com/manpages/noble/en/man1/ssh-import-id.1.html",
366382
"type": "array",
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
diff --git a/cloudinit/config/schemas/schema-cloud-config-v1.json b/cloudinit/config/schemas/schema-cloud-config-v1.json
2+
index ff61dcaa6..73e54ebaf 100644
3+
--- a/cloudinit/config/schemas/schema-cloud-config-v1.json
4+
+++ b/cloudinit/config/schemas/schema-cloud-config-v1.json
5+
@@ -361,6 +361,22 @@
6+
},
7+
"minItems": 1
8+
},
9+
+ "ssh-authorized-keys": {
10+
+ "allOf": [
11+
+ {
12+
+ "type": "array",
13+
+ "items": {
14+
+ "type": "string"
15+
+ },
16+
+ "minItems": 1
17+
+ },
18+
+ {
19+
+ "deprecated": true,
20+
+ "deprecated_version": "18.3",
21+
+ "deprecated_description": "Use ``ssh_authorized_keys`` instead."
22+
+ }
23+
+ ]
24+
+ },
25+
"ssh_import_id": {
26+
"description": "List of ssh ids to import for user. Can not be combined with ``ssh_redirect_user``. See the man page[1] for more details. [1] https://manpages.ubuntu.com/manpages/noble/en/man1/ssh-import-id.1.html",
27+
"type": "array",

0 commit comments

Comments
 (0)