Docker engine labels (#486)

Signed-off-by: Nicolas Degory <[email protected]>

Author: ndegory

.swp

@@ -13,6 +13,10 @@ This plugin has a schema that looks like this:
    "SwarmJoinIP": "192.168.2.200",
    "Docker" : {
      "Host" : "tcp://192.168.2.200:4243"
+   },
+   "EngineLabels": {
+     "storage": "ssd",
+     "data": ""
    }
  }
 ```
@@ -41,7 +45,7 @@ set -o xtrace
 mkdir -p /etc/docker
 cat << EOF > /etc/docker/daemon.json
 {
-  "labels": {{ INFRAKIT_LABELS | to_json }}
+  "labels": {{ INFRAKIT_LABELS | jsonEncode }}
 }
 EOF
 

examples/flavor/swarm/README.md

@@ -41,6 +41,9 @@ type Spec struct {
 	// SwarmJoinIP is the IP for managers and workers to join
 	SwarmJoinIP string
 
+	// Labels to apply on the Docker engine
+	EngineLabels map[string]string
+
 	// Docker holds the connection params to the Docker engine for join tokens, etc.
 	Docker ConnectInfo
 }
@@ -459,8 +462,18 @@ func (c *templateContext) Funcs() []template.Function {
 		},
 		{
 			Name:        "INFRAKIT_LABELS",
-			Description: []string{"The Docker engine labels to be applied for linking the Docker engine to this instance."},
+			Description: []string{"The Docker engine labels to be applied for linking the Docker engine to this instance, as well as those defined in the flavor spec."},
 			Func: func() []string {
+				if len(c.flavorSpec.EngineLabels) > 0 {
+					out := []string{}
+					for k, v := range c.flavorSpec.EngineLabels {
+						out = append(out, fmt.Sprintf("%s=%s", k, v))
+					}
+					for k, v := range c.link.Map() {
+						out = append(out, fmt.Sprintf("%s=%s", k, v))
+					}
+					return out
+				}
 				return c.link.KVPairs()
 			},
 		},

examples/flavor/swarm/flavor.go

@@ -6,7 +6,7 @@ set -o xtrace
 mkdir -p /etc/docker
 cat << EOF > /etc/docker/daemon.json
 {
-  "labels": {{ INFRAKIT_LABELS | to_json }}
+  "labels": {{ INFRAKIT_LABELS | jsonEncode }}
 }
 EOF
 

examples/flavor/swarm/manager-init-fast.sh

@@ -9,7 +9,7 @@ set -o xtrace
 mkdir -p /etc/docker
 cat << EOF > /etc/docker/daemon.json
 {
-  "labels": {{ INFRAKIT_LABELS | to_json }}
+  "labels": {{ INFRAKIT_LABELS | jsonEncode }}
 }
 EOF
 

examples/flavor/swarm/manager-init.sh

@@ -6,7 +6,7 @@ set -o xtrace
 mkdir -p /etc/docker
 cat << EOF > /etc/docker/daemon.json
 {
-  "labels": {{ INFRAKIT_LABELS | to_json }}
+  "labels": {{ INFRAKIT_LABELS | jsonEncode }}
 }
 EOF
 

examples/flavor/swarm/worker-init-fast.sh

@@ -9,7 +9,7 @@ set -o xtrace
 mkdir -p /etc/docker
 cat << EOF > /etc/docker/daemon.json
 {
-  "labels": {{ INFRAKIT_LABELS | to_json }}
+  "labels": {{ INFRAKIT_LABELS | jsonEncode }}
 }
 EOF