Update for linkerd 1.2.0

In addition to linkerd version bump, primary change includes modifying
linkerd and namerd admin servers to serve on 0.0.0.0, rather than the
new default loopback.

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: buoyantio/linkerd:1.1.3
+      - image: buoyantio/linkerd:1.2.0
         parallelism: 1 # TODO: parallelize tests
     working_directory: ~/linkerd-examples
 

README.md

@@ -143,7 +143,7 @@ Contains sample code for building linkerd plugins. More information:
 ## Testing
 
 ```bash
-docker run -v `pwd`:/root/linkerd-examples --entrypoint=/root/linkerd-examples/.circleci/ci.sh buoyantio/linkerd:1.1.3
+docker run -v `pwd`:/root/linkerd-examples --entrypoint=/root/linkerd-examples/.circleci/ci.sh buoyantio/linkerd:1.2.0
 ```
 
 <!-- references -->

add-steps/docker-compose.yml

@@ -121,7 +121,7 @@ services:
     command: -latency=2s -success-rate=0.4
 
   linkerd:
-    image: buoyantio/linkerd:1.1.3
+    image: buoyantio/linkerd:1.2.0
     ports:
       - 4140:4140
       - 9990:9990

add-steps/linkerd.yml

@@ -1,3 +1,7 @@
+admin:
+  ip: 0.0.0.0
+  port: 9990
+
 # use the filesystem namer, read from the local /disco directory
 namers:
 - kind: io.l5d.fs

consul/docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - "7777:7777"
 
   linkerd:
-    image: buoyantio/linkerd:1.1.3
+    image: buoyantio/linkerd:1.2.0
     command: ['/config.yaml']
     links:
       - consul

consul/linkerd.yml

@@ -1,8 +1,13 @@
+admin:
+  ip: 0.0.0.0
+  port: 9990
+
 namers:
 - kind: io.l5d.consul
   includeTag: false
   useHealthCheck: false
   host: consul
+
 routers:
 - protocol: http
   label: /http-consul

dcos/ingress/linkerd-config.yml

@@ -3,6 +3,7 @@
 # port 4242 automatically routes to "webapp"
 
 admin:
+  ip: 0.0.0.0
   port: 9990
 
 telemetry:

dcos/ingress/linkerd-dcos.json

@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/linkerd:1.1.3",
+      "image": "buoyantio/linkerd:1.2.0",
       "network": "HOST",
       "privileged": true
     }
@@ -38,5 +38,5 @@
     }
   ],
   "requirePorts": true,
-  "cmd": "echo \"{\\\"admin\\\":{\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"marathon.mesos\\\",\\\"port\\\":8080}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"linkerd_proxy\\\"},{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4242,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/svc/*=>/#/io.l5d.marathon/webapp;\\\",\\\"label\\\":\\\"external\\\"}]}\" | /io.buoyant/linkerd/1.1.3/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -"
+  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"marathon.mesos\\\",\\\"port\\\":8080}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"linkerd_proxy\\\"},{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4242,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/svc/*=>/#/io.l5d.marathon/webapp;\\\",\\\"label\\\":\\\"external\\\"}]}\" | /io.buoyant/linkerd/1.2.0/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -"
 }

dcos/linker-to-linker-with-namerd/linkerd-config.yml

@@ -3,6 +3,7 @@
 # all service discovery managed via namerd
 
 admin:
+  ip: 0.0.0.0
   port: 9990
 
 telemetry:

dcos/linker-to-linker-with-namerd/linkerd-dcos.json

@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/linkerd:1.1.3",
+      "image": "buoyantio/linkerd:1.2.0",
       "network": "HOST",
       "privileged": true
     }
@@ -38,5 +38,5 @@
     }
   ],
   "requirePorts": true,
-  "cmd": "echo \"{\\\"admin\\\":{\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"label\\\":\\\"outgoing\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.mesos/4100\\\",\\\"transformers\\\":[{\\\"kind\\\":\\\"io.l5d.port\\\",\\\"port\\\":4141}]}},{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4141,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"label\\\":\\\"incoming\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.mesos/4100\\\",\\\"transformers\\\":[{\\\"kind\\\":\\\"io.l5d.localhost\\\"}]}}]}\" | /io.buoyant/linkerd/1.1.3/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -"
+  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"label\\\":\\\"outgoing\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.mesos/4100\\\",\\\"transformers\\\":[{\\\"kind\\\":\\\"io.l5d.port\\\",\\\"port\\\":4141}]}},{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4141,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"label\\\":\\\"incoming\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.mesos/4100\\\",\\\"transformers\\\":[{\\\"kind\\\":\\\"io.l5d.localhost\\\"}]}}]}\" | /io.buoyant/linkerd/1.2.0/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -"
 }

dcos/linker-to-linker/linkerd-config.yml

@@ -2,6 +2,7 @@
 # routes from port 4140 on source node to 4141 on destination node
 
 admin:
+  ip: 0.0.0.0
   port: 9990
 
 telemetry:

dcos/linker-to-linker/linkerd-dcos.json

@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/linkerd:1.1.3",
+      "image": "buoyantio/linkerd:1.2.0",
       "network": "HOST",
       "privileged": true
     }
@@ -38,5 +38,5 @@
     }
   ],
   "requirePorts": true,
-  "cmd": "echo \"{\\\"admin\\\":{\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"marathon.mesos\\\",\\\"port\\\":8080}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"outgoing\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"default\\\",\\\"transformers\\\":[{\\\"kind\\\":\\\"io.l5d.port\\\",\\\"port\\\":4141}]}},{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4141,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"incoming\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"default\\\",\\\"transformers\\\":[{\\\"kind\\\":\\\"io.l5d.localhost\\\"}]}}]}\" | /io.buoyant/linkerd/1.1.3/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -"
+  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"marathon.mesos\\\",\\\"port\\\":8080}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"outgoing\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"default\\\",\\\"transformers\\\":[{\\\"kind\\\":\\\"io.l5d.port\\\",\\\"port\\\":4141}]}},{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4141,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"incoming\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"default\\\",\\\"transformers\\\":[{\\\"kind\\\":\\\"io.l5d.localhost\\\"}]}}]}\" | /io.buoyant/linkerd/1.2.0/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -"
 }

dcos/linkerd-marathon-auth/linkerd-config.yml

@@ -3,6 +3,7 @@
 # configured to connect to DC/OS in Strict mode, via Marathon TLS
 
 admin:
+  ip: 0.0.0.0
   port: 9990
 
 telemetry:

dcos/linkerd-marathon-auth/linkerd-dcos.json

@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/linkerd:1.1.3",
+      "image": "buoyantio/linkerd:1.2.0",
       "network": "HOST",
       "privileged": true
     }
@@ -41,5 +41,5 @@
     }
   },
   "requirePorts": true,
-  "cmd": "echo \"{\\\"admin\\\":{\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"leader.mesos\\\",\\\"port\\\":443,\\\"prefix\\\":\\\"/io.l5d.marathon\\\",\\\"uriPrefix\\\":\\\"/marathon\\\",\\\"tls\\\":{\\\"disableValidation\\\":false,\\\"commonName\\\":\\\"master.mesos\\\",\\\"trustCerts\\\":[\\\"/mnt/mesos/sandbox/.ssl/ca.crt\\\"]}}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"linkerd_proxy\\\"}]}\" | /io.buoyant/linkerd/1.1.3/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -"
+  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"leader.mesos\\\",\\\"port\\\":443,\\\"prefix\\\":\\\"/io.l5d.marathon\\\",\\\"uriPrefix\\\":\\\"/marathon\\\",\\\"tls\\\":{\\\"disableValidation\\\":false,\\\"commonName\\\":\\\"master.mesos\\\",\\\"trustCerts\\\":[\\\"/mnt/mesos/sandbox/.ssl/ca.crt\\\"]}}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"linkerd_proxy\\\"}]}\" | /io.buoyant/linkerd/1.2.0/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -"
 }

dcos/linkerd-with-namerd/linkerd-config.yml

@@ -3,6 +3,7 @@
 # all service discovery managed via namerd
 
 admin:
+  ip: 0.0.0.0
   port: 9990
 
 telemetry:

dcos/linkerd-with-namerd/linkerd-dcos.json

@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/linkerd:1.1.3",
+      "image": "buoyantio/linkerd:1.2.0",
       "network": "HOST",
       "privileged": true
     }
@@ -33,5 +33,5 @@
     }
   ],
   "requirePorts": true,
-  "cmd": "echo \"{\\\"admin\\\":{\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"label\\\":\\\"linkerd_proxy\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.mesos/4100\\\"}}]}\" | /io.buoyant/linkerd/1.1.3/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -"
+  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"label\\\":\\\"linkerd_proxy\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.mesos/4100\\\"}}]}\" | /io.buoyant/linkerd/1.2.0/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -"
 }

dcos/namerd/namerd-config.yml

@@ -3,7 +3,8 @@
 # thrift interface (for linkerd) on port 4100
 
 admin:
-  port: 9001
+  ip: 0.0.0.0
+  port: 9991
 
 storage:
   kind: io.l5d.zk

dcos/namerd/namerd-dcos.json

@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/namerd:1.1.3-dcos",
+      "image": "buoyantio/namerd:1.2.0-dcos",
       "network": "HOST",
       "privileged": true
     }
@@ -22,7 +22,7 @@
   ],
   "portDefinitions": [
     {
-      "port": 9001,
+      "port": 9991,
       "protocol": "tcp",
       "name": "admin"
     },
@@ -38,5 +38,5 @@
     }
   ],
   "requirePorts":true,
-  "cmd": "echo \"{\\\"admin\\\":{\\\"port\\\":9001},\\\"storage\\\":{\\\"kind\\\":\\\"io.l5d.zk\\\",\\\"zkAddrs\\\":[{\\\"host\\\":\\\"leader.mesos\\\",\\\"port\\\":2181}],\\\"pathPrefix\\\":\\\"/dtabs\\\",\\\"sessionTimeoutMs\\\":10000},\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"marathon.mesos\\\",\\\"port\\\":8080}],\\\"interfaces\\\":[{\\\"kind\\\":\\\"io.l5d.thriftNameInterpreter\\\",\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":4100},{\\\"kind\\\":\\\"io.l5d.httpController\\\",\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":4180}]}\" | /io.buoyant/namerd/1.1.3/dcos-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -"
+  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9991},\\\"storage\\\":{\\\"kind\\\":\\\"io.l5d.zk\\\",\\\"zkAddrs\\\":[{\\\"host\\\":\\\"leader.mesos\\\",\\\"port\\\":2181}],\\\"pathPrefix\\\":\\\"/dtabs\\\",\\\"sessionTimeoutMs\\\":10000},\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"marathon.mesos\\\",\\\"port\\\":8080}],\\\"interfaces\\\":[{\\\"kind\\\":\\\"io.l5d.thriftNameInterpreter\\\",\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":4100},{\\\"kind\\\":\\\"io.l5d.httpController\\\",\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":4180}]}\" | /io.buoyant/namerd/1.2.0/dcos-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -"
 }

dcos/simple-proxy/linkerd-config.yml

@@ -2,6 +2,7 @@
 # listens on port 4140, routes via http_proxy or host header
 
 admin:
+  ip: 0.0.0.0
   port: 9990
 
 telemetry:

dcos/simple-proxy/linkerd-dcos.json

@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/linkerd:1.1.3",
+      "image": "buoyantio/linkerd:1.2.0",
       "network": "HOST",
       "privileged": true
     }
@@ -33,5 +33,5 @@
     }
   ],
   "requirePorts": true,
-  "cmd": "echo \"{\\\"admin\\\":{\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"marathon.mesos\\\",\\\"port\\\":8080}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"linkerd_proxy\\\"}]}\" | /io.buoyant/linkerd/1.1.3/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -"
+  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"marathon.mesos\\\",\\\"port\\\":8080}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"linkerd_proxy\\\"}]}\" | /io.buoyant/linkerd/1.2.0/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -"
 }

ecs/linkerd-task-definition.json

@@ -2,7 +2,7 @@
   "containerDefinitions": [
     {
       "name": "linkerd",
-      "image": "docker.io/buoyantio/linkerd:1.1.3",
+      "image": "docker.io/buoyantio/linkerd:1.2.0",
       "command": [
         "-log.level=DEBUG",
         "-com.twitter.finagle.tracing.debugTrace=true",

failure-accrual/docker-compose.yml

@@ -50,7 +50,7 @@ services:
     build: .
 
   linkerd:
-    image: buoyantio/linkerd:1.1.3
+    image: buoyantio/linkerd:1.2.0
     ports:
       - 9990:9990
     volumes:

failure-accrual/linkerd.yml

@@ -1,3 +1,7 @@
+admin:
+  ip: 0.0.0.0
+  port: 9990
+
 namers:
 - kind: io.l5d.fs
   rootDir: /disco

getting-started/docker/docker-compose.yml

@@ -10,7 +10,7 @@ services:
 
   # linkerd
   l5d:
-    image: buoyantio/linkerd:1.1.3
+    image: buoyantio/linkerd:1.2.0
     ports:
     - "4140:4140"
     - "9990:9990"

getting-started/docker/linkerd.yaml

@@ -1,3 +1,7 @@
+admin:
+  ip: 0.0.0.0
+  port: 9990
+
 # The filesystem namer (io.l5d.fs) watches the disco directory for changes.
 # Each file in this directory represents a concrete name and contains a list
 # of hostname/port pairs.

getting-started/k8s/linkerd.yml

@@ -7,6 +7,10 @@ data:
   config.yml: |-
     # The Kubernetes namer (io.l5d.k8s) queries the Kubernetes master API
     # for a list of pods with a given name.
+    admin:
+      ip: 0.0.0.0
+      port: 9990
+
     namers:
     - kind: io.l5d.k8s
       experimental: true
@@ -42,7 +46,7 @@ spec:
     spec:
       containers:
       - name: l5d
-        image: buoyantio/linkerd:1.1.3
+        image: buoyantio/linkerd:1.2.0
         args:
         - "/io.buoyant/linkerd/config/config.yml"
         ports:

getting-started/local/linkerd.yaml

@@ -1,3 +1,7 @@
+admin:
+  ip: 0.0.0.0
+  port: 9990
+
 # The filesystem namer (io.l5d.fs) watches the disco directory for changes.
 # Each file in this directory represents a concrete name and contains a list
 # of hostname/port pairs.

gob/dcos/linkerd-dcos-gob.yaml

@@ -1,3 +1,7 @@
+admin:
+  ip: 0.0.0.0
+  port: 9990
+
 routers:
 - protocol: http
   interpreter:

gob/dcos/marathon/linkerd.json

@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/linkerd:1.1.3",
+      "image": "buoyantio/linkerd:1.2.0",
       "network": "HOST",
       "privileged": true
     }
@@ -38,5 +38,5 @@
     }
   ],
   "requirePorts": true,
-  "cmd": "echo \"{\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.slave.mesos/4100\\\"},\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}]},{\\\"protocol\\\":\\\"h2\\\",\\\"experimental\\\":true,\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.slave.mesos/4100\\\"},\\\"servers\\\":[{\\\"port\\\":4142,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dstPrefix\\\":\\\"/grpc\\\",\\\"identifier\\\":{\\\"kind\\\":\\\"io.l5d.header.path\\\"}}]}\" | /io.buoyant/linkerd/1.1.3/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -"
+  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.slave.mesos/4100\\\"},\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}]},{\\\"protocol\\\":\\\"h2\\\",\\\"experimental\\\":true,\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.slave.mesos/4100\\\"},\\\"servers\\\":[{\\\"port\\\":4142,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dstPrefix\\\":\\\"/grpc\\\",\\\"identifier\\\":{\\\"kind\\\":\\\"io.l5d.header.path\\\"}}]}\" | /io.buoyant/linkerd/1.2.0/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -"
 }