From 613ef5984eb8e48b29f6b392bcfd794e87f2263f Mon Sep 17 00:00:00 2001
From: Mayne0213 <bluemayne0213@icloud.com>
Date: Thu, 8 Jan 2026 19:17:01 +0900
Subject: [PATCH] REFACTOR(repo): standardize taint to control-plane

- Change node-role.kubernetes.io/master to control-plane
- Update velero, zot, postgresql, minio tolerations
- Change effect from NoExecute to NoSchedule (K3s standard)
---
 minio/helm-values.yaml            |  6 +++---
 postgresql/manifests/cluster.yaml |  4 ++--
 velero/helm-values.yaml           | 10 +++++-----
 zot/helm-values.yaml              |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/minio/helm-values.yaml b/minio/helm-values.yaml
index 6162acf..8977d0f 100644
--- a/minio/helm-values.yaml
+++ b/minio/helm-values.yaml
@@ -96,11 +96,11 @@ affinity:
                   - minio
           topologyKey: kubernetes.io/hostname
 
-# Tolerations for master node (minio-0 runs on master)
+# Tolerations for control-plane node (minio-0 runs on control-plane)
 tolerations:
-  - key: "node-role.kubernetes.io/master"
+  - key: "node-role.kubernetes.io/control-plane"
     operator: "Exists"
-    effect: "NoExecute"
+    effect: "NoSchedule"
 
 # Prometheus metrics
 metrics:
diff --git a/postgresql/manifests/cluster.yaml b/postgresql/manifests/cluster.yaml
index 340629a..75e0296 100644
--- a/postgresql/manifests/cluster.yaml
+++ b/postgresql/manifests/cluster.yaml
@@ -68,9 +68,9 @@ spec:
   affinity:
     podAntiAffinityType: preferred
     tolerations:
-      - key: "node-role.kubernetes.io/master"
+      - key: "node-role.kubernetes.io/control-plane"
         operator: "Exists"
-        effect: "NoExecute"
+        effect: "NoSchedule"
 
   # Enable superuser access
   enableSuperuserAccess: true
diff --git a/velero/helm-values.yaml b/velero/helm-values.yaml
index ea66df3..b909332 100644
--- a/velero/helm-values.yaml
+++ b/velero/helm-values.yaml
@@ -103,15 +103,15 @@ serviceAccount:
 rbac:
   create: true
 
-# Node selector - Run on master node for stability
+# Node selector - Run on control-plane node for stability
 nodeSelector:
-  node-role.kubernetes.io/master: "true"
+  node-role.kubernetes.io/control-plane: "true"
 
-# Tolerations - Allow scheduling on master node
+# Tolerations - Allow scheduling on control-plane node
 tolerations:
-  - key: "node-role.kubernetes.io/master"
+  - key: "node-role.kubernetes.io/control-plane"
     operator: "Exists"
-    effect: "NoExecute"
+    effect: "NoSchedule"
 
 # Affinity (disabled - single replica on master)
 affinity: {}
diff --git a/zot/helm-values.yaml b/zot/helm-values.yaml
index 53bd5f4..a123d23 100644
--- a/zot/helm-values.yaml
+++ b/zot/helm-values.yaml
@@ -49,9 +49,9 @@ controllers:
                   app.kubernetes.io/name: zot
               topologyKey: kubernetes.io/hostname
       tolerations:
-      - key: "node-role.kubernetes.io/master"
+      - key: "node-role.kubernetes.io/control-plane"
         operator: "Exists"
-        effect: "NoExecute"
+        effect: "NoSchedule"
 
 service:
   zot: