refactor carvel packaing scripts

2026-09-27 18:34:40 +00:00 · 2023-11-08 13:10:19 -08:00
parent e10d21d678
commit 07e9c5bd93
27 changed files with 125 additions and 209 deletions
@@ -1,9 +1,9 @@
-#! Copyright 2020-2021 the Pinniped contributors. All Rights Reserved.
+#! Copyright 2020-2023 the Pinniped contributors. All Rights Reserved.
 #! SPDX-License-Identifier: Apache-2.0

 #@data/values-schema
 ---
-#@schema/desc "Name of pinniped-concierge."
+#@schema/desc "Used to help determine the names of various resources and labels."
 app_name: pinniped-concierge

 #@schema/desc "Creates a new namespace statically in yaml with the given name and installs the app into that namespace."
@@ -57,13 +57,14 @@ image_pull_dockerconfigjson: "eyJhdXRocyI6eyJodHRwczovL2V4YW1wbGUuaW8iOnsidXNlcm
 #@schema/nullable
 discovery_url: https://example.com

-
 #@ api_serving_certificate_desc = "Specify the duration and renewal interval for the API serving certificate. \
 #@ The defaults are set to expire the cert about every 30 days, and to rotate it \
-#@ about every 25 days."
+#@ about every 25 days. Specify this as an integer or as a string which contains an integer value."
 #@schema/desc api_serving_certificate_desc
+#@schema/type any=True
 api_serving_certificate_duration_seconds: 2592000
 #@schema/desc api_serving_certificate_desc
+#@schema/type any=True
 api_serving_certificate_renew_before_seconds: 2160000

 #! Specify the verbosity of logging: info ("nice to know" information), debug (developer information), trace (timing information),
@@ -90,7 +91,6 @@ run_as_group: 65532
 #@schema/desc api_group_suffix_desc
 api_group_suffix: pinniped.dev

-
 #@schema/desc "Customize CredentialIssuer.spec.impersonationProxy to change how the concierge handles impersonation."
 impersonation_proxy_spec:
  #! options are "auto", "disabled" or "enabled".
@@ -117,10 +117,8 @@ impersonation_proxy_spec:
    #! None does not provision either and assumes that you have set the external_endpoint
    #! and set up your own ingress to connect to the impersonation proxy.
    #@schema/desc "Options are 'LoadBalancer', 'ClusterIP' and 'None'."
-    #@schema/nullable
    type: LoadBalancer
    #@schema/desc "The annotations that should be set on the ClusterIP or LoadBalancer Service."
-    #@schema/nullable
    annotations:
      {service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "4000"}
    #@schema/desc "When mode LoadBalancer is set, this will set the LoadBalancer Service's Spec.LoadBalancerIP."
@@ -3,7 +3,6 @@

 #@data/values-schema
 ---
-
 #@schema/desc "Specify either an image_digest or an image_tag. If both are given, only image_digest will be used."
 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."
@@ -1,9 +1,9 @@
-#! Copyright 2020-2022 the Pinniped contributors. All Rights Reserved.
+#! Copyright 2020-2023 the Pinniped contributors. All Rights Reserved.
 #! SPDX-License-Identifier: Apache-2.0

 #@data/values-schema
 ---
-#@schema/desc "Name of pinniped-supervisor."
+#@schema/desc "Used to help determine the names of various resources and labels."
 app_name: pinniped-supervisor

 #@schema/desc "Creates a new namespace statically in yaml with the given name and installs the app into that namespace."
@@ -18,9 +18,9 @@ into_namespace: my-preexisting-namespace
 #@ by controllers at runtime will be labelled with `app: $app_name` and also with the labels \
 #@ specified here. The value of `custom_labels` must be a map of string keys to string values. \
 #@ The app can be uninstalled either by: \
-#@ 1. Deleting the static install-time yaml resources including the static namespace, which will cascade and also delete \
-#@    resources that were dynamically created by controllers at runtime \
-#@ 2. Or, deleting all resources by label, which does not assume that there was a static install-time yaml namespace."
+#@ 1.) deleting the static install-time yaml resources including the static namespace, which will cascade and also delete \
+#@ resources that were dynamically created by controllers at runtime, \
+#@ or, 2.) deleting all resources by label, which does not assume that there was a static install-time yaml namespace."
 #@schema/desc custom_labels_desc
 #@schema/type any=True
 custom_labels: {} #! {myCustomLabelName: myCustomLabelValue, otherCustomLabelName: otherCustomLabelValue}
@@ -61,19 +61,19 @@ deprecated_service_http_nodeport_nodeport: 31234
 #@schema/desc "will be removed in a future release; when specified, creates a LoadBalancer Service with this `port` value, with port 8080 as its `targetPort`"
 #@schema/nullable
 deprecated_service_http_loadbalancer_port: 8443
-#@schema/desc "#! will be removed in a future release; when specified, creates a ClusterIP Service with this `port` value, with port 8080 as its `targetPort`"
+#@schema/desc "will be removed in a future release; when specified, creates a ClusterIP Service with this `port` value, with port 8080 as its `targetPort`"
 #@schema/nullable
 deprecated_service_http_clusterip_port: 8443
-#@schema/desc "#! when specified, creates a NodePort Service with this `port` value, with port 8443 as its `targetPort`"
+#@schema/desc "when specified, creates a NodePort Service with this `port` value, with port 8443 as its `targetPort`"
 #@schema/nullable
 service_https_nodeport_port: 31243
-#@schema/desc "#! the `nodePort` value of the NodePort Service, optional when `service_https_nodeport_port` is specified"
+#@schema/desc "the `nodePort` value of the NodePort Service, optional when `service_https_nodeport_port` is specified"
 #@schema/nullable
 service_https_nodeport_nodeport: 31243
-#@schema/desc "#! when specified, creates a LoadBalancer Service with this `port` value, with port 8443 as its `targetPort`"
+#@schema/desc "when specified, creates a LoadBalancer Service with this `port` value, with port 8443 as its `targetPort`"
 #@schema/nullable
 service_https_loadbalancer_port: 8443
-#@schema/desc "#! when specified, creates a ClusterIP Service with this `port` value, with port 8443 as its `targetPort`"
+#@schema/desc "when specified, creates a ClusterIP Service with this `port` value, with port 8443 as its `targetPort`"
 #@schema/nullable
 service_https_clusterip_port: 8443
 #@ service_loadbalancer_ip_desc="The `loadBalancerIP` value of the LoadBalancer Service. \
@@ -94,9 +94,9 @@ log_level: info
 #@schema/nullable
 deprecated_log_format: json

-#@schema/desc "run_as_user specifies the user ID that will own the process, see the Dockerfile for the reasoning behind this choice"
+#@schema/desc "specifies the user ID that will own the process, see the Dockerfile for the reasoning behind this choice"
 run_as_user: 65532
-#@schema/desc "run_as_group specifies the group ID that will own the process, see the Dockerfile for the reasoning behind this choice"
+#@schema/desc "specifies the group ID that will own the process, see the Dockerfile for the reasoning behind this choice"
 run_as_group: 65532

 #@ api_group_suffix_desc = "Specify the API group suffix for all Pinniped API groups. By default, this is set to \
@@ -114,8 +114,8 @@ api_group_suffix: pinniped.dev
 #@schema/desc https_proxy_desc
 #@schema/nullable
 https_proxy: http://proxy.example.com
-#@schema/desc "do not proxy Kubernetes endpoints"
-no_proxy: "$(KUBERNETES_SERVICE_HOST),169.254.169.254,127.0.0.1,localhost,.svc,.cluster.local"
+#@schema/desc "Endpoints that should not use the proxy."
+no_proxy: "$(KUBERNETES_SERVICE_HOST),169.254.169.254,127.0.0.1,localhost,.svc,.cluster.local" #! do not proxy Kubernetes endpoints

 #! Control the HTTP and HTTPS listeners of the Supervisor.
 #!