github-personal/matchbox
1
0
Fork 0
mirror of https://github.com/outbackdingo/matchbox.git synced 2026-01-27 10:19:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

examples: Upgrade k8s from v1.2.0 to v1.2.2

Browse Source 
* Change Heapster from a rc to a deployment
* Use the heapster-nanny resizer
This commit is contained in:
Dalton Hubble
2016-04-18 16:49:16 -07:00
parent c30862dbad
commit cc4e6e1008
10 changed files with 65 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/groups/k8s-docker/node1.json
View File

@@ -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",

2
examples/groups/k8s-docker/node2.json
View File

@@ -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",

2
examples/groups/k8s-docker/node3.json
View File

@@ -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",

2
examples/groups/k8s-install/node1.json
View File

@@ -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",

2
examples/groups/k8s-install/node2.json
View File

@@ -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",

2
examples/groups/k8s-install/node3.json
View File

@@ -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",

2
examples/groups/k8s/node1.json
View File

@@ -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",

2
examples/groups/k8s/node2.json
View File

@@ -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",

2
examples/groups/k8s/node3.json
View File

@@ -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",

65
examples/ignition/k8s-master.yaml
View File

@@ -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: