Skip to content

Commit 39cf089

Browse files
PanaetiusPanaetius
authored
chore: release v1.0.5 (#2631)
1 parent e1d40f3 commit 39cf089

File tree

16 files changed

+189
-156
lines changed

16 files changed

+189
-156
lines changed

‎.github/workflows/acceptance-tests.yml‎

Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ jobs:
2828
renku-ui: ${{ steps.deploy-comment.outputs.renku-ui}}
2929
test-enabled: ${{ steps.deploy-comment.outputs.test-enabled}}
3030
extra-values: ${{ steps.deploy-comment.outputs.extra-values}}
31+
persist: ${{ steps.deploy-comment.outputs.persist}}
3132
steps:
3233
- id: deploy-comment
33-
uses: SwissDataScienceCenter/renku-actions/check-pr-description@v0.3.2
34+
uses: SwissDataScienceCenter/renku-actions/check-pr-description@v0.5.0
3435
with:
3536
string: /deploy
3637
pr_ref: ${{ github.event.number }}
@@ -42,7 +43,7 @@ jobs:
4243
name: renku-ci-rp-${{ github.event.number }}
4344
steps:
4445
- name: deploy-pr
45-
uses: SwissDataScienceCenter/renku-actions/deploy-renku@v0.3.2
46+
uses: SwissDataScienceCenter/renku-actions/deploy-renku@v0.5.0
4647
env:
4748
DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
4849
DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
@@ -84,43 +85,27 @@ jobs:
8485
8586
test-pr:
8687
runs-on: ubuntu-20.04
87-
if: github.event.action != 'closed'
88+
if: ${{ github.event.action != 'closed' && needs.check-deploy.outputs.pr-contains-string == 'true' && needs.check-deploy.outputs.test-enabled == 'true' }}
8889
needs: [check-deploy, deploy-pr]
8990
steps:
90-
- uses: actions/checkout@v2
91-
- uses: actions/setup-python@v1
92-
with:
93-
python-version: 3.8
94-
- name: Test the PR
95-
if: "needs.check-deploy.outputs.pr-contains-string == 'true' && needs.check-deploy.outputs.test-enabled == 'true'"
96-
env:
97-
KUBECONFIG: ${{ github.workspace }}/renkubot-kube.config
98-
RENKUBOT_KUBECONFIG: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
99-
RENKU_RELEASE: renku-ci-rp-${{ github.event.number }}
100-
run: |
101-
echo "$RENKUBOT_KUBECONFIG" > ${{ github.workspace }}/renkubot-kube.config
102-
helm test ${RENKU_RELEASE} --namespace ${RENKU_RELEASE} --timeout 80m --logs
103-
- name: Download artifact for packaging on failure
104-
if: failure()
105-
uses: SwissDataScienceCenter/renku-actions/[email protected]
106-
env:
107-
RENKU_VALUES: ${{ secrets.CI_RENKU_VALUES }}
108-
TEST_ARTIFACTS_PATH: "tests-artifacts-${{ github.sha }}"
109-
- name: Upload screenshots on failure
110-
if: failure()
111-
uses: actions/upload-artifact@v1
91+
- uses: SwissDataScienceCenter/renku-actions/[email protected]
11292
with:
113-
name: acceptance-test-artifacts
114-
path: ${{ github.workspace }}/test-artifacts/
93+
renkubot-kubeconfig: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
94+
renku-release: renku-ci-rp-${{ github.event.number }}
95+
gitlab-token: ${{ secrets.DEV_GITLAB_TOKEN }}
96+
persist: "${{ needs.check-deploy.outputs.persist }}"
97+
ci-renku-values: ${{ secrets.CI_RENKU_VALUES }}
98+
11599
cleanup:
116-
if: github.event.action == 'closed'
100+
needs: check-deploy
101+
if: github.event.action == 'closed' && needs.check-deploy.outputs.pr-contains-string == 'true'
117102
runs-on: ubuntu-20.04
118103
steps:
119-
- uses: actions/checkout@v2
120104
- name: renku teardown
121-
uses: SwissDataScienceCenter/renku-actions/teardown-renku@v0.3.2
105+
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v0.5.0
122106
env:
107+
HELM_RELEASE_REGEX: "^renku-ci-rp-${{ github.event.number }}$"
123108
GITLAB_TOKEN: ${{ secrets.DEV_GITLAB_TOKEN }}
124-
KUBECONFIG: "${{ github.workspace }}/renkubot-kube.config"
125-
RENKU_RELEASE: renku-ci-rp-${{ github.event.number }}
126109
RENKUBOT_KUBECONFIG: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
110+
MAX_AGE_SECONDS: 0
111+
DELETE_NAMESPACE: "true"

‎.github/workflows/test_deploy.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -889,19 +889,19 @@ jobs:
889889
echo "GIT_USER=Renku Bot" >> $GITHUB_ENV
890890
echo "[email protected]" >> $GITHUB_ENV
891891
- name: Push chart and images
892-
uses: SwissDataScienceCenter/renku-actions/publish-chart@v0.3.2
892+
uses: SwissDataScienceCenter/renku-actions/publish-chart@v0.5.0
893893
env:
894894
CHART_NAME: renku-core
895-
GITHUB_TOKEN: ${{ secrets.RENKU_CI_TOKEN }}
895+
GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
896896
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
897897
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
898898
- name: Wait for chart to be available
899899
run: sleep 120
900900
- name: Update component version
901-
uses: SwissDataScienceCenter/renku-actions/update-component-version@v0.3.2
901+
uses: SwissDataScienceCenter/renku-actions/update-component-version@v0.5.0
902902
env:
903903
CHART_NAME: renku-core
904-
GITHUB_TOKEN: ${{ secrets.RENKU_CI_TOKEN }}
904+
GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
905905

906906
coveralls-final:
907907
name: Aggregate coveralls data

‎.github/workflows/test_publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Install dependencies
2828
run: |
2929
python -m pip install --upgrade pip
30-
python -m pip install -e .[all]
30+
python -m pip install .[all]
3131
git config --global --add user.name "Renku @ SDSC"
3232
git config --global --add user.email "[email protected]"
3333
- name: Test with pytest
@@ -60,7 +60,7 @@ jobs:
6060
curl -L https://raw.githubusercontent.com/Homebrew/homebrew-core/43842898fd3ff43273466052722f5ba2789196cb/Formula/git-lfs.rb > git-lfs.rb && brew install git-lfs.rb && rm git-lfs.rb
6161
brew install shellcheck node || brew link --overwrite node
6262
python -m pip install --upgrade pip
63-
python -m pip install -e .[all]
63+
python -m pip install .[all]
6464
git config --global --add user.name "Renku @ SDSC"
6565
git config --global --add user.email "[email protected]"
6666
- name: Test with pytest

‎CHANGES.rst‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,21 @@
1818
Changes
1919
=======
2020

21+
`1.0.5 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.0.4...v1.0.5>`__ (2022-02-07)
22+
-------------------------------------------------------------------------------------------------------
23+
24+
Bug Fixes
25+
~~~~~~~~~
26+
27+
- **core:** replace ``cwlgen`` with ``cwl-utils``
28+
(`#2603 <https://github.com/SwissDataScienceCenter/renku-python/issues/2603>`__)
29+
(`ab2e9cf <https://github.com/SwissDataScienceCenter/renku-python/commit/ab2e9cf0b1f0c63a025bd6e09fffd4ab350a0d48>`__)
30+
31+
- **core:** fix jinja2 dependency not being installed by pip
32+
(`#2613 <https://github.com/SwissDataScienceCenter/renku-python/issues/2613>`__)
33+
(`6effa0e <https://github.com/SwissDataScienceCenter/renku-python/commit/6effa0efe7fe093119212d11a05515cd5f8cdeab>`__)
34+
35+
2136
`1.0.4 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.0.3...v1.0.4>`__ (2022-01-28)
2237
-------------------------------------------------------------------------------------------------------
2338

‎docs/how-to-guides/implementing_a_provider.rst‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ The ``workflow_provider`` function shall return a tuple of ``(object, str)``, w
5353
should be the plugin object, i.e. ``self`` and the string is a unique identifier of the
5454
provider plugin. This unique string will be the string that the user can provide to the
5555
``--provider`` command line argument to select this plugin for executing the desired
56-
workflows.
56+
workflows. A dummy provider implementation is available
57+
`here <https://github.com/SwissDataScienceCenter/renku-dummy-provider>`_ in order to ease the
58+
initial implementation of a provider plugin.
5759

5860
A provider HAS to set environment variables for a plans parameters, so they can be used by scripts.
5961
These environment variables have to be prefixed with the value of the

‎docs/reference/plugins.rst‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ where `myproject.pluginmodule` points to a Renku `hookimpl` e.g.:
5454
.. automodule:: renku.core.plugins.run
5555
:members:
5656

57+
`This <https://github.com/SwissDataScienceCenter/renku-dummy-annotator>`_ repository contains an implementation of
58+
an activity annotation plugin.
5759

5860
CLI Plugins
5961
-----------
@@ -82,6 +84,25 @@ where `myproject.pluginmodule:mycmd` points to a click command e.g.:
8284
def mycmd():
8385
...
8486
87+
An example implementation of such plugin is available `here <https://github.com/SwissDataScienceCenter/renku-cli-plugin-example>`_.
88+
89+
Workflow Converter Plugins
90+
--------------------------
91+
92+
Additional workflow converters can be implemented by extending
93+
:class:`renku.core.models.workflow.converters.IWorkflowConverter`. By default renku
94+
provides a CWL converter plugins that is used when exporting a workflow:
95+
96+
.. code-block:: console
97+
98+
$ renku workflow export --format cwl <my_workflow>
99+
100+
.. autoclass:: renku.core.models.workflow.converters.IWorkflowConverter
101+
:members:
102+
103+
We created a `dummy <https://github.com/SwissDataScienceCenter/renku-dummy-format>`_ implementation of such
104+
a converter plugin.
105+
85106
Workflow Provider Plugins
86107
-------------------------
87108

‎helm-chart/renku-core/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ appVersion: "1.0"
33
description: A Helm chart for Kubernetes
44
name: renku-core
55
icon: https://avatars0.githubusercontent.com/u/53332360?s=400&u=a4311d22842343604ef61a8c8a1e5793209a67e9&v=4
6-
version: 1.0.4
6+
version: 1.0.5

‎helm-chart/renku-core/requirements.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ dependencies:
22
- name: redis
33
version: 10.7.11
44
repository: "https://charts.bitnami.com/bitnami"
5-
5+
- name: certificates
6+
version: 0.0.1
7+
repository: "https://swissdatasciencecenter.github.io/helm-charts/"

‎helm-chart/renku-core/templates/deployment.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ spec:
4242
volumes:
4343
- name: shared-volume
4444
emptyDir: {}
45+
{{- include "certificates.volumes" $ | nindent 8 }}
46+
initContainers:
47+
{{- include "certificates.initContainer" $ | nindent 8 }}
4548
containers:
4649
{{ if $.Values.metrics.enabled }}
4750
- name: {{ $.Chart.Name}}-rqmetrics
@@ -112,9 +115,11 @@ spec:
112115
value: {{ $.Values.gitLFSSkipSmudge | quote }}
113116
- name: RENKU_DOMAIN
114117
value: {{ $.Values.global.renku.domain }}
118+
{{- include "certificates.env.python" $ | nindent 12 }}
115119
volumeMounts:
116120
- name: shared-volume
117121
mountPath: {{ $.Values.cacheDirectory }}
122+
{{- include "certificates.volumeMounts.system" $ | nindent 12 }}
118123
ports:
119124
- name: http
120125
containerPort: 8080
@@ -168,9 +173,11 @@ spec:
168173
value: {{ $.Values.gitLFSSkipSmudge | quote }}
169174
- name: RENKU_DOMAIN
170175
value: {{ $.Values.global.renku.domain }}
176+
{{- include "certificates.env.python" $ | nindent 12 }}
171177
volumeMounts:
172178
- name: shared-volume
173179
mountPath: {{ $.Values.cacheDirectory }}
180+
{{- include "certificates.volumeMounts.system" $ | nindent 12 }}
174181

175182
- name: {{ $.Chart.Name }}-management-workers
176183
image: "{{ $version.image.repository }}:{{ $version.image.tag }}"
@@ -209,9 +216,11 @@ spec:
209216
value: {{ $.Values.gitLFSSkipSmudge | quote }}
210217
- name: RENKU_DOMAIN
211218
value: {{ $.Values.global.renku.domain }}
219+
{{- include "certificates.env.python" $ | nindent 12 }}
212220
volumeMounts:
213221
- name: shared-volume
214222
mountPath: {{ $.Values.cacheDirectory }}
223+
{{- include "certificates.volumeMounts.system" $ | nindent 12 }}
215224

216225
- name: {{ $.Chart.Name }}-scheduler
217226
image: "{{ $version.image.repository }}:{{ $version.image.tag }}"
@@ -238,6 +247,9 @@ spec:
238247
value: {{ $.Values.sentry.sample_rate | quote }}
239248
- name: SENTRY_ENV
240249
value: {{ $.Values.sentry.environment }}
250+
{{- include "certificates.env.python" $ | nindent 12 }}
251+
volumeMounts:
252+
{{- include "certificates.volumeMounts.system" $ | nindent 12 }}
241253
{{- with $.Values.nodeSelector }}
242254
nodeSelector:
243255
{{- toYaml . | nindent 8 }}

‎helm-chart/renku-core/values.yaml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@
44

55
replicaCount: 1
66

7+
global:
8+
## Specify a secret that containes the certificate
9+
## if you would like to use a custom CA. The key for the secret
10+
## should have the .crt extension otherwise it is ignored. The
11+
## keys across all secrets are mounted as files in one location so
12+
## the keys across all secrets have to be unique.
13+
certificates:
14+
image:
15+
repository: renku/certificates
16+
tag: '0.0.1'
17+
customCAs: []
18+
# - secret:
19+
720
# base path - this is the reverse proxy base path
821
apiBasePath: /api
922

@@ -104,7 +117,7 @@ versions:
104117
fullnameOverride: ""
105118
image:
106119
repository: renku/renku-core
107-
tag: "v1.0.4"
120+
tag: "v1.0.5"
108121
pullPolicy: IfNotPresent
109122
v8:
110123
name: v8

0 commit comments

Comments
 (0)