Skip to content

Commit 05d6ab9

Browse files
committed
[platform] Another logic for deleting components
Signed-off-by: Andrei Kvapil <[email protected]>
1 parent ccb001e commit 05d6ab9

2 files changed

Lines changed: 16 additions & 30 deletions

File tree

‎packages/core/platform/Makefile‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,11 @@ show:
77
helm template -n $(NAMESPACE) $(NAME) . --dry-run=server $(API_VERSIONS_FLAGS)
88

99
apply:
10-
@echo "Applying active HelmReleases..."
1110
helm template -n $(NAMESPACE) $(NAME) . --dry-run=server $(API_VERSIONS_FLAGS) \
12-
| yq 'select(.metadata.annotations."cozystack.io/marked-for-deletion" != "true")' - \
1311
| kubectl apply -f-
12+
kubectl delete helmreleases.helm.toolkit.fluxcd.io -l cozystack.io/marked-for-deletion=true -A
1413

15-
delete:
16-
@echo "Deleting marked-for-deletion HelmReleases..."
17-
helm template -n $(NAMESPACE) $(NAME) . --dry-run=server $(API_VERSIONS_FLAGS) \
18-
| yq 'select(.metadata.annotations."cozystack.io/marked-for-deletion" == "true")' - \
19-
| kubectl delete -f - --ignore-not-found=true
20-
21-
reconcile: apply delete
14+
reconcile: apply
2215

2316
namespaces-show:
2417
helm template -n $(NAMESPACE) $(NAME) . --dry-run=server $(API_VERSIONS_FLAGS) -s templates/namespaces.yaml

‎packages/core/platform/templates/helmreleases.yaml‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,17 @@
1111
{{- end }}
1212

1313
{{- range $x := $bundle.releases }}
14-
{{- if not (has $x.name $disabledComponents) }}
15-
{{- if or (not $x.optional) (and ($x.optional) (has $x.name $enabledComponents)) }}
14+
15+
{{- $shouldInstall := true }}
16+
{{- $shouldDelete := false }}
17+
{{- if or (has $x.name $disabledComponents) (and ($x.optional) (not (has $x.name $enabledComponents))) }}
18+
{{- $shouldInstall = false }}
19+
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" $x.namespace $x.name }}
20+
{{- $shouldDelete = true }}
21+
{{- end }}
22+
{{- end }}
23+
24+
{{- if or $shouldInstall $shouldDelete }}
1625
---
1726
apiVersion: helm.toolkit.fluxcd.io/v2
1827
kind: HelmRelease
@@ -22,6 +31,9 @@ metadata:
2231
labels:
2332
cozystack.io/repository: system
2433
cozystack.io/system-app: "true"
34+
{{- if $shouldDelete }}
35+
cozystack.io/marked-for-deletion: "true"
36+
{{- end }}
2537
spec:
2638
interval: 5m
2739
releaseName: {{ $x.releaseName | default $x.name }}
@@ -79,22 +91,3 @@ spec:
7991
{{- end }}
8092
{{- end }}
8193
{{- end }}
82-
{{- end }}
83-
84-
{{- range $name := $disabledComponents }}
85-
{{- if ne $name "" }}
86-
---
87-
apiVersion: helm.toolkit.fluxcd.io/v2
88-
kind: HelmRelease
89-
metadata:
90-
name: {{ $name }}
91-
namespace: {{ index $dependencyNamespaces $name | default "cozy-system" }}
92-
annotations:
93-
cozystack.io/marked-for-deletion: "true"
94-
labels:
95-
cozystack.io/repository: system
96-
cozystack.io/system-app: "true"
97-
spec:
98-
suspend: true
99-
{{- end }}
100-
{{- end }}

0 commit comments

Comments
 (0)