From cc4e6e1008be0705ab73d36369d443731215485c Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Mon, 18 Apr 2016 16:49:16 -0700 Subject: [PATCH] examples: Upgrade k8s from v1.2.0 to v1.2.2 * Change Heapster from a rc to a deployment * Use the heapster-nanny resizer --- examples/groups/k8s-docker/node1.json | 2 +- examples/groups/k8s-docker/node2.json | 2 +- examples/groups/k8s-docker/node3.json | 2 +- examples/groups/k8s-install/node1.json | 2 +- examples/groups/k8s-install/node2.json | 2 +- examples/groups/k8s-install/node3.json | 2 +- examples/groups/k8s/node1.json | 2 +- examples/groups/k8s/node2.json | 2 +- examples/groups/k8s/node3.json | 2 +- examples/ignition/k8s-master.yaml | 65 ++++++++++++++++++++++---- 10 files changed, 65 insertions(+), 18 deletions(-) diff --git a/examples/groups/k8s-docker/node1.json b/examples/groups/k8s-docker/node1.json index 6c440114..02ddc03c 100644 --- a/examples/groups/k8s-docker/node1.json +++ b/examples/groups/k8s-docker/node1.json @@ -15,7 +15,7 @@ "k8s_etcd_endpoints": "http://172.17.0.21:2379,http://172.17.0.22:2379,http://172.17.0.23:2379", "k8s_pod_network": "10.2.0.0/16", "k8s_service_ip_range": "10.3.0.0/24", - "k8s_version": "v1.2.0_coreos.1", + "k8s_version": "v1.2.2_coreos.0", "networkd_address": "172.17.0.21/16", "networkd_dns": "172.17.0.3", "networkd_gateway": "172.17.0.1", diff --git a/examples/groups/k8s-docker/node2.json b/examples/groups/k8s-docker/node2.json index 0ad67a50..921baecc 100644 --- a/examples/groups/k8s-docker/node2.json +++ b/examples/groups/k8s-docker/node2.json @@ -14,7 +14,7 @@ "k8s_controller_endpoint": "https://172.17.0.21", "k8s_dns_service_ip": "10.3.0.1", "k8s_etcd_endpoints": "http://172.17.0.21:2379,http://172.17.0.22:2379,http://172.17.0.23:2379", - "k8s_version": "v1.2.0_coreos.1", + "k8s_version": "v1.2.2_coreos.0", "networkd_address": "172.17.0.22/16", "networkd_dns": "172.17.0.3", "networkd_gateway": "172.17.0.1", diff --git a/examples/groups/k8s-docker/node3.json b/examples/groups/k8s-docker/node3.json index 28401f3d..83740724 100644 --- a/examples/groups/k8s-docker/node3.json +++ b/examples/groups/k8s-docker/node3.json @@ -14,7 +14,7 @@ "k8s_controller_endpoint": "https://172.17.0.21", "k8s_dns_service_ip": "10.3.0.1", "k8s_etcd_endpoints": "http://172.17.0.21:2379,http://172.17.0.22:2379,http://172.17.0.23:2379", - "k8s_version": "v1.2.0_coreos.1", + "k8s_version": "v1.2.2_coreos.0", "networkd_address": "172.17.0.23/16", "networkd_dns": "172.17.0.3", "networkd_gateway": "172.17.0.1", diff --git a/examples/groups/k8s-install/node1.json b/examples/groups/k8s-install/node1.json index 2e7b18c3..1cf84571 100644 --- a/examples/groups/k8s-install/node1.json +++ b/examples/groups/k8s-install/node1.json @@ -16,7 +16,7 @@ "k8s_etcd_endpoints": "http://172.15.0.21:2379,http://172.15.0.22:2379,http://172.15.0.23:2379", "k8s_pod_network": "10.2.0.0/16", "k8s_service_ip_range": "10.3.0.0/24", - "k8s_version": "v1.2.0_coreos.1", + "k8s_version": "v1.2.2_coreos.0", "networkd_address": "172.15.0.21/16", "networkd_dns": "172.15.0.3", "networkd_gateway": "172.15.0.1", diff --git a/examples/groups/k8s-install/node2.json b/examples/groups/k8s-install/node2.json index b3c8de0f..a8f881ee 100644 --- a/examples/groups/k8s-install/node2.json +++ b/examples/groups/k8s-install/node2.json @@ -15,7 +15,7 @@ "k8s_controller_endpoint": "https://172.15.0.21", "k8s_dns_service_ip": "10.3.0.1", "k8s_etcd_endpoints": "http://172.15.0.21:2379,http://172.15.0.22:2379,http://172.15.0.23:2379", - "k8s_version": "v1.2.0_coreos.1", + "k8s_version": "v1.2.2_coreos.0", "networkd_address": "172.15.0.22/16", "networkd_dns": "172.15.0.3", "networkd_gateway": "172.15.0.1", diff --git a/examples/groups/k8s-install/node3.json b/examples/groups/k8s-install/node3.json index 0649a7de..b2b8eead 100644 --- a/examples/groups/k8s-install/node3.json +++ b/examples/groups/k8s-install/node3.json @@ -15,7 +15,7 @@ "k8s_controller_endpoint": "https://172.15.0.21", "k8s_dns_service_ip": "10.3.0.1", "k8s_etcd_endpoints": "http://172.15.0.21:2379,http://172.15.0.22:2379,http://172.15.0.23:2379", - "k8s_version": "v1.2.0_coreos.1", + "k8s_version": "v1.2.2_coreos.0", "networkd_address": "172.15.0.23/16", "networkd_dns": "172.15.0.3", "networkd_gateway": "172.15.0.1", diff --git a/examples/groups/k8s/node1.json b/examples/groups/k8s/node1.json index 465d6f25..f83225f8 100644 --- a/examples/groups/k8s/node1.json +++ b/examples/groups/k8s/node1.json @@ -15,7 +15,7 @@ "k8s_etcd_endpoints": "http://172.15.0.21:2379,http://172.15.0.22:2379,http://172.15.0.23:2379", "k8s_pod_network": "10.2.0.0/16", "k8s_service_ip_range": "10.3.0.0/24", - "k8s_version": "v1.2.0_coreos.1", + "k8s_version": "v1.2.2_coreos.0", "networkd_address": "172.15.0.21/16", "networkd_dns": "172.15.0.3", "networkd_gateway": "172.15.0.1", diff --git a/examples/groups/k8s/node2.json b/examples/groups/k8s/node2.json index bd3df9f8..499baf84 100644 --- a/examples/groups/k8s/node2.json +++ b/examples/groups/k8s/node2.json @@ -14,7 +14,7 @@ "k8s_controller_endpoint": "https://172.15.0.21", "k8s_dns_service_ip": "10.3.0.1", "k8s_etcd_endpoints": "http://172.15.0.21:2379,http://172.15.0.22:2379,http://172.15.0.23:2379", - "k8s_version": "v1.2.0_coreos.1", + "k8s_version": "v1.2.2_coreos.0", "networkd_address": "172.15.0.22/16", "networkd_dns": "172.15.0.3", "networkd_gateway": "172.15.0.1", diff --git a/examples/groups/k8s/node3.json b/examples/groups/k8s/node3.json index 2bab3ae2..9c6377fc 100644 --- a/examples/groups/k8s/node3.json +++ b/examples/groups/k8s/node3.json @@ -14,7 +14,7 @@ "k8s_controller_endpoint": "https://172.15.0.21", "k8s_dns_service_ip": "10.3.0.1", "k8s_etcd_endpoints": "http://172.15.0.21:2379,http://172.15.0.22:2379,http://172.15.0.23:2379", - "k8s_version": "v1.2.0_coreos.1", + "k8s_version": "v1.2.2_coreos.0", "networkd_address": "172.15.0.23/16", "networkd_dns": "172.15.0.3", "networkd_gateway": "172.15.0.1", diff --git a/examples/ignition/k8s-master.yaml b/examples/ignition/k8s-master.yaml index 055e21d6..8db85935 100644 --- a/examples/ignition/k8s-master.yaml +++ b/examples/ignition/k8s-master.yaml @@ -452,15 +452,16 @@ storage: } } } - - path: /srv/kubernetes/manifests/heapster-rc.json + - path: /srv/kubernetes/manifests/heapster-deployment.json contents: | { - "apiVersion": "v1", - "kind": "ReplicationController", + "apiVersion": "extensions/v1beta1", + "kind": "Deployment", "metadata": { "labels": { "k8s-app": "heapster", - "kubernetes.io/cluster-service": "true" + "kubernetes.io/cluster-service": "true", + "version": "v1.0.2" }, "name": "heapster-v1.0.2", "namespace": "kube-system" @@ -468,13 +469,16 @@ storage: "spec": { "replicas": 1, "selector": { - "k8s-app": "heapster" + "matchLabels": { + "k8s-app": "heapster", + "version": "v1.0.2" + } }, "template": { "metadata": { "labels": { "k8s-app": "heapster", - "kubernetes.io/cluster-service": "true" + "version": "v1.0.2" } }, "spec": { @@ -490,11 +494,54 @@ storage: "resources": { "limits": { "cpu": "100m", - "memory": "208Mi" + "memory": "250Mi" }, "requests": { "cpu": "100m", - "memory": "208Mi" + "memory": "250Mi" + } + } + }, + { + "command": [ + "/pod_nanny", + "--cpu=100m", + "--extra-cpu=0m", + "--memory=250Mi", + "--extra-memory=4Mi", + "--threshold=5", + "--deployment=heapster-v1.0.2", + "--container=heapster", + "--poll-period=300000" + ], + "env": [ + { + "name": "MY_POD_NAME", + "valueFrom": { + "fieldRef": { + "fieldPath": "metadata.name" + } + } + }, + { + "name": "MY_POD_NAMESPACE", + "valueFrom": { + "fieldRef": { + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "gcr.io/google_containers/addon-resizer:1.0", + "name": "heapster-nanny", + "resources": { + "limits": { + "cpu": "50m", + "memory": "100Mi" + }, + "requests": { + "cpu": "50m", + "memory": "100Mi" } } } @@ -579,7 +626,7 @@ storage: 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-deployment.json)" "http://127.0.0.1:8080/apis/extensions/v1beta1/namespaces/kube-system/deployments" > /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: