Specify the supervisor NodePort Service's port and nodePort separately

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

View File

@@ -96,7 +96,8 @@ k8s_yaml(local([
'--data-value', 'image_repo=image/supervisor',
'--data-value', 'image_tag=tilt-dev',
'--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}',
]))
# Tell tilt to watch all of those files for changes.

View File

@@ -224,7 +224,8 @@ if ! tilt_mode; then
--data-value "image_repo=$registry_repo" \
--data-value "image_tag=$tag" \
--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"