Commit a4577e70 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

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
parents f45fa0b7 90e2c31f
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0
name: heapster-v1.2.0
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0
version: v1.2.0
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0
version: v1.2.0
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0
version: v1.2.0
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.2.0
......@@ -87,7 +87,7 @@ spec:
- --memory=300Mi
- --extra-memory=4Mi
- --threshold=5
- --deployment=heapster-v1.1.0
- --deployment=heapster-v1.2.0
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
......@@ -115,7 +115,7 @@ spec:
- --memory=300Mi
- --extra-memory=307200Ki
- --threshold=5
- --deployment=heapster-v1.1.0
- --deployment=heapster-v1.2.0
- --container=eventer
- --poll-period=300000
volumes:
......
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0
name: heapster-v1.2.0
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0
version: v1.2.0
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0
version: v1.2.0
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0
version: v1.2.0
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.2.0
......@@ -73,7 +73,7 @@ spec:
- --memory=300Mi
- --extra-memory=4Mi
- --threshold=5
- --deployment=heapster-v1.1.0
- --deployment=heapster-v1.2.0
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
......@@ -101,6 +101,6 @@ spec:
- --memory=300Mi
- --extra-memory=307200Ki
- --threshold=5
- --deployment=heapster-v1.1.0
- --deployment=heapster-v1.2.0
- --container=eventer
- --poll-period=300000
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0
name: heapster-v1.2.0
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0
version: v1.2.0
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0
version: v1.2.0
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0
version: v1.2.0
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.2.0
......@@ -58,6 +58,6 @@ spec:
- --memory=300Mi
- --extra-memory=4Mi
- --threshold=5
- --deployment=heapster-v1.1.0
- --deployment=heapster-v1.2.0
- --container=heapster
- --poll-period=300000
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment