From a57e6555ea6974c59a11194be22fc600902f964b Mon Sep 17 00:00:00 2001
From: Mayne0213 <bluemayne0213@icloud.com>
Date: Thu, 8 Jan 2026 12:49:22 +0900
Subject: [PATCH] FIX(applications): correct bjw-s/app-template schema for
 replica and affinity

- Move replicaCount to controllers.main level
- Move affinity to controllers.main.pod level
- Fix Helm schema validation errors for docusaurus, homer, mas

FIX(applications): move replicaCount to top level for bjw-s/app-template

- Move replicaCount from controllers.main to top level
- Keep affinity in controllers.main.pod.affinity
- Fix Helm schema validation errors

FIX(applications): use replicas instead of replicaCount for bjw-s/app-template

- Change replicaCount to controllers.main.replicas
- Fix schema validation for bjw-s/app-template chart
---
 docusaurus/helm-values.yaml | 23 ++++++++++++-----------
 homer/helm-values.yaml      | 23 ++++++++++++-----------
 mas/helm-values.yaml        | 23 ++++++++++++-----------
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/docusaurus/helm-values.yaml b/docusaurus/helm-values.yaml
index 152b746..6ec0cca 100644
--- a/docusaurus/helm-values.yaml
+++ b/docusaurus/helm-values.yaml
@@ -3,7 +3,7 @@
 
 controllers:
   main:
-    replicaCount: 2
+    replicas: 2
     annotations:
       docusaurus/source-hash: "2024-12-30-v1"
     initContainers:
@@ -56,16 +56,17 @@ controllers:
                 port: 80
               initialDelaySeconds: 5
               periodSeconds: 5
-    # Affinity - Soft Anti-Affinity to spread pods across nodes
-    affinity:
-      podAntiAffinity:
-        preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
-            podAffinityTerm:
-              labelSelector:
-                matchLabels:
-                  app.kubernetes.io/name: docusaurus
-              topologyKey: kubernetes.io/hostname
+    pod:
+      # Affinity - Soft Anti-Affinity to spread pods across nodes
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    app.kubernetes.io/name: docusaurus
+                topologyKey: kubernetes.io/hostname
 
 service:
   main:
diff --git a/homer/helm-values.yaml b/homer/helm-values.yaml
index 31c219b..0e30d49 100644
--- a/homer/helm-values.yaml
+++ b/homer/helm-values.yaml
@@ -3,7 +3,7 @@
 
 controllers:
   main:
-    replicaCount: 2
+    replicas: 2
     initContainers:
       copy-homer-files:
         image:
@@ -40,16 +40,17 @@ controllers:
             memory: 100Mi
           limits:
             memory: 150Mi
-    # Affinity - Soft Anti-Affinity to spread pods across nodes
-    affinity:
-      podAntiAffinity:
-        preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
-            podAffinityTerm:
-              labelSelector:
-                matchLabels:
-                  app.kubernetes.io/name: homer
-              topologyKey: kubernetes.io/hostname
+    pod:
+      # Affinity - Soft Anti-Affinity to spread pods across nodes
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    app.kubernetes.io/name: homer
+                topologyKey: kubernetes.io/hostname
 
 service:
   main:
diff --git a/mas/helm-values.yaml b/mas/helm-values.yaml
index aae4cfd..50cdf88 100644
--- a/mas/helm-values.yaml
+++ b/mas/helm-values.yaml
@@ -12,7 +12,7 @@ serviceAccount:
 
 controllers:
   main:
-    replicaCount: 2
+    replicas: 2
     strategy: RollingUpdate
     rollingUpdate:
       unavailable: 0
@@ -77,16 +77,17 @@ controllers:
                 port: 8000
               initialDelaySeconds: 0
               periodSeconds: 5
-    # Affinity - Soft Anti-Affinity to spread pods across nodes
-    affinity:
-      podAntiAffinity:
-        preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
-            podAffinityTerm:
-              labelSelector:
-                matchLabels:
-                  app.kubernetes.io/name: mas
-              topologyKey: kubernetes.io/hostname
+    pod:
+      # Affinity - Soft Anti-Affinity to spread pods across nodes
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    app.kubernetes.io/name: mas
+                topologyKey: kubernetes.io/hostname
 
 service:
   main: