github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9886 from vishh/heapster_v0.14.1

Browse Source 
Updating heapster version to v0.14.1.
This commit is contained in:
Saad Ali 2015-06-16 13:14:07 -07:00
commit fc30ab308b
8 changed files with 88 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,30 +1,30 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: monitoring-heapster-v2
name: monitoring-heapster-v3
namespace: default
labels:
k8s-app: heapster
version: v2
version: v3
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: heapster
version: v2
version: v3
template:
metadata:
labels:
k8s-app: heapster
version: v2
version: v3
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.14.0
- image: gcr.io/google_containers/heapster:v0.14.1
name: heapster
command:
- /heapster
- --source=kubernetes:https://kubernetes
- --source=kubernetes:''
- --sink=gcm
- --sink=gcl
- --poll_duration=2m

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

@ -1,30 +1,30 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: monitoring-heapster-v2
name: monitoring-heapster-v3
namespace: default
labels:
k8s-app: heapster
version: v2
version: v3
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: heapster
version: v2
version: v3
template:
metadata:
labels:
k8s-app: heapster
version: v2
version: v3
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.14.0
- image: gcr.io/google_containers/heapster:v0.14.1
name: heapster
command:
- /heapster
- --source=kubernetes:https://kubernetes
- --source=kubernetes:''
- --sink=gcl
- --sink=influxdb:http://monitoring-influxdb:8086
- --poll_duration=2m

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

@ -1,30 +1,30 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: monitoring-heapster-v2
name: monitoring-heapster-v3
namespace: default
labels:
k8s-app: heapster
version: v2
version: v3
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: heapster
version: v2
version: v3
template:
metadata:
labels:
k8s-app: heapster
version: v2
version: v3
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.14.0
- image: gcr.io/google_containers/heapster:v0.14.1
name: heapster
command:
- /heapster
- --source=kubernetes:https://kubernetes
- --source=kubernetes:''
- --sink=influxdb:http://monitoring-influxdb:8086
volumeMounts:
- name: ssl-certs

43
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml Normal file
View File

@ -0,0 +1,43 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: monitoring-heapster-v3
namespace: default
labels:
k8s-app: heapster
version: v3
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: heapster
version: v3
template:
metadata:
labels:
k8s-app: heapster
version: v3
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.14.1
name: heapster
command:
- /heapster
- --source=kubernetes:''
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- name: monitoring-token
mountPath: /etc/kubernetes/kubeconfig
readOnly: true
volumes:
- name: ssl-certs
hostPath:
path: /etc/ssl/certs
- name: monitoring-token
secret:
secretName: token-system-monitoring

13
cluster/addons/cluster-monitoring/standalone/heapster-service.yaml Normal file
View File

@ -0,0 +1,13 @@
kind: Service
apiVersion: v1
metadata:
name: monitoring-heapster
labels:
kubernetes.io/cluster-service: "true"
name: monitoring-heapster
spec:
ports:
- port: 80
targetPort: 8082
selector:
k8s-app: heapster

1
cluster/gce/config-default.sh
View File

@ -58,6 +58,7 @@ ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}"
# influxdb - Heapster, InfluxDB, and Grafana
# google - Heapster, Google Cloud Monitoring, and Google Cloud Logging
# googleinfluxdb - Enable influxdb and google (except GCM)
# standalone - Heapster only. Metrics available via Heapster REST API.
ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-googleinfluxdb}"
# Optional: Enable node logging.

3
cluster/gke/config-default.sh
View File

@ -34,4 +34,5 @@ ELASTICSEARCH_LOGGING_REPLICAS=1
# none - No cluster monitoring setup
# influxdb - Heapster, InfluxDB, and Grafana
# google - Heapster, Google Cloud Monitoring, and Google Cloud Logging
ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-none}"
# standalone - Heapster only. Metrics available via Heapster REST API.
ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-standalone}"

11
cluster/saltbase/salt/kube-addons/init.sls
View File

@ -33,6 +33,17 @@ addon-dir-create:
- file_mode: 644
{% endif %}
{% if pillar.get('enable_cluster_monitoring', '').lower() == 'standalone' %}
/etc/kubernetes/addons/cluster-monitoring/standalone:
file.recurse:
- source: salt://kube-addons/cluster-monitoring/standalone
- include_pat: E@(^.+\.yaml$|^.+\.json$)
- user: root
- group: root
- dir_mode: 755
- file_mode: 644
{% endif %}
{% if pillar.get('enable_cluster_monitoring', '').lower() == 'googleinfluxdb' %}
/etc/kubernetes/addons/cluster-monitoring/googleinfluxdb:
file.recurse: