Skip to content

Commit

Permalink
feat!: combined helm charts (#3627)
Browse files Browse the repository at this point in the history
  • Loading branch information
olevski authored Oct 2, 2023
1 parent 74ccfb7 commit cb2736f
Show file tree
Hide file tree
Showing 16 changed files with 17 additions and 909 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/acceptance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
persist: ${{ steps.deploy-comment.outputs.persist}}
steps:
- id: deploy-comment
uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.4.5
uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.7.0
with:
string: /deploy
pr_ref: ${{ github.event.number }}
Expand All @@ -43,7 +43,7 @@ jobs:
name: renku-ci-rp-${{ github.event.number }}
steps:
- name: deploy-pr
uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.4.5
uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.7.0
env:
DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
Expand All @@ -52,7 +52,7 @@ jobs:
RANCHER_PROJECT_ID: ${{ secrets.CI_RANCHER_PROJECT }}
RENKU_RELEASE: renku-ci-rp-${{ github.event.number }}
RENKU_VALUES_FILE: "${{ github.workspace }}/values.yaml"
RENKU_VALUES: ${{ secrets.CI_RENKU_VALUES }}
RENKU_VALUES: ${{ secrets.COMBINED_CHARTS_CI_RENKU_VALUES }}
RENKUBOT_KUBECONFIG: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
RENKUBOT_RANCHER_BEARER_TOKEN: ${{ secrets.RENKUBOT_RANCHER_BEARER_TOKEN }}
RANCHER_DEV_API_ENDPOINT: ${{ secrets.RANCHER_DEV_API_ENDPOINT }}
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
if: ${{ github.event.action != 'closed' && needs.check-deploy.outputs.pr-contains-string == 'true' && needs.check-deploy.outputs.test-enabled == 'true' }}
needs: [check-deploy, deploy-pr]
steps:
- uses: SwissDataScienceCenter/renku-actions/test-renku@v1.4.5
- uses: SwissDataScienceCenter/renku-actions/test-renku@v1.7.0
with:
kubeconfig: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
renku-release: renku-ci-rp-${{ github.event.number }}
Expand All @@ -103,7 +103,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: renku teardown
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.4.5
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.7.0
env:
HELM_RELEASE_REGEX: "^renku-ci-rp-${{ github.event.number }}$"
GITLAB_TOKEN: ${{ secrets.DEV_GITLAB_TOKEN }}
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/test_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -589,19 +589,16 @@ jobs:
run: |
echo "GIT_USER=Renku Bot" >> $GITHUB_ENV
echo "[email protected]" >> $GITHUB_ENV
- name: Push chart and images
uses: SwissDataScienceCenter/renku-actions/publish-chart@v1.4.5
- name: Build and push images
uses: SwissDataScienceCenter/renku-actions/publish-chartpress-images@v1.7.0
env:
CHART_NAME: renku-core
GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
- name: Wait for chart to be available
run: sleep 120
- name: Update component version
uses: SwissDataScienceCenter/renku-actions/update-component-version@v1.4.5
uses: SwissDataScienceCenter/renku-actions/update-component-version@v1.7.0
env:
CHART_NAME: renku-core
COMPONENT_NAME: renku-core
GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}

coveralls-final:
Expand Down
2 changes: 1 addition & 1 deletion DEVELOPING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ number.
- Once the release PR has been merged, publish the github release. This creates
the tag on master that kicks off the publishing CI.
- Keep an eye on CI, make sure that the `publish-pypi`, `build-images` and
`publish-chart` finish successfully.
`publish-chartpress-images` finish successfully.
* If any of them don't finish successfully, ask for help.
- Go to the `Renku` repository and approve/merge the automatically created PR
there.
Expand Down
3 changes: 1 addition & 2 deletions chartpress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ charts:
renku-core:
contextPath: .
dockerfilePath: Dockerfile
valuesPath: versions.latest.image
valuesPath: global.core.versions.latest.image
buildArgs:
CLEAN_INSTALL: "1"
BUILD_CORE_SERVICE: "1"

41 changes: 0 additions & 41 deletions git-deploy-chart.sh

This file was deleted.

4 changes: 0 additions & 4 deletions helm-chart/renku-core/requirements.yaml

This file was deleted.

45 changes: 0 additions & 45 deletions helm-chart/renku-core/templates/_helpers.tpl

This file was deleted.

27 changes: 0 additions & 27 deletions helm-chart/renku-core/templates/cache-cleanup-job.yaml

This file was deleted.

21 changes: 0 additions & 21 deletions helm-chart/renku-core/templates/configmap.yaml

This file was deleted.

36 changes: 0 additions & 36 deletions helm-chart/renku-core/templates/cronjob-serviceaccount.yaml

This file was deleted.

Loading

0 comments on commit cb2736f

Please sign in to comment.