fix(platform): drop deprecated upgrade.force from HelmReleases; fix kafka WorkloadMonitor replicas paths

Flux v2.8 / helm-controller v1.5.0 embeds Helm v4, which renamed --force to --force-replace and rejects combining it with SSA's --force-conflicts. Existing HelmReleases with spec.upgrade.force: true fail every upgrade with "cannot use force conflicts and force replace together", looping upgrade -> rollback -> upgrade and blocking dependants. Observed on PR #2619 CI for tenant-root/{ingress-nginx-system,seaweedfs-db}, tenant-test/info, and others. Per Flux docs, upgrade.force has been a no-op since v2.8 anyway, so removing it is safe on green clusters and unblocks broken ones. Also fix packages/apps/kafka/templates/workloadmonitor.yaml: it referenced .Values.replicas (no such field; values.yaml has kafka.replicas and zookeeper.replicas). Flux v2.7 silently dropped the null; v2.8 SSA forwards it, and the WorkloadMonitor CRD rejects "spec.replicas: null" as not type:integer, which blocks every kafka-test install. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> Signed-off-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com> (cherry picked from commit 7e286cf8e1)
2026-11-04 02:57:27 +09:00 · 2026-05-28 12:43:50 +05:00
1 parent 7cb7be8124
commit 7f94182a87
@@ -15,7 +15,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  valuesFrom:
@@ -53,7 +53,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  valuesFrom:
@@ -6,7 +6,7 @@ metadata:
  labels:
    workloads.cozystack.io/resource-preset: {{ .Values.kafka.resourcesPreset | quote }}
 spec:
-  replicas: {{ .Values.replicas }}
+  replicas: {{ .Values.kafka.replicas }}
  minReplicas: 1
  kind: kafka
  type: kafka
@@ -24,7 +24,7 @@ metadata:
  labels:
    workloads.cozystack.io/resource-preset: {{ .Values.zookeeper.resourcesPreset | quote }}
 spec:
-  replicas: {{ .Values.replicas }}
+  replicas: {{ .Values.zookeeper.replicas }}
  minReplicas: 1
  kind: kafka
  type: zookeeper
@@ -26,7 +26,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  {{- if .Values.addons.certManager.valuesOverride }}
@@ -36,7 +36,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  values:
@@ -42,7 +42,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  values:
@@ -31,7 +31,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  values:
@@ -26,7 +26,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  values:
@@ -25,7 +25,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  dependsOn:
@@ -34,7 +34,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  {{- $defaults := fromYaml (include "cozystack.defaultGpuOperatorValues" .) }}
@@ -29,7 +29,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  {{- with .Values.addons.hami.valuesOverride }}
@@ -48,7 +48,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  values:
@@ -28,7 +28,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  dependsOn:
@@ -138,7 +138,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  values:
@@ -26,7 +26,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  {{- with .Values.addons.velero.valuesOverride }}
@@ -52,7 +52,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  values:
@@ -26,7 +26,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  dependsOn:
@@ -26,7 +26,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  dependsOn:
@@ -46,7 +46,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  valuesFrom:
@@ -15,7 +15,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  valuesFrom:
@@ -15,7 +15,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  valuesFrom:
@@ -23,7 +23,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  valuesFrom:
@@ -22,7 +22,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  valuesFrom:
@@ -23,7 +23,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  valuesFrom:
@@ -23,7 +23,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  valuesFrom:
@@ -23,7 +23,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  valuesFrom:
@@ -19,7 +19,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  values:
@@ -17,7 +17,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  valuesFrom:
@@ -15,7 +15,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  valuesFrom:
@@ -123,7 +123,6 @@ spec:
    remediation:
      retries: -1
  upgrade:
-    force: true
    remediation:
      retries: -1
  valuesFrom: