Skip to content

Commit fed07a3

Browse files
RenkuBotaledegano
authored andcommitted
chore: Update renku actions to v1.15.1
* Define defaults requests/limits in values file * Use local minimal-deployment values for CI deployments * Remove `graph.enabled` switch from ingress Helm chart template
1 parent 29efcbd commit fed07a3

11 files changed

Lines changed: 156 additions & 81 deletions

File tree

.github/workflows/cron-jobs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ name: Cron jobs
33
on:
44
schedule:
55
# Every day at 1am
6-
- cron: '0 1 * * *'
6+
- cron: "0 1 * * *"
77
workflow_dispatch:
88

99
jobs:
1010
remove-CI-deployments:
1111
runs-on: ubuntu-24.04
1212
steps:
1313
- name: renku teardown
14-
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.14.1
14+
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.15.1
1515
env:
1616
GITLAB_TOKEN: ${{ secrets.DEV_GITLAB_TOKEN }}
1717
RENKUBOT_KUBECONFIG: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}

.github/workflows/publish-helm-chart.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set version
1616
id: vars
1717
run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
18-
- uses: SwissDataScienceCenter/renku-actions/publish-chart@v1.14.1
18+
- uses: SwissDataScienceCenter/renku-actions/publish-chart@v1.15.1
1919
env:
2020
CHART_DIR: helm-chart/
2121
CHART_NAME: renku

.github/workflows/publish-master-merges.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fetch-depth: 0
2020
- uses: azure/setup-helm@v4
2121
with:
22-
version: '3.8.0'
22+
version: "3.8.0"
2323
id: setup-helm
2424
- id: get-latest-version
2525
run: |
@@ -35,7 +35,7 @@ jobs:
3535
- id: set-version
3636
run: |
3737
echo "publish_version=${{ steps.bump-semver.outputs.new_version }}.$(echo ${{ github.sha }} | cut -c 1-7)" >> $GITHUB_ENV
38-
- uses: SwissDataScienceCenter/renku-actions/publish-chart@v1.14.1
38+
- uses: SwissDataScienceCenter/renku-actions/publish-chart@v1.15.1
3939
env:
4040
CHART_DIR: helm-chart/
4141
CHART_TAG: "--tag ${{env.publish_version}}"
@@ -62,7 +62,6 @@ jobs:
6262
- uses: actions-ecosystem/action-push-tag@v1
6363
with:
6464
tag: ${{ env.publish_version }}
65-
message:
66-
"${{ env.publish_version }}: PR #${{
65+
message: "${{ env.publish_version }}: PR #${{
6766
github.event.pull_request.number }} ${{
6867
github.event.pull_request.title }}"

.github/workflows/pull-request-test.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
steps:
6767
- uses: actions/checkout@v4.1.7
6868
- id: deploy-comment
69-
uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.14.1
69+
uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.15.1
7070
with:
7171
string: /deploy
7272
pr_ref: ${{ github.event.number }}
@@ -83,7 +83,7 @@ jobs:
8383
- uses: actions/checkout@v4.1.7
8484
- name: renku build and deploy
8585
if: needs.check-deploy.outputs.pr-contains-string == 'true'
86-
uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.14.1
86+
uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.15.1
8787
env:
8888
DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
8989
DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
@@ -92,7 +92,7 @@ jobs:
9292
RENKU_ANONYMOUS_SESSIONS: true
9393
RENKU_RELEASE: ci-renku-${{ github.event.number }}
9494
RENKU_VALUES_FILE: "${{ github.workspace }}/values.yaml"
95-
RENKU_VALUES: ${{ secrets.COMBINED_CHARTS_CI_RENKU_VALUES }}
95+
RENKU_VALUES: minimal-deployment/minimal-deployment-values.yaml
9696
RENKUBOT_KUBECONFIG: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
9797
TEST_ARTIFACTS_PATH: "tests-artifacts-${{ github.sha }}"
9898
renku: "@${{ github.head_ref }}"
@@ -128,7 +128,7 @@ jobs:
128128
needs: [check-deploy, deploy-pr]
129129
runs-on: ubuntu-24.04
130130
steps:
131-
- uses: SwissDataScienceCenter/renku-actions/test-renku@v1.14.1
131+
- uses: SwissDataScienceCenter/renku-actions/test-renku@v1.15.1
132132
with:
133133
kubeconfig: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
134134
renku-release: ci-renku-${{ github.event.number }}
@@ -156,7 +156,7 @@ jobs:
156156
rstudioSession,
157157
]
158158
steps:
159-
- uses: SwissDataScienceCenter/renku-actions/test-renku-cypress@v1.14.1
159+
- uses: SwissDataScienceCenter/renku-actions/test-renku-cypress@v1.15.1
160160
if: github.event.action != 'closed' && needs.check-deploy.outputs.pr-contains-string == 'true' && needs.check-deploy.outputs.test-enabled == 'true'
161161
with:
162162
e2e-target: ${{ matrix.tests }}
@@ -197,17 +197,17 @@ jobs:
197197
runs-on: ubuntu-24.04
198198
steps:
199199
- name: Check deploy string
200-
if: ${{
201-
needs.check-deploy.outputs.pr-contains-string == 'true'
202-
&& startsWith(github.base_ref, 'release-')
203-
&& (
204-
needs.check-deploy.outputs.renku-core != null
205-
|| needs.check-deploy.outputs.renku-gateway != null
206-
|| needs.check-deploy.outputs.renku-graph != null
207-
|| needs.check-deploy.outputs.renku-notebooks != null
208-
|| needs.check-deploy.outputs.renku-ui != null
209-
|| needs.check-deploy.outputs.renku-data-services != null
210-
)
200+
if: ${{
201+
needs.check-deploy.outputs.pr-contains-string == 'true'
202+
&& startsWith(github.base_ref, 'release-')
203+
&& (
204+
needs.check-deploy.outputs.renku-core != null
205+
|| needs.check-deploy.outputs.renku-gateway != null
206+
|| needs.check-deploy.outputs.renku-graph != null
207+
|| needs.check-deploy.outputs.renku-notebooks != null
208+
|| needs.check-deploy.outputs.renku-ui != null
209+
|| needs.check-deploy.outputs.renku-data-services != null
210+
)
211211
}}
212212
uses: actions/github-script@v7
213213
with:
@@ -218,7 +218,7 @@ jobs:
218218
runs-on: ubuntu-24.04
219219
steps:
220220
- name: renku teardown
221-
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.14.1
221+
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.15.1
222222
env:
223223
HELM_RELEASE_REGEX: "^ci-renku-${{ github.event.number }}$"
224224
GITLAB_TOKEN: ${{ secrets.DEV_GITLAB_TOKEN }}

.github/workflows/renku-dev-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
github.event.client_payload.message == 'Helm test succeeded' }}
99
runs-on: ubuntu-24.04
1010
steps:
11-
- uses: SwissDataScienceCenter/renku-actions/test-renku@v1.14.1
11+
- uses: SwissDataScienceCenter/renku-actions/test-renku@v1.15.1
1212
with:
1313
kubeconfig: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
1414
renku-release: renku

CHANGELOG.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
33
0.65.1
44
------
55

6+
Renku 0.65.1 refactors the code used to deploy CI installations used to test Pull Requests.
7+
NOTE to administrators: The default values file now specify several resource requests and limits
8+
that were not specified before that are tuned for a small deployment, if the values file
9+
for your deployment does not override these requests and limits (which it should!) then
10+
you might end up with services being killed by Kubernetes (for Out Of Memory errors).
11+
12+
Internal Changes
13+
~~~~~~~~~~~~~~~~
14+
15+
**Improvements**
16+
17+
- Many resources requests and limits have been defined in the default values file.
18+
- Now the values file used in the CI deployments is taken from this repository in `minimal-deployment`
19+
which also serves as a reference for the default values file.
20+
- Removed a check in the Helm template for the ingress that could result in
21+
dataset search not working properly if disabled.
622

723

824
0.65.0

cypress-tests/cypress/e2e/useSession.cy.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ describe("Basic public project functionality", () => {
146146
cy.getDataCy("workflows-browser")
147147
.should("be.visible")
148148
.children()
149-
.should("have.length", 1)
150149
.contains(workflow.name)
151150
.should("be.visible")
152151
.click();

helm-chart/renku/templates/ingress.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@
88
{{- $uiServicePort := .Values.ui.client.service.port -}}
99
{{- $uiserverFullname := include "uiserver.fullname" . -}}
1010
{{- $uiserverServicePort := .Values.ui.server.service.port -}}
11-
{{- $graphEnabled := .Values.graph.enabled -}}
1211
{{- $webhookServiceFullname := include "renku.graph.webhookService.fullname" . -}}
1312
{{- $knowledgeGraphFullname := include "renku.graph.knowledgeGraph.fullname" . -}}
1413
{{- $searchApiFullname := include "renku.search.searchApi.fullname" . -}}
1514
{{- $renkuFullname := include "renku.fullname" . -}}
16-
{{- if $graphEnabled }}
1715
{{- $jenaFullname := include "renku-jena.fullname" . -}}
1816
{{- $jenaServicePort := .Values.jena.service.port -}}
19-
{{- end }}
2017
{{- $swaggerEnabled := .Values.swagger.enabled -}}
2118
---
2219
apiVersion: networking.k8s.io/v1
@@ -104,7 +101,6 @@ spec:
104101
name: {{ template "renku.fullname" $ }}-gateway
105102
port:
106103
number: {{ $uiserverServicePort }}
107-
{{- if $graphEnabled }}
108104
- path: /webhooks/events
109105
pathType: Prefix
110106
backend:
@@ -119,7 +115,6 @@ spec:
119115
name: {{ template "renku.fullname" $ }}-gateway
120116
port:
121117
number: 80
122-
{{- end }}
123118
{{- if $swaggerEnabled }}
124119
- path: /swagger
125120
pathType: Prefix

0 commit comments

Comments
 (0)