From d5c1de6e5b874f0602e6a3f23ee8b0cca44e4884 Mon Sep 17 00:00:00 2001 From: harshalkwagh Date: Mon, 10 Feb 2020 12:29:49 +0530 Subject: [PATCH 1/3] add nutanix support changes --- kustomize/dkube/base/dkube.yaml | 8 ++++---- kustomize/monitoring/base/monitoring.yaml | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/kustomize/dkube/base/dkube.yaml b/kustomize/dkube/base/dkube.yaml index 13caf50..6e74499 100644 --- a/kustomize/dkube/base/dkube.yaml +++ b/kustomize/dkube/base/dkube.yaml @@ -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/ @@ -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/ @@ -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 @@ -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 diff --git a/kustomize/monitoring/base/monitoring.yaml b/kustomize/monitoring/base/monitoring.yaml index 36e70e6..e9394cd 100644 --- a/kustomize/monitoring/base/monitoring.yaml +++ b/kustomize/monitoring/base/monitoring.yaml @@ -3841,8 +3841,10 @@ spec: name: rootfs - mountPath: /var/run:rw name: run - - mountPath: /sys:ro + - mountPath: /sys/fs/cgroup/cpuacct,cpu:ro name: sys + - mountPath: /sys/fs/cgroup/memory:ro + name: sys-mem - mountPath: /var/lib/docker:rw name: docker dnsConfig: @@ -3860,9 +3862,13 @@ spec: type: "" name: run - hostPath: - path: /sys + path: /sys/fs/cgroup/cpu,cpuacct type: "" name: sys + - hostPath: + path: /sys/fs/cgroup/memory + type: "" + name: sys-mem - hostPath: path: /var/lib/docker/ type: "" From a7ff4857aaee7ee5bbd3ab51530667f99abd25fe Mon Sep 17 00:00:00 2001 From: harshalkwagh Date: Mon, 10 Feb 2020 17:24:22 +0530 Subject: [PATCH 2/3] cadvisor fix for sys --- kustomize/monitoring/base/monitoring.yaml | 34 ++--------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/kustomize/monitoring/base/monitoring.yaml b/kustomize/monitoring/base/monitoring.yaml index e9394cd..416d209 100644 --- a/kustomize/monitoring/base/monitoring.yaml +++ b/kustomize/monitoring/base/monitoring.yaml @@ -3836,43 +3836,13 @@ spec: - containerPort: 8080 name: http-metrics protocol: TCP - volumeMounts: - - mountPath: /rootfs:ro - name: rootfs - - mountPath: /var/run:rw - name: run - - mountPath: /sys/fs/cgroup/cpuacct,cpu:ro - name: sys - - mountPath: /sys/fs/cgroup/memory:ro - name: sys-mem - - mountPath: /var/lib/docker:rw - name: docker + volumeMounts: cadvVolumeMounts 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/fs/cgroup/cpu,cpuacct - type: "" - name: sys - - hostPath: - path: /sys/fs/cgroup/memory - type: "" - name: sys-mem - - hostPath: - path: /var/lib/docker/ - type: "" - name: docker + volumes: cadvVolumes --- apiVersion: extensions/v1beta1 kind: Deployment From c654e0b54d5c357f3790375c2c4c838f3f7859c9 Mon Sep 17 00:00:00 2001 From: harshalkwagh Date: Tue, 18 Feb 2020 22:34:38 +0530 Subject: [PATCH 3/3] removed cadvisor --- kustomize/monitoring/base/monitoring.yaml | 108 +++++++++++----------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/kustomize/monitoring/base/monitoring.yaml b/kustomize/monitoring/base/monitoring.yaml index 416d209..ffaab0e 100644 --- a/kustomize/monitoring/base/monitoring.yaml +++ b/kustomize/monitoring/base/monitoring.yaml @@ -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 @@ -3811,38 +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: cadvVolumeMounts - dnsConfig: - options: - - name: single-request-reopen - - name: timeout - value: "30" - volumes: cadvVolumes +# --- +# 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