Skip to content

Commit 7f94182

Browse files
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 <[email protected]> Signed-off-by: Myasnikov Daniil <[email protected]> (cherry picked from commit 7e286cf)
1 parent 7cb7be8 commit 7f94182

30 files changed

Lines changed: 2 additions & 31 deletions

File tree

‎packages/apps/bucket/templates/helmrelease.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ spec:
1515
remediation:
1616
retries: -1
1717
upgrade:
18-
force: true
1918
remediation:
2019
retries: -1
2120
valuesFrom:

‎packages/apps/harbor/templates/harbor.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ spec:
5353
remediation:
5454
retries: -1
5555
upgrade:
56-
force: true
5756
remediation:
5857
retries: -1
5958
valuesFrom:

‎packages/apps/kafka/templates/workloadmonitor.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
labels:
77
workloads.cozystack.io/resource-preset: {{ .Values.kafka.resourcesPreset | quote }}
88
spec:
9-
replicas: {{ .Values.replicas }}
9+
replicas: {{ .Values.kafka.replicas }}
1010
minReplicas: 1
1111
kind: kafka
1212
type: kafka
@@ -24,7 +24,7 @@ metadata:
2424
labels:
2525
workloads.cozystack.io/resource-preset: {{ .Values.zookeeper.resourcesPreset | quote }}
2626
spec:
27-
replicas: {{ .Values.replicas }}
27+
replicas: {{ .Values.zookeeper.replicas }}
2828
minReplicas: 1
2929
kind: kafka
3030
type: zookeeper

‎packages/apps/kubernetes/templates/helmreleases/cert-manager-crds.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ spec:
2626
remediation:
2727
retries: -1
2828
upgrade:
29-
force: true
3029
remediation:
3130
retries: -1
3231
{{- if .Values.addons.certManager.valuesOverride }}

‎packages/apps/kubernetes/templates/helmreleases/cert-manager.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ spec:
3636
remediation:
3737
retries: -1
3838
upgrade:
39-
force: true
4039
remediation:
4140
retries: -1
4241
values:

‎packages/apps/kubernetes/templates/helmreleases/cilium.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ spec:
4242
remediation:
4343
retries: -1
4444
upgrade:
45-
force: true
4645
remediation:
4746
retries: -1
4847
values:

‎packages/apps/kubernetes/templates/helmreleases/coredns.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ spec:
3131
remediation:
3232
retries: -1
3333
upgrade:
34-
force: true
3534
remediation:
3635
retries: -1
3736
values:

‎packages/apps/kubernetes/templates/helmreleases/fluxcd.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ spec:
2626
remediation:
2727
retries: -1
2828
upgrade:
29-
force: true
3029
remediation:
3130
retries: -1
3231
values:

‎packages/apps/kubernetes/templates/helmreleases/gateway-api-crds.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ spec:
2525
remediation:
2626
retries: -1
2727
upgrade:
28-
force: true
2928
remediation:
3029
retries: -1
3130
dependsOn:

‎packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ spec:
3434
remediation:
3535
retries: -1
3636
upgrade:
37-
force: true
3837
remediation:
3938
retries: -1
4039
{{- $defaults := fromYaml (include "cozystack.defaultGpuOperatorValues" .) }}

0 commit comments

Comments
 (0)