From c8ec432eefbbdb5f69332425349918e4fa6e189c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Petersen" Date: Thu, 24 Aug 2023 14:54:23 -0400 Subject: [PATCH] add package_image to values.yaml files (sibling to image) --- deploy_carvel/concierge/config/values.yaml | 11 +++++++++++ deploy_carvel/supervisor/config/values.yaml | 13 +++++++++++++ 2 files changed, 24 insertions(+) diff --git a/deploy_carvel/concierge/config/values.yaml b/deploy_carvel/concierge/config/values.yaml index 695080eb..57f315e7 100644 --- a/deploy_carvel/concierge/config/values.yaml +++ b/deploy_carvel/concierge/config/values.yaml @@ -35,6 +35,17 @@ image_digest: sha256:f3c4fdfd3ef865d4b97a1fd295d94acc3f0c654c46b6f27ffad5cf80216 #@schema/desc "Specify either an image_digest or an image_tag. If both are given, only image_digest will be used." image_tag: latest +#! TODO: preserve even if this file is revised! +#@schema/nullable +package_image_repo: docker.io/benjaminapetersen/some-pinniped-concierge-package +#@schema/nullable +package_image_digest: sha256:123456 +#@schema/nullable +package_image_tag: latest +#! prob should not be nullable +#@schema/nullable +package_version: 1.2.3 + #@schema/desc '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.' kube_cert_agent_image: projects.registry.vmware.com/pinniped/pinniped-server diff --git a/deploy_carvel/supervisor/config/values.yaml b/deploy_carvel/supervisor/config/values.yaml index f829083e..2b76e296 100644 --- a/deploy_carvel/supervisor/config/values.yaml +++ b/deploy_carvel/supervisor/config/values.yaml @@ -27,13 +27,26 @@ 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! +#@schema/nullable +package_image_repo: docker.io/benjaminapetersen/some-pinniped-supervisor-package +#@schema/nullable +package_image_digest: sha256:123456 +#@schema/nullable +package_image_tag: latest +#! prob should not be nullable +#@schema/nullable +package_version: 1.2.3 + #! 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"]'