Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions kustomize/dkube/base/dkube.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ spec:
procMount: Default
runAsUser: 0
volumeMounts:
- mountPath: /var/lib/docker/containers
- mountPath: LOG_PATH
name: varlibdockercontainers
readOnly: true
- mountPath: /fluentd/etc/
Expand All @@ -187,7 +187,7 @@ spec:
procMount: Default
runAsUser: 0
volumeMounts:
- mountPath: /var/lib/docker/containers
- mountPath: LOG_PATH
name: varlibdockercontainers
readOnly: true
- mountPath: /fluentd/etc/
Expand All @@ -213,7 +213,7 @@ spec:
name: dkube-log-collector
name: dkube-log-collector
- hostPath:
path: /var/lib/docker/containers
path: LOG_PATH
name: varlibdockercontainers
- configMap:
defaultMode: 420
Expand Down Expand Up @@ -261,7 +261,7 @@ spec:
- image: dkubeAuthImage
imagePullPolicy: IfNotPresent
name: sidecar
command: ["bash", "-c", "sleep 30; /opt/dkube/d3"]
command: ["bash", "-c", "sleep 30; echo 127.0.0.1 dkube-auth-server.dkube.svc.cluster.local >> /etc/hosts; /opt/dkube/d3"]
ports:
- containerPort: 3001
name: authn
Expand Down
132 changes: 54 additions & 78 deletions kustomize/monitoring/base/monitoring.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3770,28 +3770,28 @@ metadata:
ksonnet.io/component: monitoring
name: dkube-grafana-init
namespace: dkube
---
apiVersion: v1
kind: Service
metadata:
annotations:
prometheus.io/port: "8080"
prometheus.io/dkube_scrape: "true"
labels:
app: dkube-pod-exporter
ksonnet.io/component: monitoring
name: dkube-cpu-exporter-service
namespace: dkube
spec:
ports:
- name: http-metrics
port: 8080
protocol: TCP
targetPort: 8080
selector:
app: pod-exporter
sessionAffinity: None
type: ClusterIP
# ---
# apiVersion: v1
# kind: Service
# metadata:
# annotations:
# prometheus.io/port: "8080"
# prometheus.io/dkube_scrape: "true"
# labels:
# app: dkube-pod-exporter
# ksonnet.io/component: monitoring
# name: dkube-cpu-exporter-service
# namespace: dkube
# spec:
# ports:
# - name: http-metrics
# port: 8080
# protocol: TCP
# targetPort: 8080
# selector:
# app: pod-exporter
# sessionAffinity: None
# type: ClusterIP
---
apiVersion: v1
kind: Service
Expand All @@ -3811,62 +3811,38 @@ spec:
app: dkube-prometheus-grafana
sessionAffinity: None
type: ClusterIP
---
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
labels:
ksonnet.io/component: monitoring
name: dkube-cpu-exporter
namespace: dkube
spec:
selector:
matchLabels:
app: pod-exporter
template:
metadata:
labels:
app: pod-exporter
spec:
containers:
- image: google/cadvisor:latest
imagePullPolicy: IfNotPresent
name: cadvisor
ports:
- containerPort: 8080
name: http-metrics
protocol: TCP
volumeMounts:
- mountPath: /rootfs:ro
name: rootfs
- mountPath: /var/run:rw
name: run
- mountPath: /sys:ro
name: sys
- mountPath: /var/lib/docker:rw
name: docker
dnsConfig:
options:
- name: single-request-reopen
- name: timeout
value: "30"
volumes:
- hostPath:
path: /
type: ""
name: rootfs
- hostPath:
path: /var/run
type: ""
name: run
- hostPath:
path: /sys
type: ""
name: sys
- hostPath:
path: /var/lib/docker/
type: ""
name: docker
# ---
# apiVersion: extensions/v1beta1
# kind: DaemonSet
# metadata:
# labels:
# ksonnet.io/component: monitoring
# name: dkube-cpu-exporter
# namespace: dkube
# spec:
# selector:
# matchLabels:
# app: pod-exporter
# template:
# metadata:
# labels:
# app: pod-exporter
# spec:
# containers:
# - image: google/cadvisor:latest
# imagePullPolicy: IfNotPresent
# name: cadvisor
# ports:
# - containerPort: 8080
# name: http-metrics
# protocol: TCP
# volumeMounts: cadvVolumeMounts
# dnsConfig:
# options:
# - name: single-request-reopen
# - name: timeout
# value: "30"
# volumes: cadvVolumes
---
apiVersion: extensions/v1beta1
kind: Deployment
Expand Down