大量更新

2025-03-26 15:22:01 +08:00
parent ab6a130950
commit 86bcbad396
32 changed files with 22417 additions and 19468 deletions
--- a/agent-common/SplitProject/监管平台-Doris-集群部署/doris-deployment-pv.yaml
+++ b/agent-common/SplitProject/监管平台-Doris-集群部署/doris-deployment-pv.yaml
@@ -0,0 +1,94 @@
+apiVersion: doris.selectdb.com/v1
+kind: DorisCluster
+metadata:
+  labels:
+    app.kubernetes.io/name: doriscluster
+  name: doriscluster-helm
+  namespace: doriscluster
+spec:
+  feSpec:
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+            - matchExpressions:
+                - key: uavcloud.env
+                  operator: In
+                  values:
+                    - doris
+    replicas: 3
+    image: 172.16.100.55:8033/cmii/doris.fe-ubuntu:2.1.6
+    limits:
+      cpu: 8
+      memory: 16Gi
+    requests:
+      cpu: 2
+      memory: 6Gi
+    configMapInfo:
+      # use kubectl create configmap fe-configmap --from-file=fe.conf
+      configMapName: fe-configmap
+      resolveKey: fe.conf
+    persistentVolumes:
+    - mountPath: /opt/apache-doris/fe/doris-meta
+      name: doris-fe-2000g
+      persistentVolumeClaimSpec:
+        # when use specific storageclass, the storageClassName should reConfig, example as annotation.
+        storageClassName: doris-nfs-sc-56
+        accessModes:
+          - ReadWriteOnce
+        resources:
+          requests:
+            storage: 2000Gi
+    - mountPath: /opt/apache-doris/fe/jdbc_drivers
+      name: doriscluster-storage-fe-jdbc-drivers
+      persistentVolumeClaimSpec:
+        # when use specific storageclass, the storageClassName should reConfig, example as annotation.
+        storageClassName: doris-nfs-sc-58
+        accessModes:
+        - ReadWriteOnce
+        resources:
+          requests:
+            storage: 100Gi
+  beSpec:
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+            - matchExpressions:
+                - key: uavcloud.env
+                  operator: In
+                  values:
+                    - doris
+    replicas: 3
+    image: 172.16.100.55:8033/cmii/doris.be-ubuntu:2.1.6
+    limits:
+      cpu: 8
+      memory: 24Gi
+    requests:
+      cpu: 2
+      memory: 6Gi
+    configMapInfo:
+      # use kubectl create configmap be-configmap --from-file=be.conf
+      configMapName: be-configmap
+      resolveKey: be.conf
+    persistentVolumes:
+    - mountPath: /opt/apache-doris/be/storage
+      name: doris-1-9000g-pvc
+      persistentVolumeClaimSpec:
+        # when use specific storageclass, the storageClassName should reConfig, example as annotation.
+        storageClassName: doris-nfs-sc-57
+        accessModes:
+          - ReadWriteOnce
+        resources:
+          requests:
+            storage: 9000Gi
+    - mountPath: /opt/apache-doris/be/jdbc_drivers
+      name: doriscluster-storage-be-jdbc-drivers
+      persistentVolumeClaimSpec:
+        # when use specific storageclass, the storageClassName should reConfig, example as annotation.
+        storageClassName: doris-nfs-sc-58
+        accessModes:
+        - ReadWriteOnce
+        resources:
+          requests:
+            storage: 1000Gi
--- a/agent-common/SplitProject/监管平台-Doris-集群部署/doris-deplyment.yaml
+++ b/agent-common/SplitProject/监管平台-Doris-集群部署/doris-deplyment.yaml
@@ -7,8 +7,17 @@ metadata:
  namespace: doriscluster
 spec:
  feSpec:
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+            - matchExpressions:
+                - key: doris-deploy
+                  operator: In
+                  values:
+                    - "true"
    replicas: 1
-    image: harbor.cdcyy.com.cn/cmii/doris.fe-ubuntu:2.1.6
+    image: 172.16.100.55:8033/cmii/doris.fe-ubuntu:2.1.6
    limits:
      cpu: 8
      memory: 16Gi
@@ -26,36 +35,35 @@ spec:
      name: doriscluster-storage0
      persistentVolumeClaimSpec:
        # when use specific storageclass, the storageClassName should reConfig, example as annotation.
-        storageClassName: nfs-prod-distribute
+        storageClassName: doris-static-storage
        accessModes:
        - ReadWriteOnce
        resources:
          # notice: if the storage size less 5G, fe will not start normal.
          requests:
-            storage: 300Gi
-    - mountPath: /opt/apache-doris/fe/log
-      name: doriscluster-storage1
-      persistentVolumeClaimSpec:
-        # when use specific storageclass, the storageClassName should reConfig, example as annotation.
-        storageClassName: nfs-prod-distribute
-        accessModes:
-        - ReadWriteOnce
-        resources:
-          requests:
-            storage: 100Gi
+            storage: 500Gi
    - mountPath: /opt/apache-doris/fe/jdbc_drivers
      name: doriscluster-storage-fe-jdbc-drivers
      persistentVolumeClaimSpec:
        # when use specific storageclass, the storageClassName should reConfig, example as annotation.
-        storageClassName: nfs-prod-distribute
+        storageClassName: cmlc-nfs-storage
        accessModes:
        - ReadWriteOnce
        resources:
          requests:
-            storage: 100Gi
+            storage: 10Gi
  beSpec:
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+            - matchExpressions:
+                - key: doris-deploy
+                  operator: In
+                  values:
+                    - "true"
    replicas: 3
-    image: harbor.cdcyy.com.cn/cmii/doris.be-ubuntu:2.1.6
+    image: 172.16.100.55:8033/cmii/doris.be-ubuntu:2.1.6
    limits:
      cpu: 8
      memory: 24Gi
@@ -69,33 +77,43 @@ spec:
    nodeSelector:
      uavcloud.env: demo
    persistentVolumes:
+    - mountPath: /opt/apache-doris/be/storage
+      name: doriscluster-storage1
+      persistentVolumeClaimSpec:
+        # when use specific storageclass, the storageClassName should reConfig, example as annotation.
+        storageClassName: doris-static-storage
+        accessModes:
+          - ReadWriteOnce
+        resources:
+          requests:
+            storage: 9000Gi
    - mountPath: /opt/apache-doris/be/storage
      name: doriscluster-storage2
      persistentVolumeClaimSpec:
        # when use specific storageclass, the storageClassName should reConfig, example as annotation.
-        storageClassName: nfs-prod-distribute
+        storageClassName: doris-static-storage
        accessModes:
        - ReadWriteOnce
        resources:
          requests:
-            storage: 300Gi
+            storage: 9000Gi
    - mountPath: /opt/apache-doris/be/log
      name: doriscluster-storage3
      persistentVolumeClaimSpec:
        # when use specific storageclass, the storageClassName should reConfig, example as annotation.
-        storageClassName: nfs-prod-distribute
+        storageClassName: doris-static-storage
        accessModes:
        - ReadWriteOnce
        resources:
          requests:
-            storage: 100Gi
+            storage: 9000Gi
    - mountPath: /opt/apache-doris/be/jdbc_drivers
      name: doriscluster-storage-be-jdbc-drivers
      persistentVolumeClaimSpec:
        # when use specific storageclass, the storageClassName should reConfig, example as annotation.
-        storageClassName: nfs-prod-distribute
+        storageClassName: cmlc-nfs-storage
        accessModes:
        - ReadWriteOnce
        resources:
          requests:
-            storage: 100Gi
+            storage: 10Gi
--- a/agent-common/SplitProject/监管平台-Doris-集群部署/doris-operator.yaml
+++ b/agent-common/SplitProject/监管平台-Doris-集群部署/doris-operator.yaml
@@ -284,22 +284,15 @@ spec:
      # according to the platforms which are supported by your solution.
      # It is considered best practice to support multiple architectures. You can
      # build your manager image using the makefile target docker-buildx.
-      # affinity:
-      #   nodeAffinity:
-      #     requiredDuringSchedulingIgnoredDuringExecution:
-      #       nodeSelectorTerms:
-      #         - matchExpressions:
-      #           - key: kubernetes.io/arch
-      #             operator: In
-      #             values:
-      #               - amd64
-      #               - arm64
-      #               - ppc64le
-      #               - s390x
-      #           - key: kubernetes.io/os
-      #             operator: In
-      #             values:
-      #               - linux
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+             - matchExpressions:
+               - key: doris-deploy
+                 operator: In
+                 values:
+                   - "true"
      securityContext:
        runAsNonRoot: true
        # TODO(user): For common cases that do not require escalating privileges
@@ -314,7 +307,7 @@ spec:
            - /dorisoperator
          args:
            - --leader-elect
-          image: harbor.cdcyy.com.cn/cmii/doris.k8s-operator:1.3.1
+          image: 172.16.100.55:8033/cmii/doris.k8s-operator:1.3.1
          name: dorisoperator
          securityContext:
            allowPrivilegeEscalation: false