Merge pull request #56 from linkerd/siggy/020-release

Updates for 0.2.0 release
linkerd · Aug 15, 2018 · 7fa71c9 · 7fa71c9
2 parents 2bb1e24 + c6b4f2b
commit 7fa71c9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,11 +1,14 @@
 ## In the next release
 
+## 0.2.0 2018-08-13
+
 * Updated Prometheus to 2.3.2
 * Updated Grafana to 5.2.2
 * Modify Dockerfile and entrypoint script to leverage Grafana's dashboard and
   datasource provisioning
 * Update dashboards to leverage Grafana's latest features
 * Kubernetes config updates
+* Fix default value of `MARATHON_HOST`
 
 ## 0.1.8 2018-03-02
 

diff --git a/README.md b/README.md
@@ -85,7 +85,7 @@ for more information see [Running Consul Agent in Client Mode](https://hub.docke
 Boot `linkerd-viz` locally:
 
 ```bash
-docker run -d --net=host -p 3000:3000 -p 9191:9191 buoyantio/linkerd-viz:0.1.8 consul
+docker run -d --net=host -p 3000:3000 -p 9191:9191 buoyantio/linkerd-viz:0.2.0 consul
 ```
 
 View dashboard

diff --git a/dcos/linkerd-viz.json b/dcos/linkerd-viz.json
@@ -8,7 +8,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "buoyantio/linkerd-viz:0.1.8",
+      "image": "buoyantio/linkerd-viz:0.2.0",
       "forcePullImage": true,
       "network": "HOST",
       "privileged": true

diff --git a/k8s/linkerd-viz.yml b/k8s/linkerd-viz.yml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: linkerd-viz
-        image: buoyantio/linkerd-viz:0.1.8
+        image: buoyantio/linkerd-viz:0.2.0
         args: ["k8s"]
         imagePullPolicy: Always
         env:

diff --git a/linkerd-viz b/linkerd-viz
@@ -10,7 +10,7 @@
 PLATFORM="${1:-dcos}"
 
 CONSUL_HOST="${CONSUL_HOST:-localhost}"
-MARATHON_HOST="${MARATHON_HOST:-mesos.marathon}"
+MARATHON_HOST="${MARATHON_HOST:-marathon.mesos}"
 PUBLIC_PORT="${PUBLIC_PORT:-3000}"
 STATS_PORT="${STATS_PORT:-9191}"
 SCRAPE_INTERVAL="${SCRAPE_INTERVAL:-30s}"