Update examples to Linkerd 1.4.6

Bump all example configs to Linkerd 1.4.6. No functionality changes. Signed-off-by: Andrew Seigner <[email protected]>
linkerd · Aug 13, 2018 · 9ad7888 · 9ad7888
1 parent 02f4c7c
commit 9ad7888
Show file tree

Hide file tree

Showing 49 changed files with 66 additions and 66 deletions.
diff --git a/README.md b/README.md
@@ -155,7 +155,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.3.6
+docker run -v `pwd`:/root/linkerd-examples --entrypoint=/root/linkerd-examples/.circleci/ci.sh buoyantio/linkerd:1.4.6
 ```
 
 <!-- references -->

diff --git a/add-steps/docker-compose.yml b/add-steps/docker-compose.yml
@@ -121,7 +121,7 @@ services:
     command: -latency=2s -success-rate=0.4
 
   linkerd:
-    image: buoyantio/linkerd:1.3.6
+    image: buoyantio/linkerd:1.4.6
     ports:
       - 4140:4140
       - 9990:9990

diff --git a/add-steps/k8s/add-steps.yml b/add-steps/k8s/add-steps.yml
@@ -188,7 +188,7 @@ spec:
           name: "l5d-config"
       containers:
       - name: l5d
-        image: buoyantio/linkerd:1.3.6
+        image: buoyantio/linkerd:1.4.6
         env:
         - name: POD_IP
           valueFrom:

diff --git a/consul/docker-compose.yml b/consul/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - "7777:7777"
 
   linkerd:
-    image: buoyantio/linkerd:1.3.6
+    image: buoyantio/linkerd:1.4.6
     command: ['/config.yaml']
     links:
       - consul

diff --git a/dcos/ingress/linkerd-dcos.json b/dcos/ingress/linkerd-dcos.json
@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/linkerd:1.3.6",
+      "image": "buoyantio/linkerd:1.4.6",
       "network": "HOST",
       "privileged": true
     }
@@ -38,5 +38,5 @@
     }
   ],
   "requirePorts": true,
-  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"usage\\\":{\\\"orgId\\\":\\\"linkerd-examples-dcos-ingress\\\"},\\\"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.3.6/bundle-exec -log.level=DEBUG -- -"
+  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"usage\\\":{\\\"orgId\\\":\\\"linkerd-examples-dcos-ingress\\\"},\\\"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.4.6/bundle-exec -log.level=DEBUG -- -"
 }
diff --git a/dcos/linker-to-linker-with-namerd/linkerd-dcos.json b/dcos/linker-to-linker-with-namerd/linkerd-dcos.json
@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/linkerd:1.3.6",
+      "image": "buoyantio/linkerd:1.4.6",
       "network": "HOST",
       "privileged": true
     }
@@ -38,5 +38,5 @@
     }
   ],
   "requirePorts": true,
-  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"usage\\\":{\\\"orgId\\\":\\\"linkerd-examples-dcos-linker-linker-namerd\\\"},\\\"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.3.6/bundle-exec -log.level=DEBUG -- -"
+  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"usage\\\":{\\\"orgId\\\":\\\"linkerd-examples-dcos-linker-linker-namerd\\\"},\\\"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.4.6/bundle-exec -log.level=DEBUG -- -"
 }
diff --git a/dcos/linker-to-linker/linkerd-dcos.json b/dcos/linker-to-linker/linkerd-dcos.json
@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/linkerd:1.3.6",
+      "image": "buoyantio/linkerd:1.4.6",
       "network": "HOST",
       "privileged": true
     }
@@ -38,5 +38,5 @@
     }
   ],
   "requirePorts": true,
-  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"usage\\\":{\\\"orgId\\\":\\\"linkerd-examples-dcos-linker-linker\\\"},\\\"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.3.6/bundle-exec -log.level=DEBUG -- -"
+  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"usage\\\":{\\\"orgId\\\":\\\"linkerd-examples-dcos-linker-linker\\\"},\\\"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.4.6/bundle-exec -log.level=DEBUG -- -"
 }
diff --git a/dcos/linkerd-marathon-auth/linkerd-dcos.json b/dcos/linkerd-marathon-auth/linkerd-dcos.json
@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/linkerd:1.3.6",
+      "image": "buoyantio/linkerd:1.4.6",
       "network": "HOST",
       "privileged": true
     }
@@ -41,5 +41,5 @@
     }
   },
   "requirePorts": true,
-  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"usage\\\":{\\\"orgId\\\":\\\"linkerd-examples-dcos-linkerd-marathon-auth\\\"},\\\"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.3.6/bundle-exec -log.level=DEBUG -- -"
+  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"usage\\\":{\\\"orgId\\\":\\\"linkerd-examples-dcos-linkerd-marathon-auth\\\"},\\\"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.4.6/bundle-exec -log.level=DEBUG -- -"
 }
diff --git a/dcos/linkerd-with-namerd/linkerd-dcos.json b/dcos/linkerd-with-namerd/linkerd-dcos.json
@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/linkerd:1.3.6",
+      "image": "buoyantio/linkerd:1.4.6",
       "network": "HOST",
       "privileged": true
     }
@@ -33,5 +33,5 @@
     }
   ],
   "requirePorts": true,
-  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"usage\\\":{\\\"orgId\\\":\\\"linkerd-examples-dcos-linkerd-namerd\\\"},\\\"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.3.6/bundle-exec -log.level=DEBUG -- -"
+  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"usage\\\":{\\\"orgId\\\":\\\"linkerd-examples-dcos-linkerd-namerd\\\"},\\\"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.4.6/bundle-exec -log.level=DEBUG -- -"
 }
diff --git a/dcos/namerd/namerd-dcos.json b/dcos/namerd/namerd-dcos.json
@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/namerd:1.3.6-dcos",
+      "image": "buoyantio/namerd:1.4.6-dcos",
       "network": "HOST",
       "privileged": true
     }
@@ -38,5 +38,5 @@
     }
   ],
   "requirePorts":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.3.6/dcos-exec -log.level=DEBUG -- -"
+  "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.4.6/dcos-exec -log.level=DEBUG -- -"
 }
diff --git a/dcos/simple-proxy/linkerd-dcos.json b/dcos/simple-proxy/linkerd-dcos.json
@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/linkerd:1.3.6",
+      "image": "buoyantio/linkerd:1.4.6",
       "network": "HOST",
       "privileged": true
     }
@@ -33,5 +33,5 @@
     }
   ],
   "requirePorts": true,
-  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"usage\\\":{\\\"orgId\\\":\\\"linkerd-examples-dcos-simple-proxy\\\"},\\\"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.3.6/bundle-exec -log.level=DEBUG -- -"
+  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"usage\\\":{\\\"orgId\\\":\\\"linkerd-examples-dcos-simple-proxy\\\"},\\\"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.4.6/bundle-exec -log.level=DEBUG -- -"
 }
diff --git a/ecs/linkerd-task-definition.json b/ecs/linkerd-task-definition.json
@@ -2,7 +2,7 @@
   "containerDefinitions": [
     {
       "name": "linkerd",
-      "image": "docker.io/buoyantio/linkerd:1.3.6",
+      "image": "docker.io/buoyantio/linkerd:1.4.6",
       "command": [
         "-log.level=DEBUG",
         "/etc/linkerd/linkerd.yaml"

diff --git a/failure-accrual/docker-compose.yml b/failure-accrual/docker-compose.yml
@@ -50,7 +50,7 @@ services:
     build: .
 
   linkerd:
-    image: buoyantio/linkerd:1.3.6
+    image: buoyantio/linkerd:1.4.6
     ports:
       - 9990:9990
     volumes:

diff --git a/getting-started/docker/docker-compose.yml b/getting-started/docker/docker-compose.yml
@@ -10,7 +10,7 @@ services:
 
   # linkerd
   l5d:
-    image: buoyantio/linkerd:1.3.6
+    image: buoyantio/linkerd:1.4.6
     ports:
     - "4140:4140"
     - "9990:9990"

diff --git a/getting-started/k8s/linkerd.yml b/getting-started/k8s/linkerd.yml
@@ -45,7 +45,7 @@ spec:
     spec:
       containers:
       - name: l5d
-        image: buoyantio/linkerd:1.3.6
+        image: buoyantio/linkerd:1.4.6
         args:
         - "/io.buoyant/linkerd/config/config.yml"
         ports:

diff --git a/gob/dcos/marathon/linkerd.json b/gob/dcos/marathon/linkerd.json
@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/linkerd:1.3.6",
+      "image": "buoyantio/linkerd:1.4.6",
       "network": "HOST",
       "privileged": true
     }
@@ -38,5 +38,5 @@
     }
   ],
   "requirePorts": 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.3.6/bundle-exec -log.level=DEBUG -- -"
+  "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.4.6/bundle-exec -log.level=DEBUG -- -"
 }
diff --git a/gob/dcos/marathon/namerd.json b/gob/dcos/marathon/namerd.json
@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/namerd:1.3.6-dcos",
+      "image": "buoyantio/namerd:1.4.6-dcos",
       "network": "HOST",
       "privileged": true
     }
@@ -38,5 +38,5 @@
     }
   ],
   "requirePorts":true,
-  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9991},\\\"storage\\\":{\\\"kind\\\":\\\"io.l5d.zk\\\",\\\"experimental\\\":true,\\\"zkAddrs\\\":[{\\\"host\\\":\\\"master.mesos\\\",\\\"port\\\":2181}],\\\"pathPrefix\\\":\\\"/dtabs\\\",\\\"sessionTimeoutMs\\\":10000},\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"experimental\\\":true,\\\"prefix\\\":\\\"/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.3.6/dcos-exec -log.level=DEBUG -- -"
+  "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9991},\\\"storage\\\":{\\\"kind\\\":\\\"io.l5d.zk\\\",\\\"experimental\\\":true,\\\"zkAddrs\\\":[{\\\"host\\\":\\\"master.mesos\\\",\\\"port\\\":2181}],\\\"pathPrefix\\\":\\\"/dtabs\\\",\\\"sessionTimeoutMs\\\":10000},\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"experimental\\\":true,\\\"prefix\\\":\\\"/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.4.6/dcos-exec -log.level=DEBUG -- -"
 }
diff --git a/gob/docker-compose.yml b/gob/docker-compose.yml
@@ -20,14 +20,14 @@ services:
     command: word
 
   linkerd:
-    image: buoyantio/linkerd:1.3.6
+    image: buoyantio/linkerd:1.4.6
     container_name: linkerd
     ports: ["4142:4142", "4141:4141", "9990:9990"]
     volumes: ["./config:/io.buoyant/linkerd/config:ro"]
     command: /io.buoyant/linkerd/config/linkerd.yml
 
   namerd:
-    image: buoyantio/namerd:1.3.6
+    image: buoyantio/namerd:1.4.6
     container_name: namerd
     ports: ["4100:4100", "4180:4180", "9991:9991"]
     volumes: ["./config:/io.buoyant/linkerd/config:ro"]

diff --git a/gob/k8s/gen-growthhack/rc.yml b/gob/k8s/gen-growthhack/rc.yml
@@ -32,7 +32,7 @@ spec:
               containerPort: 8080
 
         - name: l5d
-          image: buoyantio/linkerd:1.3.6
+          image: buoyantio/linkerd:1.4.6
           args:
             - "/io.buoyant/linkerd/config/config.yml"
 

diff --git a/gob/k8s/gen/rc.yml b/gob/k8s/gen/rc.yml
@@ -32,7 +32,7 @@ spec:
               containerPort: 8080
 
         - name: l5d
-          image: buoyantio/linkerd:1.3.6
+          image: buoyantio/linkerd:1.4.6
           args:
             - "/io.buoyant/linkerd/config/config.yml"
 

diff --git a/gob/k8s/namerd/rc.yml b/gob/k8s/namerd/rc.yml
@@ -21,7 +21,7 @@ spec:
 
       containers:
         - name: namerd
-          image: buoyantio/namerd:1.3.6
+          image: buoyantio/namerd:1.4.6
           args:
             - /io.buoyant/namerd/config/config.yml
           imagePullPolicy: Always

diff --git a/gob/k8s/web/rc.yml b/gob/k8s/web/rc.yml
@@ -34,7 +34,7 @@ spec:
               containerPort: 8080
 
         - name: l5d
-          image: buoyantio/linkerd:1.3.6
+          image: buoyantio/linkerd:1.4.6
           args:
             - /io.buoyant/linkerd/config/config.yml
 

diff --git a/gob/k8s/word/rc.yml b/gob/k8s/word/rc.yml
@@ -32,7 +32,7 @@ spec:
               containerPort: 8080
 
         - name: l5d
-          image: buoyantio/linkerd:1.3.6
+          image: buoyantio/linkerd:1.4.6
           args:
             - "/io.buoyant/linkerd/config/config.yml"