From 561a07399a473d4f0587e69192e91b0aba669c71 Mon Sep 17 00:00:00 2001
From: Mayne0213 <bluemayne0213@icloud.com>
Date: Thu, 8 Jan 2026 13:05:43 +0900
Subject: [PATCH] FIX(cert-manager): merge duplicate webhook and cainjector
 sections

- Merge webhook.affinity into webhook section
- Merge cainjector.affinity into cainjector section
- Fix YAML structure to prevent configuration override
---
 cert-manager/helm-values.yaml | 42 +++++++++++++++++------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/cert-manager/helm-values.yaml b/cert-manager/helm-values.yaml
index 717fbee..7d77051 100644
--- a/cert-manager/helm-values.yaml
+++ b/cert-manager/helm-values.yaml
@@ -21,6 +21,16 @@ webhook:
       memory: 64Mi
     limits:
       memory: 96Mi
+  # Affinity - Soft Anti-Affinity to spread pods across nodes
+  affinity:
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 100
+          podAffinityTerm:
+            labelSelector:
+              matchLabels:
+                app.kubernetes.io/name: cert-manager-webhook
+            topologyKey: kubernetes.io/hostname
 
 cainjector:
   replicaCount: 2
@@ -30,6 +40,16 @@ cainjector:
       memory: 64Mi
     limits:
       memory: 96Mi
+  # Affinity - Soft Anti-Affinity to spread pods across nodes
+  affinity:
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 100
+          podAffinityTerm:
+            labelSelector:
+              matchLabels:
+                app.kubernetes.io/name: cert-manager-cainjector
+            topologyKey: kubernetes.io/hostname
 
 # Affinity - Soft Anti-Affinity to spread pods across nodes
 affinity:
@@ -42,28 +62,6 @@ affinity:
               app.kubernetes.io/name: cert-manager
           topologyKey: kubernetes.io/hostname
 
-webhook:
-  affinity:
-    podAntiAffinity:
-      preferredDuringSchedulingIgnoredDuringExecution:
-        - weight: 100
-          podAffinityTerm:
-            labelSelector:
-              matchLabels:
-                app.kubernetes.io/name: cert-manager-webhook
-            topologyKey: kubernetes.io/hostname
-
-cainjector:
-  affinity:
-    podAntiAffinity:
-      preferredDuringSchedulingIgnoredDuringExecution:
-        - weight: 100
-          podAffinityTerm:
-            labelSelector:
-              matchLabels:
-                app.kubernetes.io/name: cert-manager-cainjector
-            topologyKey: kubernetes.io/hostname
-
 # Prometheus metrics
 prometheus:
   enabled: true