Skip to content

K
k3s
Commit e725c8fc authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #47961 from piosz/heapster-1.4

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
parents 53a66020 8d5d85e1
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 41 deletions
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file @ e725c8fc
...@@ -23,29 +23,29 @@ metadata: ...@@ -23,29 +23,29 @@ metadata:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.3.0 name: heapster-v1.4.0-beta.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"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
version: v1.3.0 version: v1.4.0-beta.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0 version: v1.4.0-beta.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0 version: v1.4.0-beta.0
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: 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 name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -65,7 +65,7 @@ spec: ...@@ -65,7 +65,7 @@ spec:
- name: usr-ca-certs - name: usr-ca-certs
mountPath: /usr/share/ca-certificates mountPath: /usr/share/ca-certificates
readOnly: true 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 name: eventer
command: command:
- /eventer - /eventer
...@@ -103,7 +103,7 @@ spec: ...@@ -103,7 +103,7 @@ spec:
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi - --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.3.0 - --deployment=heapster-v1.4.0-beta.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
...@@ -132,7 +132,7 @@ spec: ...@@ -132,7 +132,7 @@ spec:
- --memory={{base_eventer_memory}} - --memory={{base_eventer_memory}}
- --extra-memory={{eventer_memory_per_node}}Ki - --extra-memory={{eventer_memory_per_node}}Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.3.0 - --deployment=heapster-v1.4.0-beta.0
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file @ e725c8fc
...@@ -23,29 +23,29 @@ metadata: ...@@ -23,29 +23,29 @@ metadata:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.3.0 name: heapster-v1.4.0-beta.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"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
version: v1.3.0 version: v1.4.0-beta.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0 version: v1.4.0-beta.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0 version: v1.4.0-beta.0
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: 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 name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -66,7 +66,7 @@ spec: ...@@ -66,7 +66,7 @@ spec:
- name: usr-ca-certs - name: usr-ca-certs
mountPath: /usr/share/ca-certificates mountPath: /usr/share/ca-certificates
readOnly: true 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 name: eventer
command: command:
- /eventer - /eventer
...@@ -104,7 +104,7 @@ spec: ...@@ -104,7 +104,7 @@ spec:
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.3.0 - --deployment=heapster-v1.4.0-beta.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
...@@ -133,7 +133,7 @@ spec: ...@@ -133,7 +133,7 @@ spec:
- --memory={{ base_eventer_memory }} - --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki - --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.3.0 - --deployment=heapster-v1.4.0-beta.0
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file @ e725c8fc
...@@ -23,29 +23,29 @@ metadata: ...@@ -23,29 +23,29 @@ metadata:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.3.0 name: heapster-v1.4.0-beta.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"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
version: v1.3.0 version: v1.4.0-beta.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0 version: v1.4.0-beta.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0 version: v1.4.0-beta.0
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: 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 name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -58,7 +58,7 @@ spec: ...@@ -58,7 +58,7 @@ spec:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --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 name: eventer
command: command:
- /eventer - /eventer
...@@ -89,7 +89,7 @@ spec: ...@@ -89,7 +89,7 @@ spec:
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.3.0 - --deployment=heapster-v1.4.0-beta.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
...@@ -118,7 +118,7 @@ spec: ...@@ -118,7 +118,7 @@ spec:
- --memory={{ base_eventer_memory }} - --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki - --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.3.0 - --deployment=heapster-v1.4.0-beta.0
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml
View file @ e725c8fc
...@@ -21,29 +21,29 @@ metadata: ...@@ -21,29 +21,29 @@ metadata:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.3.0 name: heapster-v1.4.0-beta.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"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
version: v1.3.0 version: v1.4.0-beta.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0 version: v1.4.0-beta.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0 version: v1.4.0-beta.0
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: 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 name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -89,7 +89,7 @@ spec: ...@@ -89,7 +89,7 @@ spec:
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi - --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.3.0 - --deployment=heapster-v1.4.0-beta.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file @ e725c8fc
...@@ -21,29 +21,29 @@ metadata: ...@@ -21,29 +21,29 @@ metadata:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.3.0 name: heapster-v1.4.0-beta.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"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
version: v1.3.0 version: v1.4.0-beta.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0 version: v1.4.0-beta.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0 version: v1.4.0-beta.0
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: 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 name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -80,7 +80,7 @@ spec: ...@@ -80,7 +80,7 @@ spec:
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.3.0 - --deployment=heapster-v1.4.0-beta.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
test/e2e/monitoring.go
View file @ e725c8fc
...@@ -48,8 +48,8 @@ var _ = framework.KubeDescribe("Monitoring", func() { ...@@ -48,8 +48,8 @@ var _ = framework.KubeDescribe("Monitoring", func() {
const ( const (
influxdbService = "monitoring-influxdb" influxdbService = "monitoring-influxdb"
influxdbDatabaseName = "k8s" influxdbDatabaseName = "k8s"
podlistQuery = "show tag values from \"cpu/usage\" with key = pod_id" podlistQuery = "show tag values from \"cpu/usage\" with key = pod_name"
nodelistQuery = "show tag values from \"cpu/usage\" with key = hostname" nodelistQuery = "show tag values from \"cpu/usage\" with key = nodename"
sleepBetweenAttempts = 5 * time.Second sleepBetweenAttempts = 5 * time.Second
testTimeout = 5 * time.Minute testTimeout = 5 * time.Minute
initializationTimeout = 5 * time.Minute initializationTimeout = 5 * time.Minute
...@@ -161,7 +161,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string, ...@@ -161,7 +161,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string,
if pod.DeletionTimestamp != nil { if pod.DeletionTimestamp != nil {
continue continue
} }
expectedPods = append(expectedPods, string(pod.UID)) expectedPods = append(expectedPods, pod.Name)
} }
} }
// Do the same for all deployments. // Do the same for all deployments.
...@@ -176,7 +176,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string, ...@@ -176,7 +176,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string,
if pod.DeletionTimestamp != nil { if pod.DeletionTimestamp != nil {
continue continue
} }
expectedPods = append(expectedPods, string(pod.UID)) expectedPods = append(expectedPods, pod.Name)
} }
} }
// And for pet sets. // And for pet sets.
...@@ -191,7 +191,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string, ...@@ -191,7 +191,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string,
if pod.DeletionTimestamp != nil { if pod.DeletionTimestamp != nil {
continue continue
} }
expectedPods = append(expectedPods, string(pod.UID)) expectedPods = append(expectedPods, pod.Name)
} }
} }
} }
......
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