Skip to content

Commit 2d022e3

Browse files
kvapsclaude
andcommitted
refactor(platform): restructure bundles and add PackageSources
Restructure platform bundles from monolithic files to modular directory structure with separate applicationdefinitions. Add PackageSources for better dependency management and migrate from legacy HelmRepositories to new repository format. Co-Authored-By: Claude <[email protected]> Signed-off-by: Andrei Kvapil <[email protected]>
1 parent 8e9c0dd commit 2d022e3

36 files changed

Lines changed: 568 additions & 2169 deletions

‎packages/core/platform/Makefile‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,26 @@ NAMESPACE=cozy-system
44
include ../../../scripts/common-envs.mk
55

66
show:
7-
cozyhr show -n $(NAMESPACE) $(NAME) --plain
7+
cozyhr show --namespace $(NAMESPACE) $(NAME) --plain
88

99
apply:
10-
cozyhr show -n $(NAMESPACE) $(NAME) --plain | kubectl apply -f-
11-
kubectl delete helmreleases.helm.toolkit.fluxcd.io -l cozystack.io/marked-for-deletion=true -A
10+
cozyhr show --namespace $(NAMESPACE) $(NAME) --plain | kubectl apply --filename -
11+
kubectl delete helmreleases.helm.toolkit.fluxcd.io --selector cozystack.io/marked-for-deletion=true --all-namespaces
1212

1313
reconcile: apply
1414

15-
namespaces-show:
16-
cozyhr show -n $(NAMESPACE) $(NAME) --plain -s templates/namespaces.yaml
17-
18-
namespaces-apply:
19-
cozyhr show -n $(NAMESPACE) $(NAME) --plain -s templates/namespaces.yaml | kubectl apply -f-
20-
2115
diff:
22-
cozyhr show -n $(NAMESPACE) $(NAME) --plain | kubectl diff -f-
16+
cozyhr show --namespace $(NAMESPACE) $(NAME) --plain | kubectl diff --filename -
17+
18+
image: image-migrations
2319

24-
image: image-assets
25-
image-assets:
26-
docker buildx build -f images/cozystack-assets/Dockerfile ../../.. \
27-
--tag $(REGISTRY)/cozystack-assets:$(call settag,$(TAG)) \
28-
--cache-from type=registry,ref=$(REGISTRY)/cozystack-assets:latest \
20+
image-migrations:
21+
docker buildx build --file images/migrations/Dockerfile . \
22+
--tag $(REGISTRY)/platform-migrations:$(call settag,$(TAG)) \
23+
--cache-from type=registry,ref=$(REGISTRY)/platform-migrations:latest \
2924
--cache-to type=inline \
30-
--metadata-file images/cozystack-assets.json \
25+
--metadata-file images/migrations.json \
3126
$(BUILDX_ARGS)
32-
IMAGE="$(REGISTRY)/cozystack-assets:$(call settag,$(TAG))@$$(yq e '."containerimage.digest"' images/cozystack-assets.json -o json -r)" \
33-
yq -i '.assets.image = strenv(IMAGE)' values.yaml
34-
rm -f images/cozystack-assets.json
27+
IMAGE="$(REGISTRY)/platform-migrations:$(call settag,$(TAG))@$$(yq --exit-status '.["containerimage.digest"]' images/migrations.json --output-format json --raw-output)" \
28+
yq --inplace '.migrations.image = strenv(IMAGE)' values.yaml
29+
rm -f images/migrations.json

0 commit comments

Comments
 (0)