2 files changed, 7 insertions, 8 deletions
diff --git a/deploy/helm/seaweedfs-csi-driver/templates/daemonset.yml b/deploy/helm/seaweedfs-csi-driver/templates/daemonset.yml
index c9dfd50..8d90cd3 100644
--- a/deploy/helm/seaweedfs-csi-driver/templates/daemonset.yml
+++ b/deploy/helm/seaweedfs-csi-driver/templates/daemonset.yml
@@ -82,7 +82,7 @@ spec:
               valueFrom:
                 fieldRef:
                   # Injected by ModRule 'inject-topology-labels'
-                  fieldPath: metadata.labels['{{ .Values.node.injectTopologyInfoFromNodeLabel.labels.dataCenter }}']
+                  fieldPath: metadata.labels['dataCenter']
             {{- end }}
             {{- if .Values.tlsSecret }}
             - name: WEED_GRPC_CLIENT_KEY
diff --git a/deploy/helm/seaweedfs-csi-driver/templates/kubemod_modrule.yml b/deploy/helm/seaweedfs-csi-driver/templates/kubemod_modrule.yml
index 9e78b04..af8cf39 100644
--- a/deploy/helm/seaweedfs-csi-driver/templates/kubemod_modrule.yml
+++ b/deploy/helm/seaweedfs-csi-driver/templates/kubemod_modrule.yml
@@ -4,7 +4,6 @@ apiVersion: api.kubemod.io/v1beta1
 kind: ModRule
 metadata:
   name: inject-topology-labels
-  #namespace: kubemod-system
 spec:
   type: Patch
   targetNamespaceRegex: ".*"
@@ -13,17 +12,17 @@ spec:
 
   match:
     # Match pods...
-    - select: '{{ template "seaweedfs-csi-driver.name" . }}-node'
+    - select: '$.kind'
       matchValue: 'Pod'
+    # ... with label app = seaweedfs-csi-driver ...
+    - select: '$.metadata.labels.app'
+      matchValue: '{{ template "seaweedfs-csi-driver.name" . }}-node'
     # ...which have access to the node's manifest through the synthetic ref injected by KubeMod.
     - select: '$.syntheticRefs.node.metadata.labels'
 
   patch:
     # Grab the node's region and zone and put them in the pod's corresponding labels.
     - op: add
-      path: /metadata/labels/topology.kubernetes.io~1region
-      value: '"{{ index .Target.syntheticRefs.node.metadata.labels "topology.kubernetes.io/region"}}"'
-    - op: add
-      path: /metadata/labels/topology.kubernetes.io~1zone
-      value: '"{{ index .Target.syntheticRefs.node.metadata.labels "topology.kubernetes.io/zone"}}"'
+      path: /metadata/labels/dataCenter
+      value: '{{`{{`}} index .Target.syntheticRefs.node.metadata.labels "{{ .Values.node.injectTopologyInfoFromNodeLabel.labels.dataCenter }}" {{`}}`}}'
 {{- end }}