From 40fd108fd976c19bc142d10cc52b24d48de37100 Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Mon, 23 Dec 2024 05:00:17 +0000 Subject: [PATCH] Schema updates This PS fixes the schema validation by adding specific schema draft to choose in order to prevent the processor to fall back to use the latest draft that may potentially cause issues. Change-Id: Ic5398f8b1458f435a0dc7bbacbb4859bd933c212 --- images/promenade/Dockerfile.ubuntu_jammy | 2 +- promenade/schemas/ArmadaPlaceholders.yaml | 6 +++--- promenade/schemas/DeckhandPlaceholders.yaml | 12 ++++++------ promenade/schemas/Docker.yaml | 2 +- promenade/schemas/EncryptionPolicy.yaml | 2 +- promenade/schemas/Genesis.yaml | 2 +- promenade/schemas/HostSystem.yaml | 2 +- promenade/schemas/Kubelet.yaml | 2 +- promenade/schemas/KubernetesNetwork.yaml | 2 +- promenade/schemas/KubernetesNode.yaml | 2 +- promenade/schemas/PKICatalog.yaml | 2 +- requirements-direct.txt | 2 +- requirements-frozen.txt | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/images/promenade/Dockerfile.ubuntu_jammy b/images/promenade/Dockerfile.ubuntu_jammy index fc5c82e9..628cfa82 100644 --- a/images/promenade/Dockerfile.ubuntu_jammy +++ b/images/promenade/Dockerfile.ubuntu_jammy @@ -18,7 +18,7 @@ # 429 Too Many Requests - Server message: too many requests: # You have reached your pull rate limit. # You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit -ARG FROM=public.ecr.aws/docker/library/ubuntu:jammy +ARG FROM=quay.io/airshipit/ubuntu:jammy FROM ${FROM} LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \ diff --git a/promenade/schemas/ArmadaPlaceholders.yaml b/promenade/schemas/ArmadaPlaceholders.yaml index a5c6d82a..8b0196c0 100644 --- a/promenade/schemas/ArmadaPlaceholders.yaml +++ b/promenade/schemas/ArmadaPlaceholders.yaml @@ -6,7 +6,7 @@ metadata: labels: application: armada data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# --- schema: deckhand/DataSchema/v1 metadata: @@ -15,7 +15,7 @@ metadata: labels: application: armada data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# --- schema: deckhand/DataSchema/v1 metadata: @@ -24,5 +24,5 @@ metadata: labels: application: armada data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# ... diff --git a/promenade/schemas/DeckhandPlaceholders.yaml b/promenade/schemas/DeckhandPlaceholders.yaml index cdc4008a..766d5003 100644 --- a/promenade/schemas/DeckhandPlaceholders.yaml +++ b/promenade/schemas/DeckhandPlaceholders.yaml @@ -6,7 +6,7 @@ metadata: labels: application: deckhand data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string --- schema: deckhand/DataSchema/v1 @@ -16,7 +16,7 @@ metadata: labels: application: deckhand data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string --- schema: deckhand/DataSchema/v1 @@ -26,7 +26,7 @@ metadata: labels: application: deckhand data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string --- schema: deckhand/DataSchema/v1 @@ -36,7 +36,7 @@ metadata: labels: application: deckhand data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string --- schema: deckhand/DataSchema/v1 @@ -46,7 +46,7 @@ metadata: labels: application: deckhand data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string --- schema: deckhand/DataSchema/v1 @@ -56,6 +56,6 @@ metadata: labels: application: deckhand data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string ... diff --git a/promenade/schemas/Docker.yaml b/promenade/schemas/Docker.yaml index 9f034fe2..fafc5386 100644 --- a/promenade/schemas/Docker.yaml +++ b/promenade/schemas/Docker.yaml @@ -6,7 +6,7 @@ metadata: labels: application: promenade data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: object properties: config: diff --git a/promenade/schemas/EncryptionPolicy.yaml b/promenade/schemas/EncryptionPolicy.yaml index 03569ab3..9fdff2eb 100644 --- a/promenade/schemas/EncryptionPolicy.yaml +++ b/promenade/schemas/EncryptionPolicy.yaml @@ -6,7 +6,7 @@ metadata: labels: application: promenade data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# definitions: script_encryption: diff --git a/promenade/schemas/Genesis.yaml b/promenade/schemas/Genesis.yaml index eccff4db..b04e7737 100644 --- a/promenade/schemas/Genesis.yaml +++ b/promenade/schemas/Genesis.yaml @@ -6,7 +6,7 @@ metadata: labels: application: promenade data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# definitions: abs_path: type: string diff --git a/promenade/schemas/HostSystem.yaml b/promenade/schemas/HostSystem.yaml index 1749d792..2fbe624c 100644 --- a/promenade/schemas/HostSystem.yaml +++ b/promenade/schemas/HostSystem.yaml @@ -6,7 +6,7 @@ metadata: labels: application: promenade data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# definitions: abs_path: type: string diff --git a/promenade/schemas/Kubelet.yaml b/promenade/schemas/Kubelet.yaml index b7a2a6fa..0d9c8e22 100644 --- a/promenade/schemas/Kubelet.yaml +++ b/promenade/schemas/Kubelet.yaml @@ -6,7 +6,7 @@ metadata: labels: application: promenade data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: object definitions: image: diff --git a/promenade/schemas/KubernetesNetwork.yaml b/promenade/schemas/KubernetesNetwork.yaml index 96bce8f4..25d7e6da 100644 --- a/promenade/schemas/KubernetesNetwork.yaml +++ b/promenade/schemas/KubernetesNetwork.yaml @@ -6,7 +6,7 @@ metadata: labels: application: promenade data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# definitions: cidr: type: string diff --git a/promenade/schemas/KubernetesNode.yaml b/promenade/schemas/KubernetesNode.yaml index db09f816..5f54ba0a 100644 --- a/promenade/schemas/KubernetesNode.yaml +++ b/promenade/schemas/KubernetesNode.yaml @@ -6,7 +6,7 @@ metadata: labels: application: promenade data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# definitions: hostname: type: string diff --git a/promenade/schemas/PKICatalog.yaml b/promenade/schemas/PKICatalog.yaml index ae64c54c..6a946a34 100644 --- a/promenade/schemas/PKICatalog.yaml +++ b/promenade/schemas/PKICatalog.yaml @@ -6,7 +6,7 @@ metadata: labels: application: promenade data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# certificate_authorities: type: array items: diff --git a/requirements-direct.txt b/requirements-direct.txt index 5a28f3da..138b8256 100644 --- a/requirements-direct.txt +++ b/requirements-direct.txt @@ -1,4 +1,4 @@ -Deckhand @ git+https://opendev.org/airship/deckhand.git@4d500e48e880ea7f9a3582324c55c61373a855ea#egg=deckhand +Deckhand @ git+https://opendev.org/airship/deckhand.git@211b2d20c080ec806d196f3ec6b0d0472b00fa1b#egg=deckhand Beaker click falcon diff --git a/requirements-frozen.txt b/requirements-frozen.txt index d636065d..2c3fec3a 100644 --- a/requirements-frozen.txt +++ b/requirements-frozen.txt @@ -15,7 +15,7 @@ cliff==4.8.0 cmd2==2.5.8 cryptography==42.0.8 debtcollector==3.0.0 -Deckhand @ git+https://opendev.org/airship/deckhand.git@4d500e48e880ea7f9a3582324c55c61373a855ea +Deckhand @ git+https://opendev.org/airship/deckhand.git@211b2d20c080ec806d196f3ec6b0d0472b00fa1b decorator==5.1.1 deepdiff==8.1.1 dnspython==2.7.0