github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47961 from piosz/heapster-1.4

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 47961, 46276)

Bumped Heapster to v1.4.0-beta.0

Heapster release candidate for Kubernetes 1.7

cc @dchen1107 @caesarxuchao
This commit is contained in:
Kubernetes Submit Queue 2017-06-26 02:11:52 -07:00 committed by GitHub
commit e725c8fca7
6 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View File

@ -23,29 +23,29 @@ metadata:
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.3.0
name: heapster-v1.4.0-beta.0
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
version: v1.3.0
version: v1.4.0-beta.0
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.3.0
version: v1.4.0-beta.0
template:
metadata:
labels:
k8s-app: heapster
version: v1.3.0
version: v1.4.0-beta.0
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
containers:
- image: gcr.io/google_containers/heapster-amd64:v1.3.0
- image: gcr.io/google_containers/heapster-amd64:v1.4.0-beta.0
name: heapster
livenessProbe:
httpGet:
@ -65,7 +65,7 @@ spec:
- name: usr-ca-certs
mountPath: /usr/share/ca-certificates
readOnly: true
- image: gcr.io/google_containers/heapster-amd64:v1.3.0
- image: gcr.io/google_containers/heapster-amd64:v1.4.0-beta.0
name: eventer
command:
- /eventer
@ -103,7 +103,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5
- --deployment=heapster-v1.3.0
- --deployment=heapster-v1.4.0-beta.0
- --container=heapster
- --poll-period=300000
- --estimator=exponential
@ -132,7 +132,7 @@ spec:
- --memory={{base_eventer_memory}}
- --extra-memory={{eventer_memory_per_node}}Ki
- --threshold=5
- --deployment=heapster-v1.3.0
- --deployment=heapster-v1.4.0-beta.0
- --container=eventer
- --poll-period=300000
- --estimator=exponential

16
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View File

@ -23,29 +23,29 @@ metadata:
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.3.0
name: heapster-v1.4.0-beta.0
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
version: v1.3.0
version: v1.4.0-beta.0
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.3.0
version: v1.4.0-beta.0
template:
metadata:
labels:
k8s-app: heapster
version: v1.3.0
version: v1.4.0-beta.0
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
containers:
- image: gcr.io/google_containers/heapster-amd64:v1.3.0
- image: gcr.io/google_containers/heapster-amd64:v1.4.0-beta.0
name: heapster
livenessProbe:
httpGet:
@ -66,7 +66,7 @@ spec:
- name: usr-ca-certs
mountPath: /usr/share/ca-certificates
readOnly: true
- image: gcr.io/google_containers/heapster-amd64:v1.3.0
- image: gcr.io/google_containers/heapster-amd64:v1.4.0-beta.0
name: eventer
command:
- /eventer
@ -104,7 +104,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.3.0
- --deployment=heapster-v1.4.0-beta.0
- --container=heapster
- --poll-period=300000
- --estimator=exponential
@ -133,7 +133,7 @@ spec:
- --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.3.0
- --deployment=heapster-v1.4.0-beta.0
- --container=eventer
- --poll-period=300000
- --estimator=exponential

16
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View File

@ -23,29 +23,29 @@ metadata:
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.3.0
name: heapster-v1.4.0-beta.0
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
version: v1.3.0
version: v1.4.0-beta.0
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.3.0
version: v1.4.0-beta.0
template:
metadata:
labels:
k8s-app: heapster
version: v1.3.0
version: v1.4.0-beta.0
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
containers:
- image: gcr.io/google_containers/heapster-amd64:v1.3.0
- image: gcr.io/google_containers/heapster-amd64:v1.4.0-beta.0
name: heapster
livenessProbe:
httpGet:
@ -58,7 +58,7 @@ spec:
- /heapster
- --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086
- image: gcr.io/google_containers/heapster-amd64:v1.3.0
- image: gcr.io/google_containers/heapster-amd64:v1.4.0-beta.0
name: eventer
command:
- /eventer
@ -89,7 +89,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.3.0
- --deployment=heapster-v1.4.0-beta.0
- --container=heapster
- --poll-period=300000
- --estimator=exponential
@ -118,7 +118,7 @@ spec:
- --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.3.0
- --deployment=heapster-v1.4.0-beta.0
- --container=eventer
- --poll-period=300000
- --estimator=exponential

12
cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml
View File

@ -21,29 +21,29 @@ metadata:
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.3.0
name: heapster-v1.4.0-beta.0
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
version: v1.3.0
version: v1.4.0-beta.0
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.3.0
version: v1.4.0-beta.0
template:
metadata:
labels:
k8s-app: heapster
version: v1.3.0
version: v1.4.0-beta.0
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
containers:
- image: gcr.io/google_containers/heapster-amd64:v1.3.0
- image: gcr.io/google_containers/heapster-amd64:v1.4.0-beta.0
name: heapster
livenessProbe:
httpGet:
@ -89,7 +89,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5
- --deployment=heapster-v1.3.0
- --deployment=heapster-v1.4.0-beta.0
- --container=heapster
- --poll-period=300000
- --estimator=exponential

12
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View File

@ -21,29 +21,29 @@ metadata:
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.3.0
name: heapster-v1.4.0-beta.0
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
version: v1.3.0
version: v1.4.0-beta.0
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.3.0
version: v1.4.0-beta.0
template:
metadata:
labels:
k8s-app: heapster
version: v1.3.0
version: v1.4.0-beta.0
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
containers:
- image: gcr.io/google_containers/heapster-amd64:v1.3.0
- image: gcr.io/google_containers/heapster-amd64:v1.4.0-beta.0
name: heapster
livenessProbe:
httpGet:
@ -80,7 +80,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.3.0
- --deployment=heapster-v1.4.0-beta.0
- --container=heapster
- --poll-period=300000
- --estimator=exponential

10
test/e2e/monitoring.go
View File

@ -48,8 +48,8 @@ var _ = framework.KubeDescribe("Monitoring", func() {
const (
influxdbService = "monitoring-influxdb"
influxdbDatabaseName = "k8s"
podlistQuery = "show tag values from \"cpu/usage\" with key = pod_id"
nodelistQuery = "show tag values from \"cpu/usage\" with key = hostname"
podlistQuery = "show tag values from \"cpu/usage\" with key = pod_name"
nodelistQuery = "show tag values from \"cpu/usage\" with key = nodename"
sleepBetweenAttempts = 5 * time.Second
testTimeout = 5 * time.Minute
initializationTimeout = 5 * time.Minute
@ -161,7 +161,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string,
if pod.DeletionTimestamp != nil {
continue
}
expectedPods = append(expectedPods, string(pod.UID))
expectedPods = append(expectedPods, pod.Name)
}
}
// Do the same for all deployments.
@ -176,7 +176,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string,
if pod.DeletionTimestamp != nil {
continue
}
expectedPods = append(expectedPods, string(pod.UID))
expectedPods = append(expectedPods, pod.Name)
}
}
// And for pet sets.
@ -191,7 +191,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string,
if pod.DeletionTimestamp != nil {
continue
}
expectedPods = append(expectedPods, string(pod.UID))
expectedPods = append(expectedPods, pod.Name)
}
}
}