Merge pull request #334 from pixiake/release-1.0

merge controller and apiserver to one pod
kubesphere · Aug 20, 2024 · 820edcc · 820edcc
2 parents 39c2b99 + ebc4099
commit 820edcc
Show file tree

Hide file tree

Showing 19 changed files with 303 additions and 390 deletions.
diff --git a/bin/controller-gen b/bin/controller-gen
diff --git a/bin/kustomize b/bin/kustomize
diff --git a/chart/kubeeye/crds/inspectplan-crd.yaml b/chart/kubeeye/crds/inspectplan-crd.yaml
@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.1
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: (devel)
   name: inspectplans.kubeeye.kubesphere.io
 spec:
   group: kubeeye.kubesphere.io
@@ -20,14 +19,19 @@ spec:
         description: InspectPlan is the Schema for the InspectPlans API
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object

diff --git a/chart/kubeeye/crds/inspectresult-crd.yaml b/chart/kubeeye/crds/inspectresult-crd.yaml
@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.1
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: (devel)
   name: inspectresults.kubeeye.kubesphere.io
 spec:
   group: kubeeye.kubesphere.io
@@ -20,14 +19,19 @@ spec:
         description: InspectResult is the Schema for the inspectresults API
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object

diff --git a/chart/kubeeye/crds/inspectrule-crd.yaml b/chart/kubeeye/crds/inspectrule-crd.yaml
@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.1
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: (devel)
   name: inspectrules.kubeeye.kubesphere.io
 spec:
   group: kubeeye.kubesphere.io
@@ -20,14 +19,19 @@ spec:
         description: InspectRule is the Schema for the InspectRule API
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object

diff --git a/chart/kubeeye/crds/inspecttask-crd.yaml b/chart/kubeeye/crds/inspecttask-crd.yaml
@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.1
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: (devel)
   name: inspecttasks.kubeeye.kubesphere.io
 spec:
   group: kubeeye.kubesphere.io
@@ -20,14 +19,19 @@ spec:
         description: InspectTask is the Schema for the InspectTasks API
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object

diff --git a/chart/kubeeye/templates/apiserver.yaml b/chart/kubeeye/templates/apiserver.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   type: {{ .Values.apiserver.type }}
   selector:
-    app: kubeeye-apiserver
+    control-plane: kubeeye-controller-manager
   {{- include "kubeeye.selectorLabels" . | nindent 4 }}
   ports:
-	{{- .Values.apiserver.ports | toYaml | nindent 2 -}}
+	{{- .Values.apiserver.ports | toYaml | nindent 2 }}
diff --git a/chart/kubeeye/templates/config.yaml b/chart/kubeeye/templates/config.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: kubeeye-config
+  name: {{ include "kubeeye.fullname" . }}-config
   labels:
   {{- include "kubeeye.labels" . | nindent 4 }}
 data:

diff --git a/chart/kubeeye/templates/deployment.yaml b/chart/kubeeye/templates/deployment.yaml
@@ -1,69 +1,5 @@
 apiVersion: apps/v1
 kind: Deployment
-metadata:
-  name: {{ include "kubeeye.fullname" . }}-apiserver
-  labels:
-    app: kubeeye-apiserver
-  {{- include "kubeeye.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.apiserver.replicas }}
-  selector:
-    matchLabels:
-      app: kubeeye-apiserver
-    {{- include "kubeeye.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels:
-        app: kubeeye-apiserver
-      {{- include "kubeeye.selectorLabels" . | nindent 8 }}
-    spec:
-      containers:
-      - env:
-        - name: GIN_MODE
-          value: {{ quote .Values.apiserver.kubeeyeApiserver.env.ginMode }}
-        - name: KUBERNETES_CLUSTER_DOMAIN
-          value: {{ quote .Values.kubernetesClusterDomain }}
-        image: {{ .Values.apiserver.kubeeyeApiserver.image.repository }}:{{ .Values.apiserver.kubeeyeApiserver.image.tag
-          | default .Chart.AppVersion }}
-        imagePullPolicy: {{ .Values.apiserver.kubeeyeApiserver.imagePullPolicy }}
-        livenessProbe:
-          httpGet:
-            path: /readyz
-            port: 9090
-          initialDelaySeconds: 15
-          periodSeconds: 20
-          timeoutSeconds: 10
-        name: kubeeye-apiserver
-        readinessProbe:
-          httpGet:
-            path: /healthz
-            port: 9090
-          initialDelaySeconds: 5
-          periodSeconds: 10
-          timeoutSeconds: 10
-        resources: {{- toYaml .Values.apiserver.kubeeyeApiserver.resources | nindent 10
-          }}
-        volumeMounts:
-        - mountPath: /etc/localtime
-          name: localtime
-        - mountPath: /kubeeye/data
-          name: inspect-result
-          readOnly: true
-      restartPolicy: Always
-      securityContext:
-        fsGroup: 1000
-        runAsNonRoot: true
-      serviceAccountName: {{ include "kubeeye.fullname" . }}-controller-manager
-      volumes:
-      - hostPath:
-          path: /etc/localtime
-        name: localtime
-      - name: inspect-result
-        persistentVolumeClaim:
-          claimName: {{ include "kubeeye.fullname" . }}-inspect-result
----
-apiVersion: apps/v1
-kind: Deployment
 metadata:
   name: {{ include "kubeeye.fullname" . }}-controller-manager
   labels:
@@ -126,6 +62,44 @@ spec:
           name: inspect-result
         - mountPath: /etc/localtime
           name: localtime
+      - env:
+        - name: GIN_MODE
+          value: {{ quote .Values.controllerManager.kubeeyeApiserver.env.ginMode }}
+        - name: DISABLE_SYSTEM_COMPONENT
+          value: {{ quote .Values.controllerManager.kubeeyeApiserver.env.disableSystemComponent
+            }}
+        - name: DISABLE_OVERVIEW
+          value: {{ quote .Values.controllerManager.kubeeyeApiserver.env.disableOverview
+            }}
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        image: {{ .Values.controllerManager.kubeeyeApiserver.image.repository }}:{{ .Values.controllerManager.kubeeyeApiserver.image.tag
+          | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.controllerManager.kubeeyeApiserver.imagePullPolicy
+          }}
+        livenessProbe:
+          httpGet:
+            path: /readyz
+            port: 9090
+          initialDelaySeconds: 15
+          periodSeconds: 20
+          timeoutSeconds: 10
+        name: kubeeye-apiserver
+        readinessProbe:
+          httpGet:
+            path: /healthz
+            port: 9090
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          timeoutSeconds: 10
+        resources: {{- toYaml .Values.controllerManager.kubeeyeApiserver.resources | nindent
+          10 }}
+        volumeMounts:
+        - mountPath: /etc/localtime
+          name: localtime
+        - mountPath: /kubeeye/data
+          name: inspect-result
+          readOnly: true
       securityContext:
         fsGroup: 1000
         runAsNonRoot: true