From c71347c4f456add9859e3eee1cca247a8dfa7268 Mon Sep 17 00:00:00 2001
From: songtianlun <tianlun.song@foxmail.com>
Date: Wed, 23 Apr 2025 21:57:54 +0800
Subject: [PATCH] chore: update nodeSelector and storageClassName

- Replace hardcoded hostname with region and dc labels
- Update storageClassName from local-vkus2 to nfs-zgo-us1

These changes improve the flexibility of the deployment by allowing
for better node selection based on region and data center, and
ensure that the storage class is correctly set for the environment.
This will help in managing resources more effectively across
different clusters.
---
 kube-prometheus-stack/values.yaml | 38 ++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/kube-prometheus-stack/values.yaml b/kube-prometheus-stack/values.yaml
index 004f123..e86f6c3 100644
--- a/kube-prometheus-stack/values.yaml
+++ b/kube-prometheus-stack/values.yaml
@@ -71,7 +71,9 @@ crds:
     ## ref: https://kubernetes.io/docs/user-guide/node-selection/
     ##
     nodeSelector:
-      kubernetes.io/hostname: "vkvm-us2"
+      #kubernetes.io/hostname: "vkvm-us2"
+      region: "us"
+      dc: "vkus"
 
     ## Assign custom affinity rules to the upgrade-crd job
     ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
@@ -1017,7 +1019,7 @@ alertmanager:
     storage:
       volumeClaimTemplate:
         spec:
-          storageClassName: local-vkus2
+          storageClassName: nfs-zgo-us1
           accessModes: ["ReadWriteOnce"]
           resources:
             requests:
@@ -1049,7 +1051,9 @@ alertmanager:
     ## ref: https://kubernetes.io/docs/user-guide/node-selection/
     ##
     nodeSelector:
-      kubernetes.io/hostname: "vkvm-us2"
+      #kubernetes.io/hostname: "vkvm-us2"
+      region: "us"
+      dc: "vkus"
 
     ## Define resources requests and limits for single Pods.
     ## ref: https://kubernetes.io/docs/user-guide/compute-resources/
@@ -1246,7 +1250,9 @@ grafana:
   replicas: 1
 
   nodeSelector: 
-    kubernetes.io/hostname: "vkvm-us2"
+    #kubernetes.io/hostname: "vkvm-us2"
+    region: "us"
+    dc: "vkus"
 
   rbac:
     ## If true, Grafana PSPs will be created
@@ -1298,7 +1304,7 @@ grafana:
   persistence:
     enabled: true
   #   type: sts
-    storageClassName: "local-vkus2"
+    storageClassName: "nfs-zgo-us1"
     accessModes:
       - ReadWriteOnce
     size: 1Gi
@@ -2803,7 +2809,9 @@ prometheusOperator:
       ## ref: https://kubernetes.io/docs/user-guide/node-selection/
       ##
       nodeSelector: 
-        kubernetes.io/hostname: "vkvm-us2"
+        #kubernetes.io/hostname: "vkvm-us2"
+        region: "us"
+        dc: "vkus"
 
       ## Tolerations for use with node taints
       ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
@@ -2877,7 +2885,9 @@ prometheusOperator:
       #   argocd.argoproj.io/hook-delete-policy: HookSucceeded
       podAnnotations: {}
       nodeSelector: 
-        kubernetes.io/hostname: "vkvm-us2"
+        #kubernetes.io/hostname: "vkvm-us2"
+        region: "us"
+        dc: "vkus"
       affinity: {}
       tolerations: []
 
@@ -3160,7 +3170,9 @@ prometheusOperator:
   ## ref: https://kubernetes.io/docs/user-guide/node-selection/
   ##
   nodeSelector:
-    kubernetes.io/hostname: "vkvm-us2"
+    #kubernetes.io/hostname: "vkvm-us2"
+    dc: "vkus"
+    region: "us"
 
   ## Tolerations for use with node taints
   ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
@@ -4006,7 +4018,9 @@ prometheus:
     ## ref: https://kubernetes.io/docs/user-guide/node-selection/
     ##
     nodeSelector: 
-      kubernetes.io/hostname: "vkvm-us2"
+      #kubernetes.io/hostname: "vkvm-us2"
+      dc: "vkus"
+      region: "us"
 
     ## Secrets is a list of Secrets in the same namespace as the Prometheus object, which shall be mounted into the Prometheus Pods.
     ## The Secrets are mounted into /etc/prometheus/secrets/. Secrets changes after initial creation of a Prometheus object are not
@@ -4266,7 +4280,7 @@ prometheus:
     ##
       volumeClaimTemplate:
         spec:
-          storageClassName: local-vkus2
+          storageClassName: nfs-zgo-us1
           accessModes: ["ReadWriteOnce"]
           resources:
             requests:
@@ -5190,7 +5204,9 @@ thanosRuler:
     ## ref: https://kubernetes.io/docs/user-guide/node-selection/
     ##
     nodeSelector:
-      kubernetes.io/hostname: "vkvm-us2"
+      #kubernetes.io/hostname: "vkvm-us2"
+      region: "us"
+      dc: "vkus"
 
     ## Define resources requests and limits for single Pods.
     ## ref: https://kubernetes.io/docs/user-guide/compute-resources/