github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #38808 from du2016/change-heapster-version 

Automatic merge from submit-queue (batch tested with PRs 38906, 38808)

change the version in the yaml file

change the version in heapster-controller.yaml with image version
pull/6/head
Kubernetes Submit Queue 2016-12-17 00:41:24 -08:00 committed by GitHub
parent f45fa0b76e 90e2c31fa7
commit a4577e70ab
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/google/heapster-controller.yaml
View File

@ -1,23 +1,23 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.1.0 name: heapster-v1.2.0
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v1.1.0 version: v1.2.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0 version: v1.2.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0 version: v1.2.0
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.2.0 - image: gcr.io/google_containers/heapster:v1.2.0
@ -87,7 +87,7 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=4Mi - --extra-memory=4Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0 - --deployment=heapster-v1.2.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0 - image: gcr.io/google_containers/addon-resizer:1.0
@ -115,7 +115,7 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=307200Ki - --extra-memory=307200Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0 - --deployment=heapster-v1.2.0
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
volumes: volumes:

12
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View File

@ -1,23 +1,23 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.1.0 name: heapster-v1.2.0
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v1.1.0 version: v1.2.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0 version: v1.2.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0 version: v1.2.0
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.2.0 - image: gcr.io/google_containers/heapster:v1.2.0
@ -73,7 +73,7 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=4Mi - --extra-memory=4Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0 - --deployment=heapster-v1.2.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0 - image: gcr.io/google_containers/addon-resizer:1.0
@ -101,6 +101,6 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=307200Ki - --extra-memory=307200Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0 - --deployment=heapster-v1.2.0
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000

10
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/standalone/heapster-controller.yaml
View File

@ -1,23 +1,23 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.1.0 name: heapster-v1.2.0
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v1.1.0 version: v1.2.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0 version: v1.2.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0 version: v1.2.0
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.2.0 - image: gcr.io/google_containers/heapster:v1.2.0
@ -58,6 +58,6 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=4Mi - --extra-memory=4Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0 - --deployment=heapster-v1.2.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000