Merge pull request #3 from deepflowys/update_probe

move probe to values and restore default values
deepflowio · Aug 9, 2022 · c8b6573 · c8b6573
2 parents 5677098 + b8a7105
commit c8b6573
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 33 deletions.
diff --git a/charts/deepflow-agent/Chart.yaml b/charts/deepflow-agent/Chart.yaml
@@ -3,7 +3,7 @@ description: An automated observability platform for cloud-native developers.
 name: deepflow-agent
 engine: gotpl
 type: application
-version: 0.1.007
+version: 0.1.008
 appVersion: "6.1.1"
 kubeVersion: ">=1.16.0-0"
 sources:

diff --git a/charts/deepflow-agent/templates/daemonset.yaml b/charts/deepflow-agent/templates/daemonset.yaml
@@ -65,13 +65,31 @@ spec:
               readOnly: false ## attach/detach ebpf kprobe/uprobe to kernel
             - name: deepflow-agent-conf
               mountPath: /etc/deepflow-agent
+          {{- range .Values.extraVolumeMounts }}
+            - name: {{ .name }}
+              mountPath: {{ .mountPath }}
+              subPath: {{ .subPath | default "" }}
+              readOnly: {{ .readOnly }}
+          {{- end }}
       volumes:
         - name: sys-kernel-debug
           hostPath:
             path: /sys/kernel/debug
         - name: deepflow-agent-conf
           configMap:
             name: {{ include "deepflow-agent.fullname" . }}
+      {{- range .Values.extraVolumeMounts }}
+        - name: {{ .name }}
+          {{- if .existingClaim }}
+          persistentVolumeClaim:
+            claimName: {{ .existingClaim }}
+          {{- else if .hostPath }}
+          hostPath:
+            path: {{ .hostPath }}
+          {{- else }}
+          emptyDir: {}
+          {{- end }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/deepflow-agent/values.yaml b/charts/deepflow-agent/values.yaml
@@ -35,7 +35,7 @@ securityContext:
   # runAsUser: 1000
 
 nodeIPInjection: false
-
+extraVolumeMounts: []
 service:
   ## Configuration for Clickhouse service
   ##

diff --git a/charts/deepflow/Chart.yaml b/charts/deepflow/Chart.yaml
@@ -3,7 +3,7 @@ description: An automated observability platform for cloud-native developers.
 name: deepflow
 engine: gotpl
 type: application
-version: 0.1.007
+version: 0.1.008
 appVersion: "6.1.1"
 kubeVersion: ">=1.16.0-0"
 sources:

diff --git a/charts/deepflow/templates/app-deployment.yaml b/charts/deepflow/templates/app-deployment.yaml
@@ -36,21 +36,10 @@ spec:
             - name: app
               containerPort: 20418
               protocol: TCP
-          readinessProbe:
-            tcpSocket:
-              port: app
-            failureThreshold: 3
-            initialDelaySeconds: 15
-            periodSeconds: 10
-            successThreshold: 1
           livenessProbe:
-            failureThreshold: 3
-            initialDelaySeconds: 15
-            periodSeconds: 20
-            successThreshold: 1
-            tcpSocket:
-              port: app
-            timeoutSeconds: 1
+            {{ toYaml .Values.app.livenessProbe | nindent 12 }}
+          readinessProbe:
+            {{ toYaml .Values.app.readinessProbe | nindent 12 }}
           resources:
             {{- toYaml .Values.app.resources | nindent 12 }}
           volumeMounts:

diff --git a/charts/deepflow/templates/server-statefulset.yaml b/charts/deepflow/templates/server-statefulset.yaml
@@ -54,23 +54,10 @@ spec:
             - containerPort: 20416
               name: querier
               protocol: TCP
-          readinessProbe:
-            httpGet:
-              path: /v1/health/
-              port: server
-            failureThreshold: 12
-            initialDelaySeconds: 15
-            periodSeconds: 10
-            successThreshold: 1
           livenessProbe:
-            failureThreshold: 7
-            initialDelaySeconds: 15
-            periodSeconds: 20
-            successThreshold: 1
-            httpGet:
-              path: /v1/health/
-              port: server
-            timeoutSeconds: 1
+            {{ toYaml .Values.server.livenessProbe | nindent 12 }}
+          readinessProbe:
+            {{ toYaml .Values.server.readinessProbe | nindent 12 }}
           resources:
             {{- toYaml .Values.server.resources | nindent 12 }}
           volumeMounts:

diff --git a/charts/deepflow/values.yaml b/charts/deepflow/values.yaml
@@ -70,6 +70,23 @@ server:
   hostNetwork:  "{{ .Values.global.hostNetwork }}"
   dnsPolicy: "{{ .Values.global.dnsPolicy }}"
   podManagementPolicy: "{{ .Values.global.podManagementPolicy }}"
+  readinessProbe:
+    httpGet:
+      path: /v1/health/
+      port: server
+    failureThreshold: 3
+    initialDelaySeconds: 15
+    periodSeconds: 10
+    successThreshold: 1
+  livenessProbe:
+    failureThreshold: 3
+    initialDelaySeconds: 15
+    periodSeconds: 20
+    successThreshold: 1
+    httpGet:
+      path: /v1/health/
+      port: server
+    timeoutSeconds: 1
   service:
     ## Configuration for deepflow-server service
     ##
@@ -187,6 +204,21 @@ app:
   replicas: "1"
   hostNetwork:  "{{ .Values.global.hostNetwork }}"
   dnsPolicy: "{{ .Values.global.dnsPolicy }}"
+  readinessProbe:
+    tcpSocket:
+      port: app
+    failureThreshold: 3
+    initialDelaySeconds: 15
+    periodSeconds: 10
+    successThreshold: 1
+  livenessProbe:
+    failureThreshold: 3
+    initialDelaySeconds: 15
+    periodSeconds: 20
+    successThreshold: 1
+    tcpSocket:
+      port: app
+    timeoutSeconds: 1
   service:
     ## Configuration for deepflow querier service
     ##
@@ -632,6 +664,7 @@ deepflow-agent:
   podSecurityContext: {}
     # fsGroup: 2000
   hostNetwork: "true"
+  extraVolumeMounts: []
   securityContext: 
     privileged: true
     # capabilities: