From 0e54ba1a20ee3a5e4c2555bab23d26d05969c801 Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Tue, 29 Mar 2022 14:24:40 -0700 Subject: [PATCH] Slightly fancier way to prevent old values.yaml names from being used --- deploy/supervisor/service.yaml | 17 +++++++++-------- deploy/supervisor/values.yaml | 4 ---- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/deploy/supervisor/service.yaml b/deploy/supervisor/service.yaml index a64ac028..fd6b9623 100644 --- a/deploy/supervisor/service.yaml +++ b/deploy/supervisor/service.yaml @@ -2,19 +2,20 @@ #! SPDX-License-Identifier: Apache-2.0 #@ load("@ytt:data", "data") +#@ load("@ytt:assert", "assert") #@ load("helpers.lib.yaml", "labels", "deploymentPodLabel", "namespace", "defaultResourceName", "defaultResourceNameWithSuffix") -#@ if data.values.service_http_nodeport_port != "removed": -#@ fail("value service_http_nodeport_port has been renamed to deprecated_service_http_nodeport_port and will be removed in a future release") +#@ if hasattr(data.values, "service_http_nodeport_port"): +#@ assert.fail('value "service_http_nodeport_port" has been renamed to "deprecated_service_http_nodeport_port" and will be removed in a future release') #@ end -#@ if data.values.service_http_nodeport_nodeport != "removed": -#@ fail("value service_http_nodeport_nodeport has been renamed to deprecated_service_http_nodeport_nodeport and will be removed in a future release") +#@ if hasattr(data.values, "service_http_nodeport_nodeport"): +#@ assert.fail('value "service_http_nodeport_nodeport" has been renamed to "deprecated_service_http_nodeport_nodeport" and will be removed in a future release') #@ end -#@ if data.values.service_http_loadbalancer_port != "removed": -#@ fail("value service_http_loadbalancer_port has been renamed to deprecated_service_http_loadbalancer_port and will be removed in a future release") +#@ if hasattr(data.values, "service_http_loadbalancer_port"): +#@ assert.fail('value "service_http_loadbalancer_port" has been renamed to "deprecated_service_http_loadbalancer_port" and will be removed in a future release') #@ end -#@ if data.values.service_http_clusterip_port != "removed": -#@ fail("value service_http_clusterip_port has been renamed to deprecated_service_http_clusterip_port and will be removed in a future release") +#@ if hasattr(data.values, "service_http_clusterip_port"): +#@ assert.fail('value "service_http_clusterip_port" has been renamed to "deprecated_service_http_clusterip_port" and will be removed in a future release') #@ end #@ if data.values.deprecated_service_http_nodeport_port or data.values.service_https_nodeport_port: diff --git a/deploy/supervisor/values.yaml b/deploy/supervisor/values.yaml index 6a87dce6..70e30672 100644 --- a/deploy/supervisor/values.yaml +++ b/deploy/supervisor/values.yaml @@ -41,10 +41,6 @@ image_pull_dockerconfigjson: #! e.g. {"auths":{"https://registry.example.com":{" #! Note that all port numbers should be numbers (not strings), i.e. use ytt's `--data-value-yaml` instead of `--data-value`. #! Several of these values have been deprecated and will be removed in a future release. Their names have been changed to #! mark them as deprecated and to make it obvious upon upgrade to anyone who was using them that they have been deprecated. -service_http_nodeport_port: removed #! this value has been deprecated and renamed to deprecated_service_http_nodeport_port; will be removed in a future release -service_http_nodeport_nodeport: removed #! this value has been deprecated and renamed to deprecated_service_http_nodeport_nodeport; will be removed in a future release -service_http_loadbalancer_port: removed #! this value has been deprecated and renamed to deprecated_service_http_loadbalancer_port; will be removed in a future release -service_http_clusterip_port: removed #! this value has been deprecated and renamed to deprecated_service_http_clusterip_port; will be removed in a future release deprecated_service_http_nodeport_port: #! will be removed in a future release; when specified, creates a NodePort Service with this `port` value, with port 8080 as its `targetPort`; e.g. 31234 deprecated_service_http_nodeport_nodeport: #! will be removed in a future release; the `nodePort` value of the NodePort Service, optional when `deprecated_service_http_nodeport_port` is specified; e.g. 31234 deprecated_service_http_loadbalancer_port: #! will be removed in a future release; when specified, creates a LoadBalancer Service with this `port` value, with port 8080 as its `targetPort`; e.g. 8443