Skip to content

Commit b53d781

Browse files
fix convoy version release (#49)
fix convoy version release (#49)
1 parent 174fd5b commit b53d781

7 files changed

Lines changed: 47 additions & 12 deletions

File tree

.github/workflows/lint-test.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ jobs:
2626
- name: Add Bitnami Charts Repo
2727
run: helm repo add bitnami https://charts.bitnami.com/bitnami
2828

29-
- name: Build chart dependencies
30-
run: helm dependency build
31-
3229
- name: Run chart-testing (list-changed)
3330
id: list-changed
3431
run: |
@@ -44,13 +41,12 @@ jobs:
4441
uses: helm/kind-action@v1.12.0
4542
if: steps.list-changed.outputs.changed == 'true'
4643

47-
# - name: Run chart-testing (install subcharts)
48-
# run: ct install --config ct.yaml
49-
5044
- name: Test main convoy chart installation
5145
if: steps.list-changed.outputs.changed == 'true'
5246
run: |
5347
echo "Testing main convoy chart with root values..."
48+
helm repo add bitnami https://charts.bitnami.com/bitnami
49+
helm dependency build .
5450
helm install convoy-test . --values values.yaml --timeout 300s --wait --wait-for-jobs --debug
5551
helm test convoy-test
5652
helm uninstall convoy-test

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ jobs:
5151
repo=$(cut -d '/' -f 2 <<< "$GITHUB_REPOSITORY")
5252
5353
# package chart
54-
./cr package charts/agent charts/server
54+
./cr package .
5555
5656
# upload chart to github releases
5757
./cr upload \
5858
--owner "$owner" \
5959
--git-repo "$repo" \
6060
--token "$CR_TOKEN" \
61-
--release-name-template "convoy-{{ .Name }}-{{ .Version }}"
61+
--release-name-template "convoy-{{ .Version }}"
6262
6363
# update index and push to github pages
6464
git config user.email "$owner@users.noreply.github.com"
@@ -67,7 +67,7 @@ jobs:
6767
--owner "$owner" \
6868
--git-repo "$repo" \
6969
--token "$CR_TOKEN" \
70-
--release-name-template "convoy-{{ .Name }}-{{ .Version }}" \
70+
--release-name-template "convoy-{{ .Version }}" \
7171
--index-path ./index.yaml \
7272
--charts-repo https://$owner.github.io/$repo \
7373
--push

.helmignore

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,21 @@
2121
.idea/
2222
*.tmproj
2323
.vscode/
24+
25+
# GitHub workflows and CI/CD
26+
.github/
27+
scripts/
28+
29+
.cr-release-packages/
30+
.helmdocsignore
31+
32+
Makefile
33+
34+
# Chart testing
35+
ct.yaml
36+
37+
# Build artifacts
38+
pkg/
39+
bin/
40+
41+
bin/

Chart.lock

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
dependencies:
2+
- name: agent
3+
repository: file://./charts/agent
4+
version: 3.3.0
5+
- name: server
6+
repository: file://./charts/server
7+
version: 1.0.0
28
- name: postgresql
39
repository: https://charts.bitnami.com/bitnami
410
version: 12.5.6
511
- name: redis
612
repository: https://charts.bitnami.com/bitnami
713
version: 17.11.3
8-
digest: sha256:2c6ff47eb9a3976dbdb1a5b762cdc4343ef1846f63a8f00a612c9da0336602b5
9-
generated: "2025-10-07T05:58:55.875838+01:00"
14+
digest: sha256:5998b5135e94986635af3550c7bd537c95c396c21e27a393c54499bfa086b507
15+
generated: "2025-10-07T11:49:14.263772+01:00"

Chart.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,16 @@ maintainers:
1212
- name: Convoy Engineering Team
1313
email: engineering@getconvoy.io
1414
dependencies:
15+
- name: agent
16+
version: "3.3.0"
17+
repository: "file://./charts/agent"
18+
condition: agent.enabled
19+
20+
- name: server
21+
version: "1.0.0"
22+
repository: "file://./charts/server"
23+
condition: server.enabled
24+
1525
- name: postgresql
1626
version: 12.5.6
1727
repository: https://charts.bitnami.com/bitnami

ct.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ upgrade: true
88
check-version-increment: true
99
debug: true
1010
validate-maintainers: false
11+
build-dependencies: true

values.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,16 @@ redis:
147147
registry: docker.io
148148
repository: bitnamilegacy/redis
149149
tag: 8.2.1-debian-12-r0
150-
pullPolicy: IfNotPresent
150+
pullPolicy: IfNotPresent
151151
architecture: standalone
152152
fullnameOverride: "redis"
153153
auth:
154154
enabled: *redisEnabled
155155
password: *redisPassword
156156

157157
agent:
158+
# -- Enable the agent component
159+
enabled: true
158160
image:
159161
# -- Repository to be used by the agent. The latest tag is used by default
160162
repository: *image
@@ -268,6 +270,8 @@ agent:
268270
securityContext: {}
269271

270272
server:
273+
# -- Enable the server component
274+
enabled: true
271275
image:
272276
# -- Repository to be used by the server. The latest tag is used by default
273277
repository: *image

0 commit comments

Comments
 (0)