feat(helm): 集群分布调整

apps/apps/halo/helmchart.yaml

@@ -16,7 +16,7 @@ spec:
             podAffinityTerm:
               labelSelector:
                 matchLabels:
-                  cnpg.io/cluster: cnpg-cluster-hk
+                  cnpg.io/cluster: cnpg17-cluster-hk
                   role: primary
               topologyKey: kubernetes.io/hostname
               namespaceSelector: {}
@@ -28,7 +28,7 @@ spec:
                 - key: kubernetes.io/hostname
                   operator: In
                   values:
-                    - greenhk  
+                    - clawhk  
     image:
       repository: halohub/halo-pro
       tag: 2.21.8

apps/infra/data/redis/helmchart-hk.yaml

@@ -1,28 +0,0 @@
-apiVersion: helm.cattle.io/v1
-kind: HelmChart
-metadata:
-  name: redis-cluster-hk
-  namespace: infra-data
-spec:
-  chart: oci://registry-1.docker.io/bitnamicharts/redis
-  targetNamespace: infra-data
-  version: 20.7.0
-  valuesContent: |-
-    global:
-      redis:
-        password: ribiPwYQNU6GWxCYR0Nj
-    master:
-      nodeAffinityPreset:
-        type: soft
-        key: topology.kubernetes.io/region
-        values:
-          - cn-hk
-    replica:
-      replicaCount: 0
-      nodeAffinityPreset:
-        type: soft
-        key: topology.kubernetes.io/region
-        values:
-          - cn-hk 
-
-

apps/infra/devops/gitea/helmchart.yaml

@@ -12,11 +12,11 @@ spec:
     affinity:
       podAffinity:
         preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 1
+          - weight: 100
             podAffinityTerm:
               labelSelector:
                 matchLabels:
-                  cnpg.io/cluster: cnpg-cluster-sh
+                  cnpg.io/cluster: cnpg17-cluster-sh
                   role: primary
                   app.kubernetes.io/name: redis
                   app.kubernetes.io/component: master

apps/infra/monitor/loki/helmchart-loki.yaml

@@ -22,11 +22,11 @@ spec:
         - -labelvalue=loki-canary
     resultsCache:
       nodeSelector:
-        kubernetes.io/hostname: clawhk
+        kubernetes.io/hostname: tce
       allocatedMemory: 1024
     chunksCache:
       nodeSelector:
-        kubernetes.io/hostname: clawhk
+        kubernetes.io/hostname: tce
       allocatedMemory: 1024
     loki:
       auth_enabled: false
@@ -50,7 +50,7 @@ spec:
     singleBinary:
       replicas: 1
       nodeSelector:
-        kubernetes.io/hostname: clawhk
+        kubernetes.io/hostname: tce
     read:
       replicas: 0
     backend:

apps/infra/monitor/prometheus/helmchart.yaml

@@ -20,15 +20,24 @@ spec:
 
     prometheusOperator:
       nodeSelector:
-        kubernetes.io/hostname: alihka
+        kubernetes.io/hostname: hwa
         
     kube-state-metrics:
       nodeSelector:
-        kubernetes.io/hostname: alihka
+        kubernetes.io/hostname: hwa
               
     grafana:
-      nodeSelector:
+      affinity:
-        kubernetes.io/hostname: greenhk
+        podAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    cnpg.io/cluster: cnpg17-cluster-sh
+                    role: primary
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
       ingress:
         enabled: true
         ingressClassName: nginx
@@ -52,10 +61,10 @@ spec:
           news_feed_enabled: false
         database:
           type: postgres
-          host: cnpg17-cluster-hk-rw.infra-data:5432
+          host: cnpg17-cluster-sh-rw.infra-data:5432
           name: grafana
           user: app
-          password: QrmOnigueiiKWDxS5HqS8h765fUZoV1fj2WFkHpqZOPnKAGcM9paiXC1VzGUA3PD
+          password: HueUoQx05DM0ICBPu1GrmBvBXE6NO3poKE6yPqokPv3dPpWvWRLAr3RXSpaL3AZd
       persistence:
         type: pvc
         enabled: true
@@ -67,7 +76,7 @@ spec:
     prometheus:
       prometheusSpec:
         nodeSelector:
-          kubernetes.io/hostname: alihka
+          kubernetes.io/hostname: hwa
         storageSpec:
           volumeClaimTemplate:
             spec:
@@ -93,7 +102,7 @@ spec:
     alertmanager:
       alertmanagerSpec:
         nodeSelector:
-          kubernetes.io/hostname: alihka
+          kubernetes.io/hostname: hwa
         storage: 
           volumeClaimTemplate:
             spec:

apps/infra/net/crowdsec/helmchart.yaml

@@ -13,9 +13,16 @@ spec:
     image:
       tag: v1.6.11
     agent:
-      # 由于dataScope为loki，所以此处强制要求部署在loki所在的节点 以节省网络资源
+      affinity:
-      nodeSelector:
+        podAffinity:
-        kubernetes.io/hostname: alihka 
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    app.kubernetes.io/name: loki
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
       isDeployment: true
       additionalAcquisition:
         - source: loki