File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -28,8 +28,10 @@ build: build-deps
2828
2929repos :
3030 rm -rf _out
31+ make -C packages/library check-version-map
3132 make -C packages/apps check-version-map
3233 make -C packages/extra check-version-map
34+ make -C packages/library repo
3335 make -C packages/system repo
3436 make -C packages/apps repo
3537 make -C packages/extra repo
Original file line number Diff line number Diff line change 11OUT =../../_out/repos/apps
2- TMP =../../_out/repos/apps/historical
2+ TMP := $( shell mktemp -d)
33
44repo :
55 rm -rf " $( OUT) "
66 mkdir -p " $( OUT) "
7- awk ' $$3 != "HEAD" {print "mkdir -p $(TMP)/" $$1 "-" $$2}' versions_map | sh -ex
8- awk ' $$3 != "HEAD" {print "git archive " $$3 " " $$1 " | tar -xf- --strip-components=1 -C $(TMP)/" $$1 "-" $$2 }' versions_map | sh -ex
9- helm package -d " $( OUT) " $$(find . $(TMP ) -mindepth 2 -maxdepth 2 -name Chart.yaml | awk 'sub("/Chart.yaml", "" ) ' | sort -V)
10- cd " $( OUT) " && helm repo index . --url http://cozystack.cozy-system.svc/repos/apps
11- rm -rf " $( TMP) "
7+ cd .. && cat apps/versions_map2 | while read package version commit ; \
8+ do \
9+ if git ls-tree --name-only $$ {commit} library | grep -qx library ; \
10+ then \
11+ git archive --format tar $$ {commit} apps/$$ {package} library | tar -xf- -C $(TMP ) / ; \
12+ else \
13+ git archive --format tar $$ {commit} apps/$$ {package} | tar -xf- -C $(TMP ) / ; \
14+ fi ; \
15+ helm package $(TMP ) /apps/$$ {package} -d apps/$(OUT ) ; \
16+ rm -rf $(TMP ) /apps/$$ {package} $(TMP ) /library ; \
17+ done
1218
1319fix-chartnames :
1420 find . -maxdepth 2 -name Chart.yaml | awk -F/ ' {print $$2}' | while read i; do sed -i " s/^name: .*/name: $$ i/" " $$ i/Chart.yaml" ; done
Original file line number Diff line number Diff line change @@ -16,10 +16,15 @@ type: application
1616# This is the chart version. This version number should be incremented each time you make changes
1717# to the chart and its templates, including the app version.
1818# Versions are expected to follow Semantic Versioning (https://semver.org/)
19- version : 0.8 .0
19+ version : 0.9 .0
2020
2121# This is the version number of the application being deployed. This version number should be
2222# incremented each time you make changes to the application. Versions are not expected to
2323# follow Semantic Versioning. They should reflect the version the application is using.
2424# It is recommended to use it with quotes.
2525appVersion : " 24.9.2"
26+
27+ dependencies :
28+ - name : cozy-lib
29+ version : 0.1.0
30+ repository : " http://cozystack.cozy-system.svc/repos/library"
Original file line number Diff line number Diff line change 1+ ../../../library/cozy-lib
Original file line number Diff line number Diff line change @@ -122,9 +122,9 @@ spec:
122122 - name : clickhouse
123123 image : clickhouse/clickhouse-server:24.9.2.42
124124 {{- if .Values.resources }}
125- resources : {{- toYaml .Values.resources | nindent 16 }}
125+ resources : {{- include "cozy-lib.resources.sanitize" .Values.resources | nindent 16 }}
126126 {{- else if ne .Values.resourcesPreset "none" }}
127- resources : {{- include "resources.preset" (dict "type" .Values.resourcesPreset "Release" .Release) | nindent 16 }}
127+ resources : {{- include "cozy-lib. resources.preset" .Values.resourcesPreset | nindent 16 }}
128128 {{- end }}
129129 volumeMounts :
130130 - name : data-volume-template
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ clickhouse 0.6.0 1ec10165
99clickhouse 0.6.1 c62a83a7
1010clickhouse 0.6.2 8267072d
1111clickhouse 0.7.0 93bdf411
12- clickhouse 0.8 .0 HEAD
12+ clickhouse 0.9 .0 HEAD
1313ferretdb 0.1.0 e9716091
1414ferretdb 0.1.1 91b0499a
1515ferretdb 0.2.0 6c5cf5bf
Original file line number Diff line number Diff line change 1+ OUT =../../_out/repos/library
2+ TMP := $(shell mktemp -d)
3+
4+ repo :
5+ rm -rf " $( OUT) "
6+ mkdir -p " $( OUT) "
7+ cd .. && cat library/versions_map | while read package version commit ; \
8+ do git archive --format tar $$ {commit} library/$$ {package} | tar -xf- -C $(TMP ) / ; \
9+ helm package $(TMP ) /library/$$ {package} -d $(OUT ) ; \
10+ rm -rf $(TMP ) /library/$$ {package} ; \
11+ done
12+
13+ fix-chartnames :
14+ find . -maxdepth 2 -name Chart.yaml | awk -F/ ' {print $$2}' | while read i; do sed -i " s/^name: .*/name: $$ i/" " $$ i/Chart.yaml" ; done
15+
16+ gen-versions-map : fix-chartnames
17+ ../../hack/gen_versions_map.sh
18+
19+ check-version-map : gen-versions-map
20+ git diff --exit-code -- versions_map
21+
Original file line number Diff line number Diff line change 1+ # Patterns to ignore when building packages.
2+ # This supports shell glob matching, relative path matching, and
3+ # negation (prefixed with !). Only one pattern per line.
4+ .DS_Store
5+ # Common VCS dirs
6+ .git/
7+ .gitignore
8+ .bzr/
9+ .bzrignore
10+ .hg/
11+ .hgignore
12+ .svn/
13+ # Common backup files
14+ *.swp
15+ *.bak
16+ *.tmp
17+ *.orig
18+ *~
19+ # Various IDEs
20+ .project
21+ .idea/
22+ *.tmproj
23+ .vscode/
Original file line number Diff line number Diff line change 1+ apiVersion : v2
2+ name : cozy-lib
3+ description : Common Cozystack templates
4+
5+ # A chart can be either an 'application' or a 'library' chart.
6+ #
7+ # Application charts are a collection of templates that can be packaged into versioned archives
8+ # to be deployed.
9+ #
10+ # Library charts provide useful utilities or functions for the chart developer. They're included as
11+ # a dependency of application charts to inject those utilities and functions into the rendering
12+ # pipeline. Library charts do not define any templates and therefore cannot be deployed.
13+ type : library
14+
15+ # This is the chart version. This version number should be incremented each time you make changes
16+ # to the chart and its templates, including the app version.
17+ # Versions are expected to follow Semantic Versioning (https://semver.org/)
18+ version : 0.1.0
Original file line number Diff line number Diff line change 1+ include ../../../scripts/common-envs.mk
2+ include ../../../scripts/package.mk
3+
4+ generate :
5+ readme-generator -v values.yaml -s values.schema.json -r README.md
6+
You can’t perform that action at this time.
0 commit comments