488f08dd6e
Add new deprecated_insecure_accept_external_unencrypted_http_requests value in values.yaml. Allow it to be a boolean or a string to make it easier to use (both --data-value and --data-value-yaml will work). Also: - Consider "ip6-localhost" and "ip6-loopback" to be loopback addresses for the validation - Remove unused env.SupervisorHTTPAddress var - Deprecate the `service_http_*` values in values.yaml by renaming them and causing a ytt render error when the old names are used
115 lines
4.0 KiB
YAML
115 lines
4.0 KiB
YAML
#! Copyright 2020-2022 the Pinniped contributors. All Rights Reserved.
|
|
#! SPDX-License-Identifier: Apache-2.0
|
|
|
|
#@ load("@ytt:data", "data")
|
|
#@ 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")
|
|
#@ 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")
|
|
#@ 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")
|
|
#@ 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")
|
|
#@ end
|
|
|
|
#@ if data.values.deprecated_service_http_nodeport_port or data.values.service_https_nodeport_port:
|
|
---
|
|
apiVersion: v1
|
|
kind: Service
|
|
metadata:
|
|
name: #@ defaultResourceNameWithSuffix("nodeport")
|
|
namespace: #@ namespace()
|
|
labels: #@ labels()
|
|
#! prevent kapp from altering the selector of our services to match kubectl behavior
|
|
annotations:
|
|
kapp.k14s.io/disable-default-label-scoping-rules: ""
|
|
spec:
|
|
type: NodePort
|
|
selector: #@ deploymentPodLabel()
|
|
ports:
|
|
#@ if data.values.deprecated_service_http_nodeport_port:
|
|
- name: http
|
|
protocol: TCP
|
|
port: #@ data.values.deprecated_service_http_nodeport_port
|
|
targetPort: 8080
|
|
#@ if data.values.deprecated_service_http_nodeport_nodeport:
|
|
nodePort: #@ data.values.deprecated_service_http_nodeport_nodeport
|
|
#@ end
|
|
#@ end
|
|
#@ if data.values.service_https_nodeport_port:
|
|
- name: https
|
|
protocol: TCP
|
|
port: #@ data.values.service_https_nodeport_port
|
|
targetPort: 8443
|
|
#@ if data.values.service_https_nodeport_nodeport:
|
|
nodePort: #@ data.values.service_https_nodeport_nodeport
|
|
#@ end
|
|
#@ end
|
|
#@ end
|
|
|
|
#@ if data.values.deprecated_service_http_clusterip_port or data.values.service_https_clusterip_port:
|
|
---
|
|
apiVersion: v1
|
|
kind: Service
|
|
metadata:
|
|
name: #@ defaultResourceNameWithSuffix("clusterip")
|
|
namespace: #@ namespace()
|
|
labels: #@ labels()
|
|
#! prevent kapp from altering the selector of our services to match kubectl behavior
|
|
annotations:
|
|
kapp.k14s.io/disable-default-label-scoping-rules: ""
|
|
spec:
|
|
type: ClusterIP
|
|
selector: #@ deploymentPodLabel()
|
|
ports:
|
|
#@ if data.values.deprecated_service_http_clusterip_port:
|
|
- name: http
|
|
protocol: TCP
|
|
port: #@ data.values.deprecated_service_http_clusterip_port
|
|
targetPort: 8080
|
|
#@ end
|
|
#@ if data.values.service_https_clusterip_port:
|
|
- name: https
|
|
protocol: TCP
|
|
port: #@ data.values.service_https_clusterip_port
|
|
targetPort: 8443
|
|
#@ end
|
|
#@ end
|
|
|
|
#@ if data.values.deprecated_service_http_loadbalancer_port or data.values.service_https_loadbalancer_port:
|
|
---
|
|
apiVersion: v1
|
|
kind: Service
|
|
metadata:
|
|
name: #@ defaultResourceNameWithSuffix("loadbalancer")
|
|
namespace: #@ namespace()
|
|
labels: #@ labels()
|
|
#! prevent kapp from altering the selector of our services to match kubectl behavior
|
|
annotations:
|
|
kapp.k14s.io/disable-default-label-scoping-rules: ""
|
|
spec:
|
|
type: LoadBalancer
|
|
selector: #@ deploymentPodLabel()
|
|
#@ if data.values.service_loadbalancer_ip:
|
|
loadBalancerIP: #@ data.values.service_loadbalancer_ip
|
|
#@ end
|
|
ports:
|
|
#@ if data.values.deprecated_service_http_loadbalancer_port:
|
|
- name: http
|
|
protocol: TCP
|
|
port: #@ data.values.deprecated_service_http_loadbalancer_port
|
|
targetPort: 8080
|
|
#@ end
|
|
#@ if data.values.service_https_loadbalancer_port:
|
|
- name: https
|
|
protocol: TCP
|
|
port: #@ data.values.service_https_loadbalancer_port
|
|
targetPort: 8443
|
|
#@ end
|
|
#@ end
|