From c82b14179ac5f13e0a6ffb12ebc104ca2641fff5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Petersen" Date: Tue, 29 Aug 2023 12:46:17 -0400 Subject: [PATCH] supervisor values & schema update --- deploy_carvel/supervisor/config/values.yaml | 2 -- deploy_carvel/supervisor/schema-openapi.yml | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/deploy_carvel/supervisor/config/values.yaml b/deploy_carvel/supervisor/config/values.yaml index 2b76e296..686a4144 100644 --- a/deploy_carvel/supervisor/config/values.yaml +++ b/deploy_carvel/supervisor/config/values.yaml @@ -27,13 +27,11 @@ custom_labels: {} #! e.g. {myCustomLabelName: myCustomLabelValue, otherCustomLab replicas: 2 #@schema/desc "Specify either an image_digest or an image_tag. If both are given, only image_digest will be used." -#@schema/nullable image_repo: projects.registry.vmware.com/pinniped/pinniped-server #@schema/desc "Specify either an image_digest or an image_tag. If both are given, only image_digest will be used." #@schema/nullable image_digest: sha256:f3c4fdfd3ef865d4b97a1fd295d94acc3f0c654c46b6f27ffad5cf80216903c8 #@schema/desc "Specify either an image_digest or an image_tag. If both are given, only image_digest will be used." -#@schema/nullable image_tag: latest #! TODO: preserve even if this file is revised! diff --git a/deploy_carvel/supervisor/schema-openapi.yml b/deploy_carvel/supervisor/schema-openapi.yml index de4ded57..bb60a2b3 100644 --- a/deploy_carvel/supervisor/schema-openapi.yml +++ b/deploy_carvel/supervisor/schema-openapi.yml @@ -33,9 +33,8 @@ components: default: 2 image_repo: type: string - nullable: true description: Specify either an image_digest or an image_tag. If both are given, only image_digest will be used. - default: null + default: projects.registry.vmware.com/pinniped/pinniped-server image_digest: type: string nullable: true @@ -43,9 +42,8 @@ components: default: null image_tag: type: string - nullable: true description: Specify either an image_digest or an image_tag. If both are given, only image_digest will be used. - default: null + default: latest package_image_repo: type: string nullable: true