github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32362 from piosz/heap

Browse Source 
Automatic merge from submit-queue

Bumped Heapster to v1.2.0-beta.3

The new version contains Kubernetes deps in version `1.4.0-beta.0`
This commit is contained in:
Kubernetes Submit Queue
2016-09-11 13:47:44 -07:00
committed by GitHub
parent b93860d61a 2d87deb043
commit 2076319020
5 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/kubemark/resources/heapster_template.json
View File

@@ -2,23 +2,23 @@
"kind": "ReplicationController",
"apiVersion": "v1",
"metadata": {
"name": "heapster-v1.1.0",
"name": "heapster-v1.2.0-beta.3",
"labels": {
"k8s-app": "heapster",
"version": "v1.1.0"
"version": "v1.2.0-beta.3"
}
},
"spec": {
"replicas": 1,
"selector": {
"k8s-app": "heapster",
"version": "v1.1.0"
"version": "v1.2.0-beta.3"
},
"template": {
"metadata": {
"labels": {
"k8s-app": "heapster",
"version": "v1.1.0"
"version": "v1.2.0-beta.3"
}
},
"spec": {
@@ -33,7 +33,7 @@
"containers": [
{
"name": "heapster",
"image": "gcr.io/google_containers/heapster:v1.2.0-beta.1",
"image": "gcr.io/google_containers/heapster:v1.2.0-beta.3",
"resources": {
"requests": {
"cpu": "100m",
@@ -55,7 +55,7 @@
},
{
"name": "eventer",
"image": "gcr.io/google_containers/heapster:v1.2.0-beta.1",
"image": "gcr.io/google_containers/heapster:v1.2.0-beta.3",
"resources": {
"requests": {
"cpu": "100m",