builtin/k8s: Fix ‘ports’ configurability

[rykov]

Looks like 0.4.0 release broke multi-port K8S configuration by setting ServicePort = 3000 if it is not specified in the config. By forcing ServicePort to always defined, a multi-port configuration using Ports always fails the mutual-exclusivity check with the following error:

* Cannot define both 'service_port' and 'ports'. Use 'ports' for configuring multiple container ports.

This PR ensures the default port is used only if neither service_port nor ports is configured.

[briancain]

Sorry about that regression! I left a note on the PR, thanks for taking the time to open a pull request to fix this up 🙏🏻

[briancain]

I think this entire if-block might not be required at all, it looks like it showed up during the k8s resource manager conversion. ​I thought this if-block below in the resource managers create was covering configuring the single and multi-port case:

waypoint/builtin/k8s/platform.go

Lines 167 to 180 in bb6e006

	// Setup our port configuration
	if p.config.ServicePort == 0 && p.config.Ports == nil {
	// nothing defined, set up the defaults
	p.config.Ports = make([]map[string]string, 1)
	p.config.Ports[0] = map[string]string{"port": strconv.Itoa(DefaultServicePort), "name": "http"}
	} else if p.config.ServicePort > 0 && p.config.Ports == nil {
	// old ServicePort var is used, so set it up in our Ports map to be used
	p.config.Ports = make([]map[string]string, 1)
	p.config.Ports[0] = map[string]string{"port": strconv.Itoa(int(p.config.ServicePort)), "name": "http"}
	} else if p.config.ServicePort > 0 && len(p.config.Ports) > 0 {
	// both defined, this is an error
	return fmt.Errorf("Cannot define both 'service_port' and 'ports'. Use" +
	" 'ports' for configuring multiple container ports.")
	}

If removing the service port check on 603 doesn't fix it, we should try to fix up the port conversion instead over in resourceDeploymentCreate and remove this here.

[rykov]

@briancain You're absolutely right: I've removed that code, and things work without the error.

[briancain]

Looks good! I gave it a shot myself, was able to reproduce the issue and see the fix work. Thanks again! ✨

[rykov]

Thanks @briancain