From 46c42ee9c4a093bcf20bb07cc5d6a9c44456a257 Mon Sep 17 00:00:00 2001 From: Andrew Seigner Date: Mon, 11 Sep 2017 13:50:52 -0700 Subject: [PATCH] Update for linkerd 1.2.0 In addition to linkerd version bump, primary change includes modifying linkerd and namerd admin servers to serve on 0.0.0.0, rather than the new default loopback. --- .circleci/config.yml | 2 +- README.md | 2 +- add-steps/docker-compose.yml | 2 +- add-steps/linkerd.yml | 4 ++++ consul/docker-compose.yml | 2 +- consul/linkerd.yml | 5 +++++ dcos/ingress/linkerd-config.yml | 1 + dcos/ingress/linkerd-dcos.json | 4 ++-- dcos/linker-to-linker-with-namerd/linkerd-config.yml | 1 + dcos/linker-to-linker-with-namerd/linkerd-dcos.json | 4 ++-- dcos/linker-to-linker/linkerd-config.yml | 1 + dcos/linker-to-linker/linkerd-dcos.json | 4 ++-- dcos/linkerd-marathon-auth/linkerd-config.yml | 1 + dcos/linkerd-marathon-auth/linkerd-dcos.json | 4 ++-- dcos/linkerd-with-namerd/linkerd-config.yml | 1 + dcos/linkerd-with-namerd/linkerd-dcos.json | 4 ++-- dcos/namerd/namerd-config.yml | 3 ++- dcos/namerd/namerd-dcos.json | 6 +++--- dcos/simple-proxy/linkerd-config.yml | 1 + dcos/simple-proxy/linkerd-dcos.json | 4 ++-- ecs/linkerd-task-definition.json | 2 +- failure-accrual/docker-compose.yml | 2 +- failure-accrual/linkerd.yml | 4 ++++ getting-started/docker/docker-compose.yml | 2 +- getting-started/docker/linkerd.yaml | 4 ++++ getting-started/k8s/linkerd.yml | 6 +++++- getting-started/local/linkerd.yaml | 4 ++++ gob/dcos/linkerd-dcos-gob.yaml | 4 ++++ gob/dcos/marathon/linkerd.json | 4 ++-- gob/dcos/marathon/namerd.json | 6 +++--- gob/dcos/namerd-dcos-gob.yaml | 3 ++- gob/docker-compose.yml | 4 ++-- gob/k8s/gen-growthhack/rc.yml | 2 +- gob/k8s/gen/rc.yml | 2 +- gob/k8s/linkerd.yml | 4 ++++ gob/k8s/namerd/rc.yml | 2 +- gob/k8s/web/rc.yml | 2 +- gob/k8s/word/rc.yml | 2 +- http-proxy/README.md | 6 +++--- http-proxy/linkerd.yaml | 4 ++++ influxdb/docker-compose.yml | 4 ++-- influxdb/linkerd1.yml | 1 + influxdb/linkerd2.yml | 1 + istio/helloworld-grpc-minikube/istio-ingress.yml | 2 +- istio/istio-daemonset-grpc.yml | 3 ++- istio/istio-daemonset.yml | 3 ++- istio/istio-egress.yml | 3 ++- istio/istio-ingress.yml | 6 +++++- istio/istio-linkerd.yml | 12 +++++++++--- k8s-daemonset/README.md | 2 +- k8s-daemonset/k8s/linkerd-cni-legacy.yml | 1 + k8s-daemonset/k8s/linkerd-cni.yml | 3 ++- k8s-daemonset/k8s/linkerd-egress.yaml | 3 ++- k8s-daemonset/k8s/linkerd-grpc.yml | 3 ++- k8s-daemonset/k8s/linkerd-ingress-controller.yml | 6 +++++- k8s-daemonset/k8s/linkerd-ingress.yml | 3 ++- k8s-daemonset/k8s/linkerd-latency.yml | 3 ++- k8s-daemonset/k8s/linkerd-namerd.yml | 3 ++- k8s-daemonset/k8s/linkerd-tls-ingress-controller.yml | 6 +++++- k8s-daemonset/k8s/linkerd-tls.yml | 3 ++- k8s-daemonset/k8s/linkerd-zipkin.yml | 3 ++- k8s-daemonset/k8s/linkerd.yml | 3 ++- k8s-daemonset/k8s/namerd.yml | 9 +++++---- k8s-daemonset/k8s/servicemesh.yml | 3 ++- linkerd-tcp/docker-compose.yml | 4 ++-- linkerd-tcp/linkerd.yml | 4 ++++ linkerd-tcp/namerd.yml | 1 + mesos-marathon/linkerd-config.yml | 1 + mesos-marathon/linkerd-marathon.json | 4 ++-- plugins/build.sbt | 2 +- 70 files changed, 158 insertions(+), 72 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dc994c48..6e5e0d58 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: build: docker: - - image: buoyantio/linkerd:1.1.3 + - image: buoyantio/linkerd:1.2.0 parallelism: 1 # TODO: parallelize tests working_directory: ~/linkerd-examples diff --git a/README.md b/README.md index f9419af7..159c3ea6 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ Contains sample code for building linkerd plugins. More information: ## Testing ```bash -docker run -v `pwd`:/root/linkerd-examples --entrypoint=/root/linkerd-examples/.circleci/ci.sh buoyantio/linkerd:1.1.3 +docker run -v `pwd`:/root/linkerd-examples --entrypoint=/root/linkerd-examples/.circleci/ci.sh buoyantio/linkerd:1.2.0 ``` diff --git a/add-steps/docker-compose.yml b/add-steps/docker-compose.yml index e8512c63..d9a58429 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.1.3 + image: buoyantio/linkerd:1.2.0 ports: - 4140:4140 - 9990:9990 diff --git a/add-steps/linkerd.yml b/add-steps/linkerd.yml index 705a902d..2a5ee1ce 100644 --- a/add-steps/linkerd.yml +++ b/add-steps/linkerd.yml @@ -1,3 +1,7 @@ +admin: + ip: 0.0.0.0 + port: 9990 + # use the filesystem namer, read from the local /disco directory namers: - kind: io.l5d.fs diff --git a/consul/docker-compose.yml b/consul/docker-compose.yml index fc2c5c76..0f7bc5b7 100644 --- a/consul/docker-compose.yml +++ b/consul/docker-compose.yml @@ -12,7 +12,7 @@ services: - "7777:7777" linkerd: - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 command: ['/config.yaml'] links: - consul diff --git a/consul/linkerd.yml b/consul/linkerd.yml index 6740edfa..6017e31f 100644 --- a/consul/linkerd.yml +++ b/consul/linkerd.yml @@ -1,8 +1,13 @@ +admin: + ip: 0.0.0.0 + port: 9990 + namers: - kind: io.l5d.consul includeTag: false useHealthCheck: false host: consul + routers: - protocol: http label: /http-consul diff --git a/dcos/ingress/linkerd-config.yml b/dcos/ingress/linkerd-config.yml index 7c1f305f..e1877be0 100644 --- a/dcos/ingress/linkerd-config.yml +++ b/dcos/ingress/linkerd-config.yml @@ -3,6 +3,7 @@ # port 4242 automatically routes to "webapp" admin: + ip: 0.0.0.0 port: 9990 telemetry: diff --git a/dcos/ingress/linkerd-dcos.json b/dcos/ingress/linkerd-dcos.json index d7780bf7..635c4b92 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.1.3", + "image": "buoyantio/linkerd:1.2.0", "network": "HOST", "privileged": true } @@ -38,5 +38,5 @@ } ], "requirePorts": true, - "cmd": "echo \"{\\\"admin\\\":{\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"marathon.mesos\\\",\\\"port\\\":8080}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"linkerd_proxy\\\"},{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4242,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/svc/*=>/#/io.l5d.marathon/webapp;\\\",\\\"label\\\":\\\"external\\\"}]}\" | /io.buoyant/linkerd/1.1.3/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" + "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"marathon.mesos\\\",\\\"port\\\":8080}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"linkerd_proxy\\\"},{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4242,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/svc/*=>/#/io.l5d.marathon/webapp;\\\",\\\"label\\\":\\\"external\\\"}]}\" | /io.buoyant/linkerd/1.2.0/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" } diff --git a/dcos/linker-to-linker-with-namerd/linkerd-config.yml b/dcos/linker-to-linker-with-namerd/linkerd-config.yml index 55dace33..d515c256 100644 --- a/dcos/linker-to-linker-with-namerd/linkerd-config.yml +++ b/dcos/linker-to-linker-with-namerd/linkerd-config.yml @@ -3,6 +3,7 @@ # all service discovery managed via namerd admin: + ip: 0.0.0.0 port: 9990 telemetry: diff --git a/dcos/linker-to-linker-with-namerd/linkerd-dcos.json b/dcos/linker-to-linker-with-namerd/linkerd-dcos.json index cf5f36f9..8ae0ed64 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.1.3", + "image": "buoyantio/linkerd:1.2.0", "network": "HOST", "privileged": true } @@ -38,5 +38,5 @@ } ], "requirePorts": true, - "cmd": "echo \"{\\\"admin\\\":{\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"label\\\":\\\"outgoing\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.mesos/4100\\\",\\\"transformers\\\":[{\\\"kind\\\":\\\"io.l5d.port\\\",\\\"port\\\":4141}]}},{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4141,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"label\\\":\\\"incoming\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.mesos/4100\\\",\\\"transformers\\\":[{\\\"kind\\\":\\\"io.l5d.localhost\\\"}]}}]}\" | /io.buoyant/linkerd/1.1.3/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" + "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"label\\\":\\\"outgoing\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.mesos/4100\\\",\\\"transformers\\\":[{\\\"kind\\\":\\\"io.l5d.port\\\",\\\"port\\\":4141}]}},{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4141,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"label\\\":\\\"incoming\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.mesos/4100\\\",\\\"transformers\\\":[{\\\"kind\\\":\\\"io.l5d.localhost\\\"}]}}]}\" | /io.buoyant/linkerd/1.2.0/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" } diff --git a/dcos/linker-to-linker/linkerd-config.yml b/dcos/linker-to-linker/linkerd-config.yml index 874adb33..d9ce1d53 100644 --- a/dcos/linker-to-linker/linkerd-config.yml +++ b/dcos/linker-to-linker/linkerd-config.yml @@ -2,6 +2,7 @@ # routes from port 4140 on source node to 4141 on destination node admin: + ip: 0.0.0.0 port: 9990 telemetry: diff --git a/dcos/linker-to-linker/linkerd-dcos.json b/dcos/linker-to-linker/linkerd-dcos.json index c48e8ee6..e1c77b27 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.1.3", + "image": "buoyantio/linkerd:1.2.0", "network": "HOST", "privileged": true } @@ -38,5 +38,5 @@ } ], "requirePorts": true, - "cmd": "echo \"{\\\"admin\\\":{\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"marathon.mesos\\\",\\\"port\\\":8080}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"outgoing\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"default\\\",\\\"transformers\\\":[{\\\"kind\\\":\\\"io.l5d.port\\\",\\\"port\\\":4141}]}},{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4141,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"incoming\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"default\\\",\\\"transformers\\\":[{\\\"kind\\\":\\\"io.l5d.localhost\\\"}]}}]}\" | /io.buoyant/linkerd/1.1.3/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" + "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"marathon.mesos\\\",\\\"port\\\":8080}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"outgoing\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"default\\\",\\\"transformers\\\":[{\\\"kind\\\":\\\"io.l5d.port\\\",\\\"port\\\":4141}]}},{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4141,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"incoming\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"default\\\",\\\"transformers\\\":[{\\\"kind\\\":\\\"io.l5d.localhost\\\"}]}}]}\" | /io.buoyant/linkerd/1.2.0/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" } diff --git a/dcos/linkerd-marathon-auth/linkerd-config.yml b/dcos/linkerd-marathon-auth/linkerd-config.yml index 6d27b69a..452d563b 100644 --- a/dcos/linkerd-marathon-auth/linkerd-config.yml +++ b/dcos/linkerd-marathon-auth/linkerd-config.yml @@ -3,6 +3,7 @@ # configured to connect to DC/OS in Strict mode, via Marathon TLS admin: + ip: 0.0.0.0 port: 9990 telemetry: diff --git a/dcos/linkerd-marathon-auth/linkerd-dcos.json b/dcos/linkerd-marathon-auth/linkerd-dcos.json index 3641ade6..de1ad519 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.1.3", + "image": "buoyantio/linkerd:1.2.0", "network": "HOST", "privileged": true } @@ -41,5 +41,5 @@ } }, "requirePorts": true, - "cmd": "echo \"{\\\"admin\\\":{\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"leader.mesos\\\",\\\"port\\\":443,\\\"prefix\\\":\\\"/io.l5d.marathon\\\",\\\"uriPrefix\\\":\\\"/marathon\\\",\\\"tls\\\":{\\\"disableValidation\\\":false,\\\"commonName\\\":\\\"master.mesos\\\",\\\"trustCerts\\\":[\\\"/mnt/mesos/sandbox/.ssl/ca.crt\\\"]}}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"linkerd_proxy\\\"}]}\" | /io.buoyant/linkerd/1.1.3/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" + "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"leader.mesos\\\",\\\"port\\\":443,\\\"prefix\\\":\\\"/io.l5d.marathon\\\",\\\"uriPrefix\\\":\\\"/marathon\\\",\\\"tls\\\":{\\\"disableValidation\\\":false,\\\"commonName\\\":\\\"master.mesos\\\",\\\"trustCerts\\\":[\\\"/mnt/mesos/sandbox/.ssl/ca.crt\\\"]}}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"linkerd_proxy\\\"}]}\" | /io.buoyant/linkerd/1.2.0/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" } diff --git a/dcos/linkerd-with-namerd/linkerd-config.yml b/dcos/linkerd-with-namerd/linkerd-config.yml index 7267001d..902e800f 100644 --- a/dcos/linkerd-with-namerd/linkerd-config.yml +++ b/dcos/linkerd-with-namerd/linkerd-config.yml @@ -3,6 +3,7 @@ # all service discovery managed via namerd admin: + ip: 0.0.0.0 port: 9990 telemetry: diff --git a/dcos/linkerd-with-namerd/linkerd-dcos.json b/dcos/linkerd-with-namerd/linkerd-dcos.json index da58cd1e..749e4cb4 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.1.3", + "image": "buoyantio/linkerd:1.2.0", "network": "HOST", "privileged": true } @@ -33,5 +33,5 @@ } ], "requirePorts": true, - "cmd": "echo \"{\\\"admin\\\":{\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"label\\\":\\\"linkerd_proxy\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.mesos/4100\\\"}}]}\" | /io.buoyant/linkerd/1.1.3/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" + "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"label\\\":\\\"linkerd_proxy\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.mesos/4100\\\"}}]}\" | /io.buoyant/linkerd/1.2.0/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" } diff --git a/dcos/namerd/namerd-config.yml b/dcos/namerd/namerd-config.yml index 9215c1c0..24d4ef7a 100644 --- a/dcos/namerd/namerd-config.yml +++ b/dcos/namerd/namerd-config.yml @@ -3,7 +3,8 @@ # thrift interface (for linkerd) on port 4100 admin: - port: 9001 + ip: 0.0.0.0 + port: 9991 storage: kind: io.l5d.zk diff --git a/dcos/namerd/namerd-dcos.json b/dcos/namerd/namerd-dcos.json index c5c7c852..a171e392 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.1.3-dcos", + "image": "buoyantio/namerd:1.2.0-dcos", "network": "HOST", "privileged": true } @@ -22,7 +22,7 @@ ], "portDefinitions": [ { - "port": 9001, + "port": 9991, "protocol": "tcp", "name": "admin" }, @@ -38,5 +38,5 @@ } ], "requirePorts":true, - "cmd": "echo \"{\\\"admin\\\":{\\\"port\\\":9001},\\\"storage\\\":{\\\"kind\\\":\\\"io.l5d.zk\\\",\\\"zkAddrs\\\":[{\\\"host\\\":\\\"leader.mesos\\\",\\\"port\\\":2181}],\\\"pathPrefix\\\":\\\"/dtabs\\\",\\\"sessionTimeoutMs\\\":10000},\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"marathon.mesos\\\",\\\"port\\\":8080}],\\\"interfaces\\\":[{\\\"kind\\\":\\\"io.l5d.thriftNameInterpreter\\\",\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":4100},{\\\"kind\\\":\\\"io.l5d.httpController\\\",\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":4180}]}\" | /io.buoyant/namerd/1.1.3/dcos-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" + "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9991},\\\"storage\\\":{\\\"kind\\\":\\\"io.l5d.zk\\\",\\\"zkAddrs\\\":[{\\\"host\\\":\\\"leader.mesos\\\",\\\"port\\\":2181}],\\\"pathPrefix\\\":\\\"/dtabs\\\",\\\"sessionTimeoutMs\\\":10000},\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"marathon.mesos\\\",\\\"port\\\":8080}],\\\"interfaces\\\":[{\\\"kind\\\":\\\"io.l5d.thriftNameInterpreter\\\",\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":4100},{\\\"kind\\\":\\\"io.l5d.httpController\\\",\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":4180}]}\" | /io.buoyant/namerd/1.2.0/dcos-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" } diff --git a/dcos/simple-proxy/linkerd-config.yml b/dcos/simple-proxy/linkerd-config.yml index 4597d316..6c780b48 100644 --- a/dcos/simple-proxy/linkerd-config.yml +++ b/dcos/simple-proxy/linkerd-config.yml @@ -2,6 +2,7 @@ # listens on port 4140, routes via http_proxy or host header admin: + ip: 0.0.0.0 port: 9990 telemetry: diff --git a/dcos/simple-proxy/linkerd-dcos.json b/dcos/simple-proxy/linkerd-dcos.json index e5e74389..5dd035d4 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.1.3", + "image": "buoyantio/linkerd:1.2.0", "network": "HOST", "privileged": true } @@ -33,5 +33,5 @@ } ], "requirePorts": true, - "cmd": "echo \"{\\\"admin\\\":{\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"marathon.mesos\\\",\\\"port\\\":8080}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"linkerd_proxy\\\"}]}\" | /io.buoyant/linkerd/1.1.3/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" + "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"marathon.mesos\\\",\\\"port\\\":8080}],\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dtab\\\":\\\"/marathonId=>/#/io.l5d.marathon;/svc=>/$/io.buoyant.http.domainToPathPfx/marathonId;\\\",\\\"label\\\":\\\"linkerd_proxy\\\"}]}\" | /io.buoyant/linkerd/1.2.0/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" } diff --git a/ecs/linkerd-task-definition.json b/ecs/linkerd-task-definition.json index 929891b8..8e344456 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.1.3", + "image": "docker.io/buoyantio/linkerd:1.2.0", "command": [ "-log.level=DEBUG", "-com.twitter.finagle.tracing.debugTrace=true", diff --git a/failure-accrual/docker-compose.yml b/failure-accrual/docker-compose.yml index 1221f701..d7b805a3 100644 --- a/failure-accrual/docker-compose.yml +++ b/failure-accrual/docker-compose.yml @@ -50,7 +50,7 @@ services: build: . linkerd: - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 ports: - 9990:9990 volumes: diff --git a/failure-accrual/linkerd.yml b/failure-accrual/linkerd.yml index ea5fac6b..85f0b9b1 100644 --- a/failure-accrual/linkerd.yml +++ b/failure-accrual/linkerd.yml @@ -1,3 +1,7 @@ +admin: + ip: 0.0.0.0 + port: 9990 + namers: - kind: io.l5d.fs rootDir: /disco diff --git a/getting-started/docker/docker-compose.yml b/getting-started/docker/docker-compose.yml index 1b7f0288..fe1b3598 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.1.3 + image: buoyantio/linkerd:1.2.0 ports: - "4140:4140" - "9990:9990" diff --git a/getting-started/docker/linkerd.yaml b/getting-started/docker/linkerd.yaml index 6e1c419c..30719461 100644 --- a/getting-started/docker/linkerd.yaml +++ b/getting-started/docker/linkerd.yaml @@ -1,3 +1,7 @@ +admin: + ip: 0.0.0.0 + port: 9990 + # The filesystem namer (io.l5d.fs) watches the disco directory for changes. # Each file in this directory represents a concrete name and contains a list # of hostname/port pairs. diff --git a/getting-started/k8s/linkerd.yml b/getting-started/k8s/linkerd.yml index 7765139a..99d28eca 100644 --- a/getting-started/k8s/linkerd.yml +++ b/getting-started/k8s/linkerd.yml @@ -7,6 +7,10 @@ data: config.yml: |- # The Kubernetes namer (io.l5d.k8s) queries the Kubernetes master API # for a list of pods with a given name. + admin: + ip: 0.0.0.0 + port: 9990 + namers: - kind: io.l5d.k8s experimental: true @@ -42,7 +46,7 @@ spec: spec: containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 args: - "/io.buoyant/linkerd/config/config.yml" ports: diff --git a/getting-started/local/linkerd.yaml b/getting-started/local/linkerd.yaml index 2b689ae3..ec017cbf 100644 --- a/getting-started/local/linkerd.yaml +++ b/getting-started/local/linkerd.yaml @@ -1,3 +1,7 @@ +admin: + ip: 0.0.0.0 + port: 9990 + # The filesystem namer (io.l5d.fs) watches the disco directory for changes. # Each file in this directory represents a concrete name and contains a list # of hostname/port pairs. diff --git a/gob/dcos/linkerd-dcos-gob.yaml b/gob/dcos/linkerd-dcos-gob.yaml index bad9c87e..009c986e 100644 --- a/gob/dcos/linkerd-dcos-gob.yaml +++ b/gob/dcos/linkerd-dcos-gob.yaml @@ -1,3 +1,7 @@ +admin: + ip: 0.0.0.0 + port: 9990 + routers: - protocol: http interpreter: diff --git a/gob/dcos/marathon/linkerd.json b/gob/dcos/marathon/linkerd.json index ac8dc29a..4408ab3a 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.1.3", + "image": "buoyantio/linkerd:1.2.0", "network": "HOST", "privileged": true } @@ -38,5 +38,5 @@ } ], "requirePorts": true, - "cmd": "echo \"{\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.slave.mesos/4100\\\"},\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}]},{\\\"protocol\\\":\\\"h2\\\",\\\"experimental\\\":true,\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.slave.mesos/4100\\\"},\\\"servers\\\":[{\\\"port\\\":4142,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dstPrefix\\\":\\\"/grpc\\\",\\\"identifier\\\":{\\\"kind\\\":\\\"io.l5d.header.path\\\"}}]}\" | /io.buoyant/linkerd/1.1.3/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" + "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"routers\\\":[{\\\"protocol\\\":\\\"http\\\",\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.slave.mesos/4100\\\"},\\\"servers\\\":[{\\\"port\\\":4140,\\\"ip\\\":\\\"0.0.0.0\\\"}]},{\\\"protocol\\\":\\\"h2\\\",\\\"experimental\\\":true,\\\"interpreter\\\":{\\\"kind\\\":\\\"io.l5d.namerd\\\",\\\"dst\\\":\\\"/$/inet/namerd.marathon.slave.mesos/4100\\\"},\\\"servers\\\":[{\\\"port\\\":4142,\\\"ip\\\":\\\"0.0.0.0\\\"}],\\\"dstPrefix\\\":\\\"/grpc\\\",\\\"identifier\\\":{\\\"kind\\\":\\\"io.l5d.header.path\\\"}}]}\" | /io.buoyant/linkerd/1.2.0/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" } diff --git a/gob/dcos/marathon/namerd.json b/gob/dcos/marathon/namerd.json index 581a7140..90c6668c 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.1.3-dcos", + "image": "buoyantio/namerd:1.2.0-dcos", "network": "HOST", "privileged": true } @@ -22,7 +22,7 @@ ], "portDefinitions": [ { - "port": 9001, + "port": 9991, "protocol": "tcp", "name": "admin" }, @@ -38,5 +38,5 @@ } ], "requirePorts":true, - "cmd": "echo \"{\\\"admin\\\":{\\\"port\\\":9001},\\\"storage\\\":{\\\"kind\\\":\\\"io.l5d.zk\\\",\\\"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.1.3/dcos-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" + "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9991},\\\"storage\\\":{\\\"kind\\\":\\\"io.l5d.zk\\\",\\\"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.2.0/dcos-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" } diff --git a/gob/dcos/namerd-dcos-gob.yaml b/gob/dcos/namerd-dcos-gob.yaml index 3ab097c7..b314ea04 100644 --- a/gob/dcos/namerd-dcos-gob.yaml +++ b/gob/dcos/namerd-dcos-gob.yaml @@ -1,5 +1,6 @@ admin: - port: 9001 + ip: 0.0.0.0 + port: 9991 storage: kind: io.l5d.zk experimental: true diff --git a/gob/docker-compose.yml b/gob/docker-compose.yml index 7ea320ef..68956a02 100644 --- a/gob/docker-compose.yml +++ b/gob/docker-compose.yml @@ -20,14 +20,14 @@ services: command: word linkerd: - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.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.1.3 + image: buoyantio/namerd:1.2.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 c54c972e..e4183e2f 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.1.3 + image: buoyantio/linkerd:1.2.0 args: - "/io.buoyant/linkerd/config/config.yml" diff --git a/gob/k8s/gen/rc.yml b/gob/k8s/gen/rc.yml index 6776b8fb..3e5bf0e3 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.1.3 + image: buoyantio/linkerd:1.2.0 args: - "/io.buoyant/linkerd/config/config.yml" diff --git a/gob/k8s/linkerd.yml b/gob/k8s/linkerd.yml index da4a4b72..13d0b0ef 100644 --- a/gob/k8s/linkerd.yml +++ b/gob/k8s/linkerd.yml @@ -5,6 +5,10 @@ metadata: namespace: default data: config.yml: |- + admin: + ip: 0.0.0.0 + port: 9990 + routers: - protocol: http servers: diff --git a/gob/k8s/namerd/rc.yml b/gob/k8s/namerd/rc.yml index a5714c3a..9a279ceb 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.1.3 + image: buoyantio/namerd:1.2.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 f38f4bc7..e78a4f46 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.1.3 + image: buoyantio/linkerd:1.2.0 args: - /io.buoyant/linkerd/config/config.yml diff --git a/gob/k8s/word/rc.yml b/gob/k8s/word/rc.yml index 9600c3d5..d6e2af01 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.1.3 + image: buoyantio/linkerd:1.2.0 args: - "/io.buoyant/linkerd/config/config.yml" diff --git a/http-proxy/README.md b/http-proxy/README.md index ac0389d4..5060db0e 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.1.3/linkerd-1.1.3-exec -chmod +x linkerd-1.1.3-exec -./linkerd-1.1.3-exec ./linkerd.yaml +curl -sLO https://github.com/linkerd/linkerd/releases/download/1.2.0/linkerd-1.2.0-exec +chmod +x linkerd-1.2.0-exec +./linkerd-1.2.0-exec ./linkerd.yaml ``` ## Test diff --git a/http-proxy/linkerd.yaml b/http-proxy/linkerd.yaml index 9b659b1f..26b32d6f 100644 --- a/http-proxy/linkerd.yaml +++ b/http-proxy/linkerd.yaml @@ -1,3 +1,7 @@ +admin: + ip: 0.0.0.0 + port: 9990 + routers: - protocol: http dtab: /svc/webapp => /$/inet/127.1/8888 diff --git a/influxdb/docker-compose.yml b/influxdb/docker-compose.yml index 46b4f177..fd6be24d 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.1.3 + image: buoyantio/linkerd:1.2.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.1.3 + image: buoyantio/linkerd:1.2.0 volumes: - ./linkerd2.yml:/io.buoyant/linkerd/config.yml:ro - ./disco:/disco:ro diff --git a/influxdb/linkerd1.yml b/influxdb/linkerd1.yml index 136cac49..5321d243 100644 --- a/influxdb/linkerd1.yml +++ b/influxdb/linkerd1.yml @@ -1,4 +1,5 @@ admin: + ip: 0.0.0.0 port: 9990 # use the filesystem namer, read from the local /disco directory diff --git a/influxdb/linkerd2.yml b/influxdb/linkerd2.yml index 0d6710fb..e4918c53 100644 --- a/influxdb/linkerd2.yml +++ b/influxdb/linkerd2.yml @@ -1,4 +1,5 @@ admin: + ip: 0.0.0.0 port: 9990 # use the filesystem namer, read from the local /disco directory diff --git a/istio/helloworld-grpc-minikube/istio-ingress.yml b/istio/helloworld-grpc-minikube/istio-ingress.yml index 2c9ae40f..ab387f3f 100644 --- a/istio/helloworld-grpc-minikube/istio-ingress.yml +++ b/istio/helloworld-grpc-minikube/istio-ingress.yml @@ -48,7 +48,7 @@ spec: name: "istio-ingress-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 env: - name: POD_IP valueFrom: diff --git a/istio/istio-daemonset-grpc.yml b/istio/istio-daemonset-grpc.yml index 41faeaf1..23701dea 100644 --- a/istio/istio-daemonset-grpc.yml +++ b/istio/istio-daemonset-grpc.yml @@ -9,6 +9,7 @@ metadata: data: config.yaml: |- admin: + ip: 0.0.0.0 port: 9990 telemetry: @@ -74,7 +75,7 @@ spec: name: "l5d-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 env: - name: POD_IP valueFrom: diff --git a/istio/istio-daemonset.yml b/istio/istio-daemonset.yml index 14482be7..9a5d1046 100644 --- a/istio/istio-daemonset.yml +++ b/istio/istio-daemonset.yml @@ -9,6 +9,7 @@ metadata: data: config.yaml: |- admin: + ip: 0.0.0.0 port: 9990 telemetry: @@ -73,7 +74,7 @@ spec: name: "l5d-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 env: - name: POD_IP valueFrom: diff --git a/istio/istio-egress.yml b/istio/istio-egress.yml index 111495e0..3a51c529 100644 --- a/istio/istio-egress.yml +++ b/istio/istio-egress.yml @@ -9,6 +9,7 @@ metadata: data: config.yaml: |- admin: + ip: 0.0.0.0 port: 9990 telemetry: @@ -55,7 +56,7 @@ spec: name: "istio-egress-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 args: - /io.buoyant/linkerd/config/config.yaml ports: diff --git a/istio/istio-ingress.yml b/istio/istio-ingress.yml index 9a0d5430..ec58f6fd 100644 --- a/istio/istio-ingress.yml +++ b/istio/istio-ingress.yml @@ -8,6 +8,10 @@ metadata: name: istio-ingress-config data: config.yaml: |- + admin: + ip: 0.0.0.0 + port: 9990 + telemetry: - kind: io.l5d.prometheus - kind: io.l5d.recentRequests @@ -51,7 +55,7 @@ spec: name: "istio-ingress-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 env: - name: POD_IP valueFrom: diff --git a/istio/istio-linkerd.yml b/istio/istio-linkerd.yml index 50681c0b..c7872659 100644 --- a/istio/istio-linkerd.yml +++ b/istio/istio-linkerd.yml @@ -133,6 +133,7 @@ metadata: data: config.yaml: |- admin: + ip: 0.0.0.0 port: 9990 telemetry: @@ -194,7 +195,7 @@ spec: name: "l5d-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 env: - name: POD_IP valueFrom: @@ -251,6 +252,10 @@ metadata: name: istio-ingress-config data: config.yaml: |- + admin: + ip: 0.0.0.0 + port: 9990 + telemetry: - kind: io.l5d.prometheus - kind: io.l5d.recentRequests @@ -291,7 +296,7 @@ spec: name: "istio-ingress-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 env: - name: POD_IP valueFrom: @@ -342,6 +347,7 @@ metadata: data: config.yaml: |- admin: + ip: 0.0.0.0 port: 9990 telemetry: @@ -388,7 +394,7 @@ spec: name: "istio-egress-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 args: - /io.buoyant/linkerd/config/config.yaml ports: diff --git a/k8s-daemonset/README.md b/k8s-daemonset/README.md index 4c33dcff..3f0e3900 100644 --- a/k8s-daemonset/README.md +++ b/k8s-daemonset/README.md @@ -225,7 +225,7 @@ If you deployed namerd, view the namerd admin dashboard: ```bash NAMERD_INGRESS_LB=$(kubectl get svc namerd -o jsonpath="{.status.loadBalancer.ingress[0].*}") -open http://$NAMERD_INGRESS_LB:9990 # on OS X +open http://$NAMERD_INGRESS_LB:9991 # on OS X ``` ### Zipkin diff --git a/k8s-daemonset/k8s/linkerd-cni-legacy.yml b/k8s-daemonset/k8s/linkerd-cni-legacy.yml index 087b0dcc..8eb25860 100644 --- a/k8s-daemonset/k8s/linkerd-cni-legacy.yml +++ b/k8s-daemonset/k8s/linkerd-cni-legacy.yml @@ -11,6 +11,7 @@ metadata: data: config.yaml: |- admin: + ip: 0.0.0.0 port: 9990 namers: diff --git a/k8s-daemonset/k8s/linkerd-cni.yml b/k8s-daemonset/k8s/linkerd-cni.yml index 2caec2bf..c63b6b8d 100644 --- a/k8s-daemonset/k8s/linkerd-cni.yml +++ b/k8s-daemonset/k8s/linkerd-cni.yml @@ -11,6 +11,7 @@ metadata: data: config.yaml: |- admin: + ip: 0.0.0.0 port: 9990 namers: @@ -86,7 +87,7 @@ spec: name: "l5d-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 env: - name: NODE_NAME valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-egress.yaml b/k8s-daemonset/k8s/linkerd-egress.yaml index cd71e34f..2e9468dc 100644 --- a/k8s-daemonset/k8s/linkerd-egress.yaml +++ b/k8s-daemonset/k8s/linkerd-egress.yaml @@ -7,6 +7,7 @@ metadata: data: config.yaml: |- admin: + ip: 0.0.0.0 port: 9990 namers: @@ -83,7 +84,7 @@ spec: name: "l5d-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-grpc.yml b/k8s-daemonset/k8s/linkerd-grpc.yml index 89fe7701..1b74501d 100644 --- a/k8s-daemonset/k8s/linkerd-grpc.yml +++ b/k8s-daemonset/k8s/linkerd-grpc.yml @@ -7,6 +7,7 @@ metadata: data: config.yaml: |- admin: + ip: 0.0.0.0 port: 9990 namers: @@ -83,7 +84,7 @@ spec: name: "l5d-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.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 a416451e..2d1e52eb 100644 --- a/k8s-daemonset/k8s/linkerd-ingress-controller.yml +++ b/k8s-daemonset/k8s/linkerd-ingress-controller.yml @@ -5,6 +5,10 @@ metadata: name: l5d-config data: config.yaml: |- + admin: + ip: 0.0.0.0 + port: 9990 + namers: - kind: io.l5d.k8s @@ -39,7 +43,7 @@ spec: name: "l5d-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-ingress.yml b/k8s-daemonset/k8s/linkerd-ingress.yml index f05db6a9..23d6fae5 100644 --- a/k8s-daemonset/k8s/linkerd-ingress.yml +++ b/k8s-daemonset/k8s/linkerd-ingress.yml @@ -7,6 +7,7 @@ metadata: data: config.yaml: |- admin: + ip: 0.0.0.0 port: 9990 namers: @@ -100,7 +101,7 @@ spec: name: "l5d-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-latency.yml b/k8s-daemonset/k8s/linkerd-latency.yml index 7e5f10f2..4e8a43f2 100644 --- a/k8s-daemonset/k8s/linkerd-latency.yml +++ b/k8s-daemonset/k8s/linkerd-latency.yml @@ -7,6 +7,7 @@ metadata: data: config.yaml: |- admin: + ip: 0.0.0.0 port: 9990 namers: @@ -79,7 +80,7 @@ spec: name: "l5d-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-namerd.yml b/k8s-daemonset/k8s/linkerd-namerd.yml index f1c743eb..9e69aa6d 100644 --- a/k8s-daemonset/k8s/linkerd-namerd.yml +++ b/k8s-daemonset/k8s/linkerd-namerd.yml @@ -8,6 +8,7 @@ metadata: data: config.yaml: |- admin: + ip: 0.0.0.0 port: 9990 telemetry: @@ -77,7 +78,7 @@ spec: name: "l5d-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.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 1ed83dc1..2759fd79 100644 --- a/k8s-daemonset/k8s/linkerd-tls-ingress-controller.yml +++ b/k8s-daemonset/k8s/linkerd-tls-ingress-controller.yml @@ -5,6 +5,10 @@ metadata: name: l5d-config data: config.yaml: |- + admin: + ip: 0.0.0.0 + port: 9990 + namers: - kind: io.l5d.k8s @@ -45,7 +49,7 @@ spec: secretName: ingress-certs containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-tls.yml b/k8s-daemonset/k8s/linkerd-tls.yml index de17c10e..5c630b73 100644 --- a/k8s-daemonset/k8s/linkerd-tls.yml +++ b/k8s-daemonset/k8s/linkerd-tls.yml @@ -8,6 +8,7 @@ metadata: data: config.yaml: |- admin: + ip: 0.0.0.0 port: 9990 namers: @@ -90,7 +91,7 @@ spec: secretName: certificates containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd-zipkin.yml b/k8s-daemonset/k8s/linkerd-zipkin.yml index e791e239..84f3100c 100644 --- a/k8s-daemonset/k8s/linkerd-zipkin.yml +++ b/k8s-daemonset/k8s/linkerd-zipkin.yml @@ -7,6 +7,7 @@ metadata: data: config.yaml: |- admin: + ip: 0.0.0.0 port: 9990 namers: @@ -82,7 +83,7 @@ spec: name: "l5d-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/linkerd.yml b/k8s-daemonset/k8s/linkerd.yml index c483a737..93f104eb 100644 --- a/k8s-daemonset/k8s/linkerd.yml +++ b/k8s-daemonset/k8s/linkerd.yml @@ -7,6 +7,7 @@ metadata: data: config.yaml: |- admin: + ip: 0.0.0.0 port: 9990 namers: @@ -78,7 +79,7 @@ spec: name: "l5d-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 env: - name: POD_IP valueFrom: diff --git a/k8s-daemonset/k8s/namerd.yml b/k8s-daemonset/k8s/namerd.yml index 8e639b74..2e8dc68f 100644 --- a/k8s-daemonset/k8s/namerd.yml +++ b/k8s-daemonset/k8s/namerd.yml @@ -14,7 +14,8 @@ metadata: data: config.yml: |- admin: - port: 9990 + ip: 0.0.0.0 + port: 9991 namers: - kind: io.l5d.k8s @@ -56,7 +57,7 @@ spec: name: namerd-config containers: - name: namerd - image: buoyantio/namerd:1.1.3 + image: buoyantio/namerd:1.2.0 args: - /io.buoyant/namerd/config/config.yml ports: @@ -65,7 +66,7 @@ spec: - name: http containerPort: 4180 - name: admin - containerPort: 9990 + containerPort: 9991 volumeMounts: - name: "namerd-config" mountPath: "/io.buoyant/namerd/config" @@ -91,7 +92,7 @@ spec: - name: http port: 4180 - name: admin - port: 9990 + port: 9991 --- kind: ConfigMap apiVersion: v1 diff --git a/k8s-daemonset/k8s/servicemesh.yml b/k8s-daemonset/k8s/servicemesh.yml index 0e30de3d..fd2072ab 100644 --- a/k8s-daemonset/k8s/servicemesh.yml +++ b/k8s-daemonset/k8s/servicemesh.yml @@ -47,6 +47,7 @@ metadata: data: config.yaml: |- admin: + ip 0.0.0.0 port: 9990 # Namers provide Linkerd with service discovery information. To use a @@ -295,7 +296,7 @@ spec: name: "l5d-config" containers: - name: l5d - image: buoyantio/linkerd:1.1.3 + image: buoyantio/linkerd:1.2.0 env: - name: POD_IP valueFrom: diff --git a/linkerd-tcp/docker-compose.yml b/linkerd-tcp/docker-compose.yml index 8784501c..070f8611 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.1.3 + image: buoyantio/linkerd:1.2.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.1.3 + image: buoyantio/namerd:1.2.0 ports: - 4180:4180 - 9991:9991 diff --git a/linkerd-tcp/linkerd.yml b/linkerd-tcp/linkerd.yml index f4af6896..a90f184f 100644 --- a/linkerd-tcp/linkerd.yml +++ b/linkerd-tcp/linkerd.yml @@ -1,3 +1,7 @@ +admin: + ip: 0.0.0.0 + port: 9990 + telemetry: - kind: io.l5d.prometheus - kind: io.l5d.recentRequests diff --git a/linkerd-tcp/namerd.yml b/linkerd-tcp/namerd.yml index 0d5ca8ca..47bf2cd9 100644 --- a/linkerd-tcp/namerd.yml +++ b/linkerd-tcp/namerd.yml @@ -1,4 +1,5 @@ admin: + ip: 0.0.0.0 port: 9991 namers: diff --git a/mesos-marathon/linkerd-config.yml b/mesos-marathon/linkerd-config.yml index b267c75a..92cd1983 100644 --- a/mesos-marathon/linkerd-config.yml +++ b/mesos-marathon/linkerd-config.yml @@ -3,6 +3,7 @@ # expects marathon to be available on localhost admin: + ip: 0.0.0.0 port: 9990 telemetry: diff --git a/mesos-marathon/linkerd-marathon.json b/mesos-marathon/linkerd-marathon.json index d55bf01f..c3cc1fe3 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.1.3", + "image": "buoyantio/linkerd:1.2.0", "network": "HOST", "privileged": true } @@ -36,5 +36,5 @@ } ], "requirePorts": true, - "cmd": "echo \"{\\\"admin\\\":{\\\"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.1.3/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" + "cmd": "echo \"{\\\"admin\\\":{\\\"ip\\\":\\\"0.0.0.0\\\",\\\"port\\\":9990},\\\"telemetry\\\":[{\\\"kind\\\":\\\"io.l5d.prometheus\\\"}],\\\"namers\\\":[{\\\"kind\\\":\\\"io.l5d.marathon\\\",\\\"host\\\":\\\"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.2.0/bundle-exec -log.level=DEBUG -com.twitter.finagle.tracing.debugTrace=true -- -" } diff --git a/plugins/build.sbt b/plugins/build.sbt index 903bd64f..7ed51348 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.1.3" + "io.buoyant" %% s"linkerd-$mod" % "1.2.0" val headerClassifier = project.in(file("header-classifier")).