Skip to content

Commit cb2736f

Browse files
authored
feat!: combined helm charts (#3627)
1 parent 74ccfb7 commit cb2736f

16 files changed

+17
-909
lines changed

.github/workflows/acceptance-tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
persist: ${{ steps.deploy-comment.outputs.persist}}
3232
steps:
3333
- id: deploy-comment
34-
uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.4.5
34+
uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.7.0
3535
with:
3636
string: /deploy
3737
pr_ref: ${{ github.event.number }}
@@ -43,7 +43,7 @@ jobs:
4343
name: renku-ci-rp-${{ github.event.number }}
4444
steps:
4545
- name: deploy-pr
46-
uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.4.5
46+
uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.7.0
4747
env:
4848
DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
4949
DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
@@ -52,7 +52,7 @@ jobs:
5252
RANCHER_PROJECT_ID: ${{ secrets.CI_RANCHER_PROJECT }}
5353
RENKU_RELEASE: renku-ci-rp-${{ github.event.number }}
5454
RENKU_VALUES_FILE: "${{ github.workspace }}/values.yaml"
55-
RENKU_VALUES: ${{ secrets.CI_RENKU_VALUES }}
55+
RENKU_VALUES: ${{ secrets.COMBINED_CHARTS_CI_RENKU_VALUES }}
5656
RENKUBOT_KUBECONFIG: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
5757
RENKUBOT_RANCHER_BEARER_TOKEN: ${{ secrets.RENKUBOT_RANCHER_BEARER_TOKEN }}
5858
RANCHER_DEV_API_ENDPOINT: ${{ secrets.RANCHER_DEV_API_ENDPOINT }}
@@ -88,7 +88,7 @@ jobs:
8888
if: ${{ github.event.action != 'closed' && needs.check-deploy.outputs.pr-contains-string == 'true' && needs.check-deploy.outputs.test-enabled == 'true' }}
8989
needs: [check-deploy, deploy-pr]
9090
steps:
91-
- uses: SwissDataScienceCenter/renku-actions/test-renku@v1.4.5
91+
- uses: SwissDataScienceCenter/renku-actions/test-renku@v1.7.0
9292
with:
9393
kubeconfig: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
9494
renku-release: renku-ci-rp-${{ github.event.number }}
@@ -103,7 +103,7 @@ jobs:
103103
runs-on: ubuntu-20.04
104104
steps:
105105
- name: renku teardown
106-
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.4.5
106+
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.7.0
107107
env:
108108
HELM_RELEASE_REGEX: "^renku-ci-rp-${{ github.event.number }}$"
109109
GITLAB_TOKEN: ${{ secrets.DEV_GITLAB_TOKEN }}

.github/workflows/test_deploy.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -589,19 +589,16 @@ jobs:
589589
run: |
590590
echo "GIT_USER=Renku Bot" >> $GITHUB_ENV
591591
echo "[email protected]" >> $GITHUB_ENV
592-
- name: Push chart and images
593-
uses: SwissDataScienceCenter/renku-actions/publish-chart@v1.4.5
592+
- name: Build and push images
593+
uses: SwissDataScienceCenter/renku-actions/publish-chartpress-images@v1.7.0
594594
env:
595-
CHART_NAME: renku-core
596595
GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
597596
DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
598597
DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
599-
- name: Wait for chart to be available
600-
run: sleep 120
601598
- name: Update component version
602-
uses: SwissDataScienceCenter/renku-actions/update-component-version@v1.4.5
599+
uses: SwissDataScienceCenter/renku-actions/update-component-version@v1.7.0
603600
env:
604-
CHART_NAME: renku-core
601+
COMPONENT_NAME: renku-core
605602
GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
606603

607604
coveralls-final:

DEVELOPING.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ number.
261261
- Once the release PR has been merged, publish the github release. This creates
262262
the tag on master that kicks off the publishing CI.
263263
- Keep an eye on CI, make sure that the `publish-pypi`, `build-images` and
264-
`publish-chart` finish successfully.
264+
`publish-chartpress-images` finish successfully.
265265
* If any of them don't finish successfully, ask for help.
266266
- Go to the `Renku` repository and approve/merge the automatically created PR
267267
there.

chartpress.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ charts:
1111
renku-core:
1212
contextPath: .
1313
dockerfilePath: Dockerfile
14-
valuesPath: versions.latest.image
14+
valuesPath: global.core.versions.latest.image
1515
buildArgs:
1616
CLEAN_INSTALL: "1"
1717
BUILD_CORE_SERVICE: "1"
18-

git-deploy-chart.sh

Lines changed: 0 additions & 41 deletions
This file was deleted.

helm-chart/renku-core/requirements.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

helm-chart/renku-core/templates/_helpers.tpl

Lines changed: 0 additions & 45 deletions
This file was deleted.

helm-chart/renku-core/templates/cache-cleanup-job.yaml

Lines changed: 0 additions & 27 deletions
This file was deleted.

helm-chart/renku-core/templates/configmap.yaml

Lines changed: 0 additions & 21 deletions
This file was deleted.

helm-chart/renku-core/templates/cronjob-serviceaccount.yaml

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)