diff --git a/README.md b/README.md index 6123944f..2cb5506e 100644 --- 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 ``` diff --git a/add-steps/docker-compose.yml b/add-steps/docker-compose.yml index cfb9c435..b391b360 100644 --- 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 index eff4a3df..4bc5bbd3 100644 --- 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 index d90b1217..40bdc799 100644 --- 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 index a404886f..41df2d88 100644 --- 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 index 47458885..8ec47846 100644 --- 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 index 60b6bfbb..5097c3f5 100644 --- 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 index 8379f692..279ab741 100644 --- 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 index acd180c5..0765d785 100644 --- 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 index c0730d09..c905b91f 100644 --- 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 index 84688675..878b62a0 100644 --- 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 index ac9d6b02..4541acf3 100644 --- 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 index 7680c709..078b276c 100644 --- 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 index ff641ab8..fefb3874 100644 --- 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 index 55534f8a..696a4ebe 100644 --- 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 index 3e7cbd44..883371c9 100644 --- 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 index 44d5029c..4e393a2c 100644 --- 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 index 75a81db7..0e80f390 100644 --- 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 index ea8671c1..48f320e3 100644 --- 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 index c315caf0..e2933ebc 100644 --- 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 index 7526442a..54c274d4 100644 --- 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 index 8f2ca367..cb6ba08a 100644 --- 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 index 676053fd..0160c6ee 100644 --- 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" diff --git a/http-proxy/README.md b/http-proxy/README.md index 6a56606c..0f416877 100644 --- a/http-proxy/README.md +++ b/http-proxy/README.md @@ -12,9 +12,9 @@ echo "Hello world" > hello; python3 -m http.server 8888 ## Setup linkerd ```bash -curl -sLO https://github.com/linkerd/linkerd/releases/download/1.3.6/linkerd-1.3.6-exec -chmod +x linkerd-1.3.6-exec -./linkerd-1.3.6-exec ./linkerd.yaml +curl -sLO https://github.com/linkerd/linkerd/releases/download/1.4.6/linkerd-1.4.6-exec +chmod +x linkerd-1.4.6-exec +./linkerd-1.4.6-exec ./linkerd.yaml ``` ## Test diff --git a/influxdb/docker-compose.yml b/influxdb/docker-compose.yml index 5bad220a..559ecd99 100644 --- a/influxdb/docker-compose.yml +++ b/influxdb/docker-compose.yml @@ -18,7 +18,7 @@ services: # route 90% of traffic to app1, 10% to app2 linkerd1: - image: buoyantio/linkerd:1.3.6 + image: buoyantio/linkerd:1.4.6 volumes: - ./linkerd1.yml:/io.buoyant/linkerd/config.yml:ro - ./disco:/disco:ro @@ -27,7 +27,7 @@ services: # route 25% of traffic to app1, 75% to app2 linkerd2: - image: buoyantio/linkerd:1.3.6 + image: buoyantio/linkerd:1.4.6 volumes: - ./linkerd2.yml:/io.buoyant/linkerd/config.yml:ro - ./disco:/disco:ro diff --git a/istio/helloworld-grpc-minikube/istio-ingress.yml b/istio/helloworld-grpc-minikube/istio-ingress.yml index de9d19cc..5c91f791 100644 --- a/istio/helloworld-grpc-minikube/istio-ingress.yml +++ b/istio/helloworld-grpc-minikube/istio-ingress.yml @@ -47,7 +47,7 @@ spec: name: "istio-ingress-config" containers: - name: l5d - image: buoyantio/linkerd:1.3.6 + image: buoyantio/linkerd:1.4.6 env: - name: POD_IP valueFrom: diff --git a/istio/istio-daemonset-grpc.yml b/istio/istio-daemonset-grpc.yml index ad13445e..9c9dad80 100644 --- a/istio/istio-daemonset-grpc.yml +++ b/istio/istio-daemonset-grpc.yml @@ -73,7 +73,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/istio/istio-daemonset.yml b/istio/istio-daemonset.yml index 80f4d63a..9a95f630 100644 --- a/istio/istio-daemonset.yml +++ b/istio/istio-daemonset.yml @@ -74,7 +74,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/istio/istio-egress.yml b/istio/istio-egress.yml index d87b43ae..cfb52b60 100644 --- a/istio/istio-egress.yml +++ b/istio/istio-egress.yml @@ -56,7 +56,7 @@ spec: name: "istio-egress-config" containers: - name: l5d - image: buoyantio/linkerd:1.3.6 + image: buoyantio/linkerd:1.4.6 args: - /io.buoyant/linkerd/config/config.yaml ports: diff --git a/istio/istio-ingress.yml b/istio/istio-ingress.yml index 004a046c..34034dea 100644 --- a/istio/istio-ingress.yml +++ b/istio/istio-ingress.yml @@ -55,7 +55,7 @@ spec: name: "istio-ingress-config" containers: - name: l5d - image: buoyantio/linkerd:1.3.6 + image: buoyantio/linkerd:1.4.6 env: - name: POD_IP valueFrom: diff --git a/istio/istio-linkerd.yml b/istio/istio-linkerd.yml index 0655b080..305de5f5 100644 --- a/istio/istio-linkerd.yml +++ b/istio/istio-linkerd.yml @@ -195,7 +195,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: @@ -296,7 +296,7 @@ spec: name: "istio-ingress-config" containers: - name: l5d - image: buoyantio/linkerd:1.3.6 + image: buoyantio/linkerd:1.4.6 env: - name: POD_IP valueFrom: @@ -394,7 +394,7 @@ spec: name: "istio-egress-config" containers: - name: l5d - image: buoyantio/linkerd:1.3.6 + image: buoyantio/linkerd:1.4.6 args: - /io.buoyant/linkerd/config/config.yaml ports: diff --git a/k8s-daemonset/k8s/linkerd-cni.yml b/k8s-daemonset/k8s/linkerd-cni.yml index f2dfdd4f..6caddd8d 100644 --- a/k8s-daemonset/k8s/linkerd-cni.yml +++ b/k8s-daemonset/k8s/linkerd-cni.yml @@ -86,7 +86,7 @@ spec: name: "l5d-config" containers: - name: l5d - image: buoyantio/linkerd:1.3.6 + image: buoyantio/linkerd:1.4.6 env: - name: NODE_NAME valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-egress.yaml b/k8s-daemonset/k8s/linkerd-egress.yaml index 6583611f..17eb77c3 100644 --- a/k8s-daemonset/k8s/linkerd-egress.yaml +++ b/k8s-daemonset/k8s/linkerd-egress.yaml @@ -84,7 +84,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/k8s-daemonset/k8s/linkerd-grpc.yml b/k8s-daemonset/k8s/linkerd-grpc.yml index c8a9bbb8..d4a6892b 100644 --- a/k8s-daemonset/k8s/linkerd-grpc.yml +++ b/k8s-daemonset/k8s/linkerd-grpc.yml @@ -81,7 +81,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/k8s-daemonset/k8s/linkerd-ingress-controller.yml b/k8s-daemonset/k8s/linkerd-ingress-controller.yml index 4d29098e..759d5701 100644 --- a/k8s-daemonset/k8s/linkerd-ingress-controller.yml +++ b/k8s-daemonset/k8s/linkerd-ingress-controller.yml @@ -43,7 +43,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/k8s-daemonset/k8s/linkerd-ingress.yml b/k8s-daemonset/k8s/linkerd-ingress.yml index 1fc2488c..8b01aacf 100644 --- a/k8s-daemonset/k8s/linkerd-ingress.yml +++ b/k8s-daemonset/k8s/linkerd-ingress.yml @@ -151,7 +151,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/k8s-daemonset/k8s/linkerd-latency.yml b/k8s-daemonset/k8s/linkerd-latency.yml index 6cfaca62..54287130 100644 --- a/k8s-daemonset/k8s/linkerd-latency.yml +++ b/k8s-daemonset/k8s/linkerd-latency.yml @@ -80,7 +80,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/k8s-daemonset/k8s/linkerd-namerd-cni.yml b/k8s-daemonset/k8s/linkerd-namerd-cni.yml index 0a9645c7..3095897f 100644 --- a/k8s-daemonset/k8s/linkerd-namerd-cni.yml +++ b/k8s-daemonset/k8s/linkerd-namerd-cni.yml @@ -175,7 +175,7 @@ spec: secretName: certificates containers: - name: l5d - image: buoyantio/linkerd:1.3.6 + image: buoyantio/linkerd:1.4.6 env: - name: NODE_NAME valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-namerd.yml b/k8s-daemonset/k8s/linkerd-namerd.yml index d57c41b7..aa6420f6 100644 --- a/k8s-daemonset/k8s/linkerd-namerd.yml +++ b/k8s-daemonset/k8s/linkerd-namerd.yml @@ -78,7 +78,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/k8s-daemonset/k8s/linkerd-tls-ingress-controller.yml b/k8s-daemonset/k8s/linkerd-tls-ingress-controller.yml index 97d62d59..9890d203 100644 --- a/k8s-daemonset/k8s/linkerd-tls-ingress-controller.yml +++ b/k8s-daemonset/k8s/linkerd-tls-ingress-controller.yml @@ -49,7 +49,7 @@ spec: secretName: ingress-certs containers: - name: l5d - image: buoyantio/linkerd:1.3.6 + image: buoyantio/linkerd:1.4.6 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-tls.yml b/k8s-daemonset/k8s/linkerd-tls.yml index 9c3b6ddf..0183a65f 100644 --- a/k8s-daemonset/k8s/linkerd-tls.yml +++ b/k8s-daemonset/k8s/linkerd-tls.yml @@ -90,7 +90,7 @@ spec: secretName: certificates containers: - name: l5d - image: buoyantio/linkerd:1.3.6 + image: buoyantio/linkerd:1.4.6 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-zipkin.yml b/k8s-daemonset/k8s/linkerd-zipkin.yml index 4b8d91b8..6ae81679 100644 --- a/k8s-daemonset/k8s/linkerd-zipkin.yml +++ b/k8s-daemonset/k8s/linkerd-zipkin.yml @@ -82,7 +82,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/k8s-daemonset/k8s/linkerd.yml b/k8s-daemonset/k8s/linkerd.yml index 44a70358..5c3d90fa 100644 --- a/k8s-daemonset/k8s/linkerd.yml +++ b/k8s-daemonset/k8s/linkerd.yml @@ -129,7 +129,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/k8s-daemonset/k8s/namerd-legacy.yml b/k8s-daemonset/k8s/namerd-legacy.yml index bb132c06..d645dfad 100644 --- a/k8s-daemonset/k8s/namerd-legacy.yml +++ b/k8s-daemonset/k8s/namerd-legacy.yml @@ -59,7 +59,7 @@ spec: name: namerd-config containers: - name: namerd - image: buoyantio/namerd:1.3.6 + image: buoyantio/namerd:1.4.6 args: - /io.buoyant/namerd/config/config.yml ports: diff --git a/k8s-daemonset/k8s/namerd.yml b/k8s-daemonset/k8s/namerd.yml index 0cdd2986..bae721d5 100644 --- a/k8s-daemonset/k8s/namerd.yml +++ b/k8s-daemonset/k8s/namerd.yml @@ -64,7 +64,7 @@ spec: name: namerd-config containers: - name: namerd - image: buoyantio/namerd:1.3.6 + image: buoyantio/namerd:1.4.6 args: - /io.buoyant/namerd/config/config.yml ports: diff --git a/k8s-daemonset/k8s/servicemesh.yml b/k8s-daemonset/k8s/servicemesh.yml index dfb9302e..4d666153 100644 --- a/k8s-daemonset/k8s/servicemesh.yml +++ b/k8s-daemonset/k8s/servicemesh.yml @@ -291,7 +291,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/linkerd-tcp/docker-compose.yml b/linkerd-tcp/docker-compose.yml index 1a80d5db..4b8ff73b 100644 --- a/linkerd-tcp/docker-compose.yml +++ b/linkerd-tcp/docker-compose.yml @@ -62,7 +62,7 @@ services: - "-redis-addr=linkerd-tcp:7474" linkerd: - image: buoyantio/linkerd:1.3.6 + image: buoyantio/linkerd:1.4.6 ports: - 4140:4140 # expose for testing only - 9990:9990 @@ -72,7 +72,7 @@ services: - "/io.buoyant/linkerd/config.yml" namerd: - image: buoyantio/namerd:1.3.6 + image: buoyantio/namerd:1.4.6 ports: - 4180:4180 - 9991:9991 diff --git a/mesos-marathon/linkerd-marathon.json b/mesos-marathon/linkerd-marathon.json index bbdc3d83..cac30985 100644 --- a/mesos-marathon/linkerd-marathon.json +++ b/mesos-marathon/linkerd-marathon.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 } @@ -36,5 +36,5 @@ } ], "requirePorts": true, - "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"localhost\\\",\\\"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\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"localhost\\\",\\\"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/plugins/build.sbt b/plugins/build.sbt index 18ec1840..010b7258 100644 --- a/plugins/build.sbt +++ b/plugins/build.sbt @@ -6,7 +6,7 @@ def finagle(mod: String) = "com.twitter" %% s"finagle-$mod" % "6.45.0" def linkerd(mod: String) = - "io.buoyant" %% s"linkerd-$mod" % "1.3.6" + "io.buoyant" %% s"linkerd-$mod" % "1.4.6" val headerClassifier = project.in(file("header-classifier")).