service

Signed-off-by: Icarus9913 <icaruswu66@qq.com>
kdoctor-io · Aug 3, 2023 · 397261a · 397261a
1 parent ccf1f72
commit 397261a
Show file tree

Hide file tree

Showing 33 changed files with 430 additions and 641 deletions.
diff --git a/charts/crds/kdoctor.io_apphttphealthies.yaml b/charts/crds/kdoctor.io_apphttphealthies.yaml
@@ -1052,6 +1052,7 @@ spec:
                     default: false
                     type: boolean
                   kind:
+                    default: DaemonSet
                     enum:
                     - Deployment
                     - DaemonSet
@@ -1105,11 +1106,10 @@ spec:
                           to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                         type: object
                     type: object
-                  terminationGracePeriodSeconds:
+                  terminationGracePeriodMinutes:
+                    default: 60
                     format: int64
                     type: integer
-                required:
-                - kind
                 type: object
               expect:
                 properties:
@@ -1199,8 +1199,6 @@ spec:
                 - host
                 - method
                 type: object
-            required:
-            - agentSpec
             type: object
           status:
             properties:

diff --git a/charts/crds/kdoctor.io_netdnses.yaml b/charts/crds/kdoctor.io_netdnses.yaml
@@ -1050,6 +1050,7 @@ spec:
                     default: false
                     type: boolean
                   kind:
+                    default: DaemonSet
                     enum:
                     - Deployment
                     - DaemonSet
@@ -1103,11 +1104,10 @@ spec:
                           to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                         type: object
                     type: object
-                  terminationGracePeriodSeconds:
+                  terminationGracePeriodMinutes:
+                    default: 60
                     format: int64
                     type: integer
-                required:
-                - kind
                 type: object
               expect:
                 properties:
@@ -1248,8 +1248,6 @@ spec:
                         type: string
                     type: object
                 type: object
-            required:
-            - agentSpec
             type: object
           status:
             properties:

diff --git a/charts/crds/kdoctor.io_netreaches.yaml b/charts/crds/kdoctor.io_netreaches.yaml
@@ -1052,6 +1052,7 @@ spec:
                     default: false
                     type: boolean
                   kind:
+                    default: DaemonSet
                     enum:
                     - Deployment
                     - DaemonSet
@@ -1105,11 +1106,10 @@ spec:
                           to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                         type: object
                     type: object
-                  terminationGracePeriodSeconds:
+                  terminationGracePeriodMinutes:
+                    default: 60
                     format: int64
                     type: integer
-                required:
-                - kind
                 type: object
               expect:
                 properties:
@@ -1192,8 +1192,6 @@ spec:
                     default: true
                     type: boolean
                 type: object
-            required:
-            - agentSpec
             type: object
           status:
             properties:

diff --git a/charts/templates/configmap.yaml b/charts/templates/configmap.yaml
@@ -34,17 +34,4 @@ data:
     agentDaemonsetName: {{ .Values.kdoctorAgent.name | trunc 63 | trimSuffix "-" }}
     agentIngressName: {{ include "project.kdoctorAgent.ingressName" . }}
     kdoctorAgent:
-      containerCommand: {{ .Values.kdoctorAgent.cmdBinName }}
-      imageConfig:
-        agentImage: {{ include "project.kdoctorAgent.image" . | quote }}
-        pullPolicy: {{ .Values.kdoctorAgent.image.pullPolicy }}
-      serviceAccountName: {{ .Values.kdoctorAgent.name | trunc 63 | trimSuffix "-" }}
-      {{- with .Values.kdoctorAgent.httpServer }}
-      httpServer:
-      {{- toYaml . | trim | nindent 8 }}
-      {{- end }}
-      reportHostPath: {{ .Values.kdoctorAgent.reportHostPath }}
-      configMapName: {{ .Values.global.configName }}
-      tlsSecretName: {{ .Values.tls.ca.secretName }}
-      labels:
-        {{- include "project.kdoctorAgent.labels" . | nindent 8 }}
+      uniqueMatchLabelKey: {{ .Values.kdoctorAgent.uniqueMatchLabelKey }}
diff --git a/charts/templates/daemonset.yaml b/charts/templates/daemonset.yaml