From d54eb0447fb3c421dfd41405bbab3b52705905c9 Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Mon, 11 Apr 2016 18:19:28 -0700
Subject: [PATCH] examples: Start Heapster service by default in k8s

---
 CHANGES.md                        |  9 ++--
 examples/ignition/k8s-master.yaml | 79 +++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 31a61099..14e3a2a6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,12 +24,15 @@
 
 #### Examples
 
-* Upgraded Kubernetes examples to v1.2.0
+* Convert all Cloud-Configs to Ignition
+* Kubernetes
+    * Upgraded Kubernetes examples to v1.2.0
+    * Add example to install Kubernetes to disk
+    * Run Heapster service by default
 * Examples which PXE boot with or without a root partition
-* Example Kubernetes cluster installed to disk
 * Example etcd cluster installed to disk
 * Setup fleet in multi-node example clusters
-* Convert all Cloud-Configs to Ignition
+
 
 ## v0.2.0 (2016-02-09)
 
diff --git a/examples/ignition/k8s-master.yaml b/examples/ignition/k8s-master.yaml
index 2ff58212..385f8f25 100644
--- a/examples/ignition/k8s-master.yaml
+++ b/examples/ignition/k8s-master.yaml
@@ -452,6 +452,82 @@ storage:
                 }
               }
             }
+        - path: /srv/kubernetes/manifests/heapster-rc.json
+          contents: |
+            {
+              "apiVersion": "v1",
+              "kind": "ReplicationController",
+              "metadata": {
+                "labels": {
+                  "k8s-app": "heapster",
+                  "kubernetes.io/cluster-service": "true"
+                },
+                "name": "heapster-v1.0.2",
+                "namespace": "kube-system"
+              },
+              "spec": {
+                "replicas": 1,
+                "selector": {
+                  "k8s-app": "heapster"
+                },
+                "template": {
+                  "metadata": {
+                    "labels": {
+                      "k8s-app": "heapster",
+                      "kubernetes.io/cluster-service": "true"
+                    }
+                  },
+                  "spec": {
+                    "containers": [
+                      {
+                        "command": [
+                          "/heapster",
+                          "--source=kubernetes.summary_api:''",
+                          "--metric_resolution=60s"
+                        ],
+                        "image": "gcr.io/google_containers/heapster:v1.0.2",
+                        "name": "heapster",
+                        "resources": {
+                          "limits": {
+                            "cpu": "100m",
+                            "memory": "208Mi"
+                          },
+                          "requests": {
+                            "cpu": "100m",
+                            "memory": "208Mi"
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+        - path: /srv/kubernetes/manifests/heapster-svc.json
+          contents: |
+            {
+              "kind": "Service",
+              "apiVersion": "v1",
+              "metadata": {
+                "name": "heapster",
+                "namespace": "kube-system",
+                "labels": {
+                  "kubernetes.io/cluster-service": "true",
+                  "kubernetes.io/name": "Heapster"
+                }
+              },
+              "spec": {
+                "ports": [
+                  {
+                    "port": 80,
+                    "targetPort": 8082
+                  }
+                ],
+                "selector": {
+                  "k8s-app": "heapster"
+                }
+              }
+            }
         - path: /srv/kubernetes/manifests/kube-system.json
           contents: |
             {
@@ -502,6 +578,9 @@ storage:
             echo "K8S: DNS addon"
             curl --silent -H "Content-Type: application/json" -XPOST -d"$(cat /srv/kubernetes/manifests/kube-dns-rc.json)" "http://127.0.0.1:8080/api/v1/namespaces/kube-system/replicationcontrollers" > /dev/null
             curl --silent -H "Content-Type: application/json" -XPOST -d"$(cat /srv/kubernetes/manifests/kube-dns-svc.json)" "http://127.0.0.1:8080/api/v1/namespaces/kube-system/services" > /dev/null
+            echo "K8S: Heapster addon"
+            curl --silent -H "Content-Type: application/json" -XPOST -d"$(cat /srv/kubernetes/manifests/heapster-rc.json)" "http://127.0.0.1:8080/api/v1/namespaces/kube-system/replicationcontrollers" > /dev/null
+            curl --silent -H "Content-Type: application/json" -XPOST -d"$(cat /srv/kubernetes/manifests/heapster-svc.json)" "http://127.0.0.1:8080/api/v1/namespaces/kube-system/services" > /dev/null
             
 networkd:
   units: