Skip to content

K
k3s
Commit e96993f2 authored by Piotr Szczesniak's avatar Piotr Szczesniak
Browse files
Options

Bumped Heapster version to v0.20.0-alpha and Influxdb to 0.9.2.1

parent 2a44afac
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 37 deletions
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file @ e96993f2
...@@ -7,26 +7,26 @@ ...@@ -7,26 +7,26 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: heapster-v12 name: heapster-v13
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v12 version: v13
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
selector: selector:
k8s-app: heapster k8s-app: heapster
version: v12 version: v13
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v12 version: v13
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.18.5 - image: gcr.io/google_containers/heapster:v0.20.0-alpha1
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
...@@ -40,10 +40,24 @@ spec: ...@@ -40,10 +40,24 @@ spec:
- /heapster - /heapster
- --source=kubernetes:'' - --source=kubernetes:''
- --sink=gcm - --sink=gcm
- --sink=gcmautoscaling volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v0.20.0-alpha1
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
limits:
cpu: 100m
memory: {{ heapster_memory }}
requests:
cpu: 100m
memory: {{ heapster_memory }}
command:
- /eventer
- --source=kubernetes:''
- --sink=gcl - --sink=gcl
- --stats_resolution=30s
- --sink_frequency=1m
volumeMounts: volumeMounts:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs
......
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file @ e96993f2
...@@ -7,26 +7,26 @@ ...@@ -7,26 +7,26 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: heapster-v12 name: heapster-v13
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v12 version: v13
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
selector: selector:
k8s-app: heapster k8s-app: heapster
version: v12 version: v13
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v12 version: v13
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.18.5 - image: gcr.io/google_containers/heapster:v0.20.0-alpha1
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
...@@ -39,11 +39,25 @@ spec: ...@@ -39,11 +39,25 @@ spec:
command: command:
- /heapster - /heapster
- --source=kubernetes:'' - --source=kubernetes:''
- --sink=gcl
- --sink=gcmautoscaling
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- --stats_resolution=30s volumeMounts:
- --sink_frequency=1m - name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v0.20.0-alpha1
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
limits:
cpu: 100m
memory: {{ heapster_memory }}
requests:
cpu: 100m
memory: {{ heapster_memory }}
command:
- /eventer
- --source=kubernetes:''
- --sink=gcl
volumeMounts: volumeMounts:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs
......
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file @ e96993f2
...@@ -7,26 +7,26 @@ ...@@ -7,26 +7,26 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: heapster-v12 name: heapster-v13
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v12 version: v13
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
selector: selector:
k8s-app: heapster k8s-app: heapster
version: v12 version: v13
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v12 version: v13
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.18.5 - image: gcr.io/google_containers/heapster:v0.20.0-alpha1
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
...@@ -40,5 +40,17 @@ spec: ...@@ -40,5 +40,17 @@ spec:
- /heapster - /heapster
- --source=kubernetes:'' - --source=kubernetes:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- --stats_resolution=30s - image: gcr.io/google_containers/heapster:v0.20.0-alpha1
- --sink_frequency=1m name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
limits:
cpu: 100m
memory: {{ heapster_memory }}
requests:
cpu: 100m
memory: {{ heapster_memory }}
command:
- /eventer
- --source=kubernetes:''
- --sink=influxdb:http://monitoring-influxdb:8086
cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
View file @ e96993f2
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: monitoring-influxdb-grafana-v2 name: monitoring-influxdb-grafana-v3
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: influxGrafana k8s-app: influxGrafana
version: v2 version: v3
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
selector: selector:
k8s-app: influxGrafana k8s-app: influxGrafana
version: v2 version: v3
template: template:
metadata: metadata:
labels: labels:
k8s-app: influxGrafana k8s-app: influxGrafana
version: v2 version: v3
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster_influxdb:v0.4 - image: gcr.io/google_containers/heapster_influxdb:v0.5
name: influxdb name: influxdb
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
...@@ -68,7 +68,6 @@ spec: ...@@ -68,7 +68,6 @@ spec:
volumeMounts: volumeMounts:
- name: grafana-persistent-storage - name: grafana-persistent-storage
mountPath: /var mountPath: /var
volumes: volumes:
- name: influxdb-persistent-storage - name: influxdb-persistent-storage
emptyDir: {} emptyDir: {}
......
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file @ e96993f2
...@@ -7,26 +7,26 @@ ...@@ -7,26 +7,26 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: heapster-v12 name: heapster-v13
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v12 version: v13
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
selector: selector:
k8s-app: heapster k8s-app: heapster
version: v12 version: v13
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v12 version: v13
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.18.5 - image: gcr.io/google_containers/heapster:v0.20.0-alpha1
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
......
hack/jenkins/e2e.sh
View file @ e96993f2
...@@ -394,8 +394,6 @@ case ${JOB_NAME} in ...@@ -394,8 +394,6 @@ case ${JOB_NAME} in
: ${PROJECT:="k8s-jnks-e2e-gce-autoscaling"} : ${PROJECT:="k8s-jnks-e2e-gce-autoscaling"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"} : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
: ${ENABLE_DEPLOYMENTS:=true} : ${ENABLE_DEPLOYMENTS:=true}
# Override GCE default for cluster size autoscaling purposes.
ENABLE_CLUSTER_MONITORING="googleinfluxdb"
ADMISSION_CONTROL="NamespaceLifecycle,InitialResources,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota" ADMISSION_CONTROL="NamespaceLifecycle,InitialResources,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota"
;; ;;
......
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