Update influxdb and grafana controller to latest version

This commit is contained in:
kairen 2017-10-02 16:16:28 +08:00
parent 6ed207374f
commit b779fdd9f7
3 changed files with 41 additions and 32 deletions

View File

@ -3,7 +3,7 @@ kind: Service
metadata: metadata:
name: monitoring-grafana name: monitoring-grafana
namespace: kube-system namespace: kube-system
labels: labels:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
kubernetes.io/name: "Grafana" kubernetes.io/name: "Grafana"
@ -11,9 +11,9 @@ spec:
# On production clusters, consider setting up auth for grafana, and # On production clusters, consider setting up auth for grafana, and
# exposing Grafana either using a LoadBalancer or a public IP. # exposing Grafana either using a LoadBalancer or a public IP.
# type: LoadBalancer # type: LoadBalancer
ports: ports:
- port: 80 - port: 80
targetPort: 3000 protocol: TCP
selector: targetPort: ui
selector:
k8s-app: influxGrafana k8s-app: influxGrafana

View File

@ -1,44 +1,52 @@
apiVersion: v1 kind: Deployment
kind: ReplicationController apiVersion: extensions/v1beta1
metadata: metadata:
name: monitoring-influxdb-grafana-v4 name: monitoring-influxdb-grafana-v4
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: influxGrafana k8s-app: influxGrafana
version: v4 version: v4
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
spec: spec:
replicas: 1 replicas: 1
selector: selector:
k8s-app: influxGrafana matchLabels:
version: v4 k8s-app: influxGrafana
template: version: v4
metadata: template:
labels: metadata:
labels:
k8s-app: influxGrafana k8s-app: influxGrafana
version: v4 version: v4
kubernetes.io/cluster-service: "true" annotations:
spec: scheduler.alpha.kubernetes.io/critical-pod: ''
containers: spec:
- image: gcr.io/google_containers/heapster-influxdb-amd64:v1.1.1 tolerations:
name: influxdb - key: node-role.kubernetes.io/master
effect: NoSchedule
- key: "CriticalAddonsOnly"
operator: "Exists"
containers:
- name: influxdb
image: gcr.io/google_containers/heapster-influxdb-amd64:v1.3.3
resources: resources:
# keep request = limit to keep this container in guaranteed class
limits: limits:
cpu: 100m cpu: 100m
memory: 500Mi memory: 500Mi
requests: requests:
cpu: 100m cpu: 100m
memory: 500Mi memory: 500Mi
ports: ports:
- containerPort: 8083 - name: http
- containerPort: 8086 containerPort: 8083
- name: api
containerPort: 8086
volumeMounts: volumeMounts:
- name: influxdb-persistent-storage - name: influxdb-persistent-storage
mountPath: /data mountPath: /data
- image: gcr.io/google_containers/heapster-grafana-amd64:v4.0.2 - name: grafana
name: grafana image: gcr.io/google_containers/heapster-grafana-amd64:v4.4.3
env: env:
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
@ -64,6 +72,9 @@ spec:
value: Admin value: Admin
- name: GF_SERVER_ROOT_URL - name: GF_SERVER_ROOT_URL
value: /api/v1/proxy/namespaces/kube-system/services/monitoring-grafana/ value: /api/v1/proxy/namespaces/kube-system/services/monitoring-grafana/
ports:
- name: ui
containerPort: 3000
volumeMounts: volumeMounts:
- name: grafana-persistent-storage - name: grafana-persistent-storage
mountPath: /var mountPath: /var
@ -72,4 +83,3 @@ spec:
emptyDir: {} emptyDir: {}
- name: grafana-persistent-storage - name: grafana-persistent-storage
emptyDir: {} emptyDir: {}

View File

@ -3,18 +3,17 @@ kind: Service
metadata: metadata:
name: monitoring-influxdb name: monitoring-influxdb
namespace: kube-system namespace: kube-system
labels: labels:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
kubernetes.io/name: "InfluxDB" kubernetes.io/name: "InfluxDB"
spec: spec:
ports: ports:
- name: http - name: http
port: 8083 port: 8083
targetPort: 8083 targetPort: 8083
- name: api - name: api
port: 8086 port: 8086
targetPort: 8086 targetPort: 8086
selector: selector:
k8s-app: influxGrafana k8s-app: influxGrafana