djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Specify the supervisor NodePort Service's port and nodePort separately

Browse Source 
When using kind we forward the node's port to the host, so we only
really care about the `nodePort` value. For acceptance clusters,
we put an Ingress in front of a NodePort Service, so we only really
care about the `port` value.
This commit is contained in:
Ryan Richard 2020-10-22 15:37:35 -07:00
parent 8ae04605ca
commit 397ec61e57
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deploy/supervisor/service.yaml
View File

@ -18,9 +18,11 @@ spec:
app: #@ data.values.app_name app: #@ data.values.app_name
ports: ports:
- protocol: TCP - protocol: TCP
port: 80 port: #@ data.values.service_nodeport_port
targetPort: 80 targetPort: 80
nodePort: #@ data.values.service_nodeport_port #@ if data.values.service_nodeport_nodeport:
nodePort: #@ data.values.service_nodeport_nodeport
#@ end
#@ end #@ end
#@ if data.values.service_clusterip_port: #@ if data.values.service_clusterip_port:

7
deploy/supervisor/values.yaml
View File

@ -38,6 +38,7 @@ image_pull_dockerconfigjson: #! e.g. {"auths":{"https://registry.example.com":{"
#! Specify how to expose the Supervisor app as a Service. #! Specify how to expose the Supervisor app as a Service.
#! Typically you would set a value for only one of the following. #! Typically you would set a value for only one of the following.
#! Setting any of these values means that a Service of that type will be created. #! Setting any of these values means that a Service of that type will be created.
service_nodeport_port: #! e.g. 31234 service_nodeport_port: #! when specified, creates a NodePort Service with this `port` value, e.g. 31234
service_loadbalancer_port: #! e.g. 443 service_nodeport_nodeport: #! the `nodePort` value of the NodePort Service, optional when `service_nodeport_port` is specified, e.g. 31234
service_clusterip_port: #! e.g. 443 service_loadbalancer_port: #! when specified, creates a LoadBalancer Service with this `port` value, e.g. 443
service_clusterip_port: #! when specified, creates a ClusterIP Service with this `port` value, e.g. 443

3
hack/lib/tilt/Tiltfile
View File

@ -96,7 +96,8 @@ k8s_yaml(local([
'--data-value', 'image_repo=image/supervisor', '--data-value', 'image_repo=image/supervisor',
'--data-value', 'image_tag=tilt-dev', '--data-value', 'image_tag=tilt-dev',
'--data-value-yaml', 'replicas=1', '--data-value-yaml', 'replicas=1',
'--data-value-yaml', 'service_nodeport_port=31234', '--data-value-yaml', 'service_nodeport_port=80',
'--data-value-yaml', 'service_nodeport_nodeport=31234',
'--data-value-yaml', 'custom_labels={mySupervisorCustomLabelName: mySupervisorCustomLabelValue}', '--data-value-yaml', 'custom_labels={mySupervisorCustomLabelName: mySupervisorCustomLabelValue}',
])) ]))
# Tell tilt to watch all of those files for changes. # Tell tilt to watch all of those files for changes.

3
hack/prepare-for-integration-tests.sh
View File

@ -224,7 +224,8 @@ if ! tilt_mode; then
--data-value "image_repo=$registry_repo" \ --data-value "image_repo=$registry_repo" \
--data-value "image_tag=$tag" \ --data-value "image_tag=$tag" \
--data-value-yaml "custom_labels=$supervisor_custom_labels" \ --data-value-yaml "custom_labels=$supervisor_custom_labels" \
--data-value-yaml 'service_nodeport_port=31234' >"$manifest" --data-value-yaml 'service_nodeport_port=80' \
--data-value-yaml 'service_nodeport_nodeport=31234' >"$manifest"
kapp deploy --yes --app "$supervisor_app_name" --diff-changes --file "$manifest" kapp deploy --yes --app "$supervisor_app_name" --diff-changes --file "$manifest"