Merge pull request #292 from vishh/v0.12.1

v0.12.1 release
kubernetes-retired · May 14, 2015 · 8655175 · 8655175
2 parents 5f35ac0 + b39c7cd
commit 8655175
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/RELEASES.md b/RELEASES.md
@@ -1,5 +1,8 @@
 # Release Notes
 
+## 0.12.1 (5-13-2015)
+- Fixes kube master url handling via --source flag.
+
 ## 0.12.0 (5-12-2015)
 - Fixes issues related to supporting multiple sinks.
 - Resource usage of kubernetes system daemons are exported.

diff --git a/deploy/kube-config/google/heapster-controller.json b/deploy/kube-config/google/heapster-controller.json
@@ -36,7 +36,7 @@
 		"containers": [
 		    {
 			"name": "heapster",
-			"image": "kubernetes/heapster:v0.12.0",
+			"image": "kubernetes/heapster:v0.12.1",
 			"command": [
 			    "/heapster",
 			    "--source=kubernetes:http://kubernetes-ro:80",

diff --git a/deploy/kube-config/influxdb/heapster-controller.json b/deploy/kube-config/influxdb/heapster-controller.json
@@ -21,7 +21,7 @@
 	    "spec": {
 		"containers": [
 		    {
-			"image": "kubernetes/heapster:v0.12.0",
+			"image": "kubernetes/heapster:v0.12.1",
 			"name": "heapster",
 			"command": [
 			    "/heapster",

diff --git a/version/version.go b/version/version.go
@@ -19,4 +19,4 @@ package version
 // Increment major number for new feature additions and behavioral changes.
 // Increment minor number for bug fixes and performance enhancements.
 // Increment patch number for critical fixes to existing releases.
-const HeapsterVersion = "0.12.0"
+const HeapsterVersion = "0.12.1"