diff --git a/.circleci/config.yml b/.circleci/config.yml index 8040be64..0f2f01aa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: build: docker: - - image: buoyantio/linkerd:1.4.6 + - image: buoyantio/linkerd:1.7.0 parallelism: 1 # TODO: parallelize tests working_directory: ~/linkerd-examples diff --git a/README.md b/README.md index 0f803837..2c7b10d7 100644 --- a/README.md +++ b/README.md @@ -146,7 +146,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.4.6 +docker run -v `pwd`:/root/linkerd-examples --entrypoint=/root/linkerd-examples/.circleci/ci.sh buoyantio/linkerd:1.7.0 ``` diff --git a/add-steps/docker-compose.yml b/add-steps/docker-compose.yml index b391b360..d7311cca 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.4.6 + image: buoyantio/linkerd:1.7.0 ports: - 4140:4140 - 9990:9990 diff --git a/add-steps/k8s/add-steps.yml b/add-steps/k8s/add-steps.yml index 1d09522a..ff0884c5 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.4.6 + image: buoyantio/linkerd:1.7.0 env: - name: POD_IP valueFrom: diff --git a/consul/docker-compose.yml b/consul/docker-compose.yml index 40bdc799..d488e894 100644 --- a/consul/docker-compose.yml +++ b/consul/docker-compose.yml @@ -12,7 +12,7 @@ services: - "7777:7777" linkerd: - image: buoyantio/linkerd:1.4.6 + image: buoyantio/linkerd:1.7.0 command: ['/config.yaml'] links: - consul diff --git a/dcos/ingress/linkerd-dcos.json b/dcos/ingress/linkerd-dcos.json index 41df2d88..55a31fe8 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.4.6", + "image": "buoyantio/linkerd:1.7.0", "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.4.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.7.0/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 8ec47846..4c81fab8 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.4.6", + "image": "buoyantio/linkerd:1.7.0", "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.4.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.7.0/bundle-exec -log.level=DEBUG -- -" } diff --git a/dcos/linker-to-linker/linkerd-dcos.json b/dcos/linker-to-linker/linkerd-dcos.json index 5097c3f5..15ce299d 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.4.6", + "image": "buoyantio/linkerd:1.7.0", "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.4.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.7.0/bundle-exec -log.level=DEBUG -- -" } diff --git a/dcos/linkerd-marathon-auth/linkerd-dcos.json b/dcos/linkerd-marathon-auth/linkerd-dcos.json index 279ab741..74d8324a 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.4.6", + "image": "buoyantio/linkerd:1.7.0", "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.4.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.7.0/bundle-exec -log.level=DEBUG -- -" } diff --git a/dcos/linkerd-with-namerd/linkerd-dcos.json b/dcos/linkerd-with-namerd/linkerd-dcos.json index 0765d785..776cb453 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.4.6", + "image": "buoyantio/linkerd:1.7.0", "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.4.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.7.0/bundle-exec -log.level=DEBUG -- -" } diff --git a/dcos/namerd/namerd-dcos.json b/dcos/namerd/namerd-dcos.json index c905b91f..1c5eb905 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.4.6-dcos", + "image": "buoyantio/namerd:1.7.0-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.4.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.7.0/dcos-exec -log.level=DEBUG -- -" } diff --git a/dcos/simple-proxy/linkerd-dcos-with-fetch.json b/dcos/simple-proxy/linkerd-dcos-with-fetch.json index ea5e1782..48fa338a 100644 --- a/dcos/simple-proxy/linkerd-dcos-with-fetch.json +++ b/dcos/simple-proxy/linkerd-dcos-with-fetch.json @@ -17,13 +17,13 @@ "type": "DOCKER", "volumes": [ { - "containerPath": "/io.buoyant/linkerd/1.4.6/config.yaml", + "containerPath": "/io.buoyant/linkerd/1.7.0/config.yaml", "hostPath": "./config.yaml", "mode": "RW" } ], "docker": { - "image": "buoyantio/linkerd:1.4.6", + "image": "buoyantio/linkerd:1.7.0", "network": "HOST", "privileged": true } diff --git a/dcos/simple-proxy/linkerd-dcos.json b/dcos/simple-proxy/linkerd-dcos.json index 878b62a0..e5184f3f 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.4.6", + "image": "buoyantio/linkerd:1.7.0", "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.4.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.7.0/bundle-exec -log.level=DEBUG -- -" } diff --git a/ecs/linkerd-daemons.yml b/ecs/linkerd-daemons.yml index 56731e80..90832ea0 100644 --- a/ecs/linkerd-daemons.yml +++ b/ecs/linkerd-daemons.yml @@ -122,7 +122,7 @@ Resources: Name: linkerd-config ContainerDefinitions: - Name: linkerd - Image: docker.io/buoyantio/linkerd:1.4.6 + Image: docker.io/buoyantio/linkerd:1.7.0 Command: - "-log.level=DEBUG" - "/etc/linkerd/linkerd.yaml" diff --git a/failure-accrual/docker-compose.yml b/failure-accrual/docker-compose.yml index a459fa3c..2752cf98 100644 --- a/failure-accrual/docker-compose.yml +++ b/failure-accrual/docker-compose.yml @@ -50,7 +50,7 @@ services: build: . linkerd: - image: buoyantio/linkerd:1.4.6 + image: buoyantio/linkerd:1.7.0 ports: - 9990:9990 volumes: diff --git a/getting-started/docker/docker-compose.yml b/getting-started/docker/docker-compose.yml index fefb3874..06622b32 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.4.6 + image: buoyantio/linkerd:1.7.0 ports: - "4140:4140" - "9990:9990" diff --git a/getting-started/k8s/linkerd.yml b/getting-started/k8s/linkerd.yml index 55f8027c..d94b9c02 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.4.6 + image: buoyantio/linkerd:1.7.0 args: - "/io.buoyant/linkerd/config/config.yml" ports: diff --git a/gob/dcos/marathon/linkerd.json b/gob/dcos/marathon/linkerd.json index 883371c9..275d654a 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.4.6", + "image": "buoyantio/linkerd:1.7.0", "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.4.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.7.0/bundle-exec -log.level=DEBUG -- -" } diff --git a/gob/dcos/marathon/namerd.json b/gob/dcos/marathon/namerd.json index 4e393a2c..211a8d4b 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.4.6-dcos", + "image": "buoyantio/namerd:1.7.0-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.4.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.7.0/dcos-exec -log.level=DEBUG -- -" } diff --git a/gob/docker-compose.yml b/gob/docker-compose.yml index 0e80f390..1b23b855 100644 --- a/gob/docker-compose.yml +++ b/gob/docker-compose.yml @@ -20,14 +20,14 @@ services: command: word linkerd: - image: buoyantio/linkerd:1.4.6 + image: buoyantio/linkerd:1.7.0 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.4.6 + image: buoyantio/namerd:1.7.0 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 48f320e3..511cbde6 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.4.6 + image: buoyantio/linkerd:1.7.0 args: - "/io.buoyant/linkerd/config/config.yml" diff --git a/gob/k8s/gen/rc.yml b/gob/k8s/gen/rc.yml index e2933ebc..c8ade7e5 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.4.6 + image: buoyantio/linkerd:1.7.0 args: - "/io.buoyant/linkerd/config/config.yml" diff --git a/gob/k8s/namerd/rc.yml b/gob/k8s/namerd/rc.yml index 48c4ccea..a7580f36 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.4.6 + image: buoyantio/namerd:1.7.0 args: - /io.buoyant/namerd/config/config.yml imagePullPolicy: Always diff --git a/gob/k8s/web/rc.yml b/gob/k8s/web/rc.yml index cb6ba08a..829543a3 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.4.6 + image: buoyantio/linkerd:1.7.0 args: - /io.buoyant/linkerd/config/config.yml diff --git a/gob/k8s/word/rc.yml b/gob/k8s/word/rc.yml index 0160c6ee..2c7de9ea 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.4.6 + image: buoyantio/linkerd:1.7.0 args: - "/io.buoyant/linkerd/config/config.yml" diff --git a/http-proxy/README.md b/http-proxy/README.md index 0f416877..b4ef5efe 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.4.6/linkerd-1.4.6-exec -chmod +x linkerd-1.4.6-exec -./linkerd-1.4.6-exec ./linkerd.yaml +curl -sLO https://github.com/linkerd/linkerd/releases/download/1.7.0/linkerd-1.7.0-exec +chmod +x linkerd-1.7.0-exec +./linkerd-1.7.0-exec ./linkerd.yaml ``` ## Test diff --git a/influxdb/docker-compose.yml b/influxdb/docker-compose.yml index b754a126..79a6ae6f 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.4.6 + image: buoyantio/linkerd:1.7.0 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.4.6 + image: buoyantio/linkerd:1.7.0 volumes: - ./linkerd2.yml:/io.buoyant/linkerd/config.yml:ro - ./disco:/disco:ro diff --git a/k8s-daemonset/k8s/linkerd-cni-legacy.yml b/k8s-daemonset/k8s/linkerd-cni-legacy.yml index 5f392f59..de56eac0 100644 --- a/k8s-daemonset/k8s/linkerd-cni-legacy.yml +++ b/k8s-daemonset/k8s/linkerd-cni-legacy.yml @@ -85,7 +85,7 @@ spec: name: "l5d-config" containers: - name: l5d - image: buoyantio/linkerd:1.4.6 + image: buoyantio/linkerd:1.7.0 env: - name: NODE_NAME valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-cni.yml b/k8s-daemonset/k8s/linkerd-cni.yml index eb114ff1..8c6134be 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.4.6 + image: buoyantio/linkerd:1.7.0 env: - name: NODE_NAME valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-egress.yaml b/k8s-daemonset/k8s/linkerd-egress.yaml index 33202681..996340fd 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.4.6 + image: buoyantio/linkerd:1.7.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-grpc.yml b/k8s-daemonset/k8s/linkerd-grpc.yml index 001c1389..cefa9b68 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.4.6 + image: buoyantio/linkerd:1.7.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-ingress-controller.yml b/k8s-daemonset/k8s/linkerd-ingress-controller.yml index d3af4021..2674707b 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.4.6 + image: buoyantio/linkerd:1.7.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-ingress.yml b/k8s-daemonset/k8s/linkerd-ingress.yml index b5c350e5..3ec89d90 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.4.6 + image: buoyantio/linkerd:1.7.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-latency.yml b/k8s-daemonset/k8s/linkerd-latency.yml index 977d56d3..9efbfe21 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.4.6 + image: buoyantio/linkerd:1.7.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-namerd-cni.yml b/k8s-daemonset/k8s/linkerd-namerd-cni.yml index 18cdfa8d..03ae1816 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.4.6 + image: buoyantio/linkerd:1.7.0 env: - name: NODE_NAME valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-namerd.yml b/k8s-daemonset/k8s/linkerd-namerd.yml index a3f9c002..cd4d5722 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.4.6 + image: buoyantio/linkerd:1.7.0 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 8942e108..96adf740 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.4.6 + image: buoyantio/linkerd:1.7.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-tls.yml b/k8s-daemonset/k8s/linkerd-tls.yml index 3a0b28e3..dcaa60dd 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.4.6 + image: buoyantio/linkerd:1.7.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-zipkin.yml b/k8s-daemonset/k8s/linkerd-zipkin.yml index c691b3e0..990381be 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.4.6 + image: buoyantio/linkerd:1.7.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd.yml b/k8s-daemonset/k8s/linkerd.yml index b179ae00..d8a8f69f 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.4.6 + image: buoyantio/linkerd:1.7.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/namerd-legacy.yml b/k8s-daemonset/k8s/namerd-legacy.yml index 583b86cf..13cd95dd 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.4.6 + image: buoyantio/namerd:1.7.0 args: - /io.buoyant/namerd/config/config.yml ports: diff --git a/k8s-daemonset/k8s/namerd.yml b/k8s-daemonset/k8s/namerd.yml index 0f2f02fd..735fa4c1 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.4.6 + image: buoyantio/namerd:1.7.0 args: - /io.buoyant/namerd/config/config.yml ports: diff --git a/k8s-daemonset/k8s/servicemesh.yml b/k8s-daemonset/k8s/servicemesh.yml index 2013bb2d..baf3e968 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.4.6 + image: buoyantio/linkerd:1.7.0 env: - name: POD_IP valueFrom: diff --git a/lifecycle/linkerd1/linkerd.yml b/lifecycle/linkerd1/linkerd.yml index b2ab94ae..637039ab 100644 --- a/lifecycle/linkerd1/linkerd.yml +++ b/lifecycle/linkerd1/linkerd.yml @@ -142,7 +142,7 @@ spec: name: "l5d-config" containers: - name: l5d - image: buoyantio/linkerd:1.4.6 + image: buoyantio/linkerd:1.7.0 env: - name: POD_IP valueFrom: diff --git a/linkerd-tcp/docker-compose.yml b/linkerd-tcp/docker-compose.yml index 78d73a93..fdcda9f8 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.4.6 + image: buoyantio/linkerd:1.7.0 ports: - 4140:4140 # expose for testing only - 9990:9990 @@ -72,7 +72,7 @@ services: - "/io.buoyant/linkerd/config.yml" namerd: - image: buoyantio/namerd:1.4.6 + image: buoyantio/namerd:1.7.0 ports: - 4180:4180 - 9991:9991 diff --git a/mesos-marathon/linkerd-marathon.json b/mesos-marathon/linkerd-marathon.json index cac30985..e0821d2e 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.4.6", + "image": "buoyantio/linkerd:1.7.0", "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.4.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.7.0/bundle-exec -log.level=DEBUG -- -" } diff --git a/perf-baseline/linkerd1-perf/README.md b/perf-baseline/linkerd1-perf/README.md index 1ebd7b16..309c7b42 100644 --- a/perf-baseline/linkerd1-perf/README.md +++ b/perf-baseline/linkerd1-perf/README.md @@ -49,7 +49,7 @@ cores. Also setting `JVM_HEAP_MIN` and `JVM_HEAP_MAX` to a high value (and the same value), can help with memory fragmentation and GC pressure. For example: ```yaml -image: buoyantio/linkerd:1.4.6 +image: buoyantio/linkerd:1.7.0 env: - name: FINAGLE_WORKERS value: "32" diff --git a/perf-baseline/linkerd1-perf/linkerd1-perf.yaml b/perf-baseline/linkerd1-perf/linkerd1-perf.yaml index 645c80d9..eb8c9060 100644 --- a/perf-baseline/linkerd1-perf/linkerd1-perf.yaml +++ b/perf-baseline/linkerd1-perf/linkerd1-perf.yaml @@ -131,7 +131,7 @@ spec: name: linkerd-h1-config name: linkerd-h1-config containers: - - image: buoyantio/linkerd:1.4.6 + - image: buoyantio/linkerd:1.7.0 name: linkerd-h1-release args: - /linkerd-h1-config/linkerd.yml @@ -188,7 +188,7 @@ spec: name: linkerd-h1-config name: linkerd-h1-config containers: - - image: buoyantio/linkerd:1.4.6-openj9-experimental + - image: buoyantio/linkerd:1.7.0-openj9-experimental name: linkerd-h1-openj9 args: - /linkerd-h1-config/linkerd.yml @@ -268,7 +268,7 @@ spec: name: linkerd-h2-config name: linkerd-h2-config containers: - - image: buoyantio/linkerd:1.4.6 + - image: buoyantio/linkerd:1.7.0 name: linkerd-h2-release args: - /linkerd-h2-config/linkerd.yml @@ -330,7 +330,7 @@ spec: name: linkerd-h2-config name: linkerd-h2-config containers: - - image: buoyantio/linkerd:1.4.6-openj9-experimental + - image: buoyantio/linkerd:1.7.0-openj9-experimental name: linkerd-h2-openj9 args: - /linkerd-h2-config/linkerd.yml diff --git a/plugins/build.sbt b/plugins/build.sbt index 010b7258..229c1441 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.4.6" + "io.buoyant" %% s"linkerd-$mod" % "1.7.0" val headerClassifier = project.in(file("header-classifier")).