Merge pull request #12 from cloudscale-ch/denis/service-port-mapping

Use a more flexible port to pool mapping

Author: href

examples/nginx-hello.yml

@@ -42,7 +42,7 @@ spec:
   - port: 80
     protocol: TCP
     targetPort: 80
-    name: primary
+    name: http
   selector:
     app: hello
   type: LoadBalancer

pkg/cloudscale_ccm/reconcile.go

@@ -146,7 +146,7 @@ func desiredLbState(
 		}
 
 		pool := cloudscale.LoadBalancerPool{
-			Name:      poolName(port.Protocol, port.Port),
+			Name:      poolName(port.Protocol, port.Name),
 			Algorithm: algorithm,
 			Protocol:  protocol,
 		}
@@ -954,10 +954,20 @@ func (l *lbState) poolsByName() map[string]*cloudscale.LoadBalancerPool {
 // poolName produces the name of the pool for the given service port (the port
 // that is bound on the load balancer and reachable from outside of it).
 //
+// We use the name of the port (may be empty, but is enforced to be unqiue
+// for each service).
+//
 // Warning: This named is used to compare desired pools to actual pools.
 // Any change to it causes pools to be rebuilt, which must be avoided!
-func poolName(protocol v1.Protocol, port int32) string {
-	return strings.ToLower(fmt.Sprintf("%s/%d", protocol, port))
+func poolName(protocol v1.Protocol, name string) string {
+	p := strings.ToLower(string(protocol))
+
+	// By default, the port has no name (required with more than 1 port)
+	if name == "" {
+		return p
+	}
+
+	return fmt.Sprintf("%s/%s", p, name)
 }
 
 // poolMemberName produces the name of the pool member for the given node

pkg/cloudscale_ccm/reconcile_test.go

@@ -13,8 +13,9 @@ import (
 )
 
 func TestPoolName(t *testing.T) {
-	assert.Equal(t, "tcp/80", poolName(v1.ProtocolTCP, 80))
-	assert.Equal(t, "udp/443", poolName(v1.ProtocolUDP, 443))
+	assert.Equal(t, "tcp", poolName(v1.ProtocolTCP, ""))
+	assert.Equal(t, "udp/foo", poolName(v1.ProtocolUDP, "foo"))
+	assert.Equal(t, "udp/FOO", poolName(v1.ProtocolUDP, "FOO"))
 }
 
 func TestPoolMemberName(t *testing.T) {
@@ -126,11 +127,13 @@ func TestDesiredService(t *testing.T) {
 			Protocol: "TCP",
 			Port:     80,
 			NodePort: 8080,
+			Name:     "http",
 		},
 		{
 			Protocol: "TCP",
 			Port:     443,
 			NodePort: 8443,
+			Name:     "https",
 		},
 	}
 
@@ -143,10 +146,10 @@ func TestDesiredService(t *testing.T) {
 
 	// Have one pool per service port
 	assert.Len(t, desired.pools, 2)
-	assert.Equal(t, desired.pools[0].Name, "tcp/80")
+	assert.Equal(t, desired.pools[0].Name, "tcp/http")
 	assert.Equal(t, desired.pools[0].Protocol, "tcp")
 	assert.Equal(t, desired.pools[0].Algorithm, "round_robin")
-	assert.Equal(t, desired.pools[1].Name, "tcp/443")
+	assert.Equal(t, desired.pools[1].Name, "tcp/https")
 	assert.Equal(t, desired.pools[0].Protocol, "tcp")
 	assert.Equal(t, desired.pools[0].Algorithm, "round_robin")