From 5bcff5a6518afbbe88ac44d299c0a8a121d1ac7a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Petersen" Date: Wed, 11 Oct 2023 16:06:59 -0400 Subject: [PATCH] update schema from values.yml schema change --- deploy_carvel/concierge/schema-openapi.yaml | 22 ++------------------ deploy_carvel/supervisor/schema-openapi.yaml | 22 ++------------------ 2 files changed, 4 insertions(+), 40 deletions(-) diff --git a/deploy_carvel/concierge/schema-openapi.yaml b/deploy_carvel/concierge/schema-openapi.yaml index 9f18a393..881eee99 100644 --- a/deploy_carvel/concierge/schema-openapi.yaml +++ b/deploy_carvel/concierge/schema-openapi.yaml @@ -49,28 +49,10 @@ components: description: Optionally specify a different image for the 'kube-cert-agent' pod which is scheduled on the control plane. This image needs only to include `sleep` and `cat` binaries. By default, the same image specified for image_repo/image_digest/image_tag will be re-used. default: null image_pull_dockerconfigjson: - type: object - additionalProperties: false + type: string nullable: true description: 'Specifies a secret to be used when pulling the above `image_repo` container image. Can be used when the above image_repo is a private registry. Typically the value would be the output of: kubectl create secret docker-registry x --docker-server=https://example.io --docker-username=''USERNAME'' --docker-password=''PASSWORD'' --dry-run=client -o json | jq -r ''.data[''.dockerconfigjson'']'' Optional.' - properties: - auths: - type: object - additionalProperties: false - properties: - https://registry.example.com: - type: object - additionalProperties: false - properties: - username: - type: string - default: USERNAME - password: - type: string - default: PASSWORD - auth: - type: string - default: BASE64_ENCODED_USERNAME_COLON_PASSWORD + default: null discovery_url: type: string nullable: true diff --git a/deploy_carvel/supervisor/schema-openapi.yaml b/deploy_carvel/supervisor/schema-openapi.yaml index 0e0903fa..77aa80ba 100644 --- a/deploy_carvel/supervisor/schema-openapi.yaml +++ b/deploy_carvel/supervisor/schema-openapi.yaml @@ -44,28 +44,10 @@ components: description: Specify either an image_digest or an image_tag. If both are given, only image_digest will be used. default: latest image_pull_dockerconfigjson: - type: object - additionalProperties: false + type: string nullable: true description: 'Specifies a secret to be used when pulling the above `image_repo` container image. Can be used when the above image_repo is a private registry. Typically the value would be the output of: kubectl create secret docker-registry x --docker-server=https://example.io --docker-username=''USERNAME'' --docker-password=''PASSWORD'' --dry-run=client -o json | jq -r ''.data[''.dockerconfigjson'']'' Optional.' - properties: - auths: - type: object - additionalProperties: false - properties: - https://registry.example.com: - type: object - additionalProperties: false - properties: - username: - type: string - default: USERNAME - password: - type: string - default: PASSWORD - auth: - type: string - default: BASE64_ENCODED_USERNAME_COLON_PASSWORD + default: null deprecated_service_http_nodeport_port: type: integer nullable: true