Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update from auto-update/renku-core-2.9.2 #3470

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-acceptance-test-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Scala dependencies and code check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- name: run test compile
run: |
cd acceptance-tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-acceptance-test-fmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Scala formatting check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- name: run scalafmt
run: |
cd acceptance-tests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/create-release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
create-release-pr:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.6.0
- uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
token: "${{ secrets.RENKUBOT_GITHUB_TOKEN }}"
Expand All @@ -42,7 +42,7 @@ jobs:
git commit -m "chore: create release ${{ github.event.inputs.version }}"
git push
- name: Create Pull Request
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
token: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
script: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cron-jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: renku teardown
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.9.1
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.10.0
env:
GITLAB_TOKEN: ${{ secrets.DEV_GITLAB_TOKEN }}
RENKUBOT_KUBECONFIG: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/generate-values-script.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- os: macos-11
- os: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
- uses: actions/setup-python@v5
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
runs-on: ubuntu-20.04
needs: [test-script]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
- uses: Azure/docker-login@v1
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-helm-chart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ jobs:
publish-chart:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
- name: Set version
id: vars
run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
- uses: SwissDataScienceCenter/renku-actions/publish-chart@v1.9.1
- uses: SwissDataScienceCenter/renku-actions/publish-chart@v1.10.0
env:
CHART_DIR: helm-chart/
CHART_NAME: renku
Expand Down Expand Up @@ -45,11 +45,11 @@ jobs:
needs:
- "publish-chart"
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
- name: Rollout renku version
uses: SwissDataScienceCenter/renku-actions/rollout-renku-version@v1.9.1
uses: SwissDataScienceCenter/renku-actions/rollout-renku-version@v1.10.0
env:
CHART_VERSION: ${{ needs.publish-chart.outputs.chart-version }}
GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/publish-master-merges.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
publish-chart:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
- uses: azure/setup-helm@v3
Expand All @@ -35,7 +35,7 @@ jobs:
- id: set-version
run: |
echo "publish_version=${{ steps.bump-semver.outputs.new_version }}.$(echo ${{ github.sha }} | cut -c 1-7)" >> $GITHUB_ENV
- uses: SwissDataScienceCenter/renku-actions/publish-chart@v1.9.1
- uses: SwissDataScienceCenter/renku-actions/publish-chart@v1.10.0
env:
CHART_DIR: helm-chart/
CHART_TAG: "--tag ${{env.publish_version}}"
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/pull-request-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
if: github.event.action != 'closed'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- uses: actions/setup-java@v4
with:
distribution: "temurin"
Expand Down Expand Up @@ -60,9 +60,9 @@ jobs:
test-enabled: ${{ steps.deploy-comment.outputs.test-enabled}}
extra-values: ${{ steps.deploy-comment.outputs.extra-values}}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- id: deploy-comment
uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.9.1
uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.10.0
with:
string: /deploy
pr_ref: ${{ github.event.number }}
Expand All @@ -75,10 +75,10 @@ jobs:
name: ci-renku-${{ github.event.number }}
url: https://ci-renku-${{ github.event.number }}.dev.renku.ch
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- name: renku build and deploy
if: needs.check-deploy.outputs.pr-contains-string == 'true'
uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.9.1
uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.10.0
env:
DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
Expand All @@ -100,15 +100,15 @@ jobs:
extra_values: "${{ needs.check-deploy.outputs.extra-values }}"
- name: Check existing renkubot comment
if: needs.check-deploy.outputs.pr-contains-string == 'true'
uses: peter-evans/find-comment@v2
uses: peter-evans/find-comment@v3
id: findcomment
with:
issue-number: ${{ github.event.pull_request.number }}
comment-author: "RenkuBot"
- name: Create comment pre deploy
if: ${{ steps.findcomment.outputs.comment-id == 0 &&
needs.check-deploy.outputs.pr-contains-string == 'true' }}
uses: peter-evans/create-or-update-comment@v3
uses: peter-evans/create-or-update-comment@v4
with:
token: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
issue-number: ${{ github.event.pull_request.number }}
Expand All @@ -120,7 +120,7 @@ jobs:
needs: [check-deploy, deploy-pr]
runs-on: ubuntu-22.04
steps:
- uses: SwissDataScienceCenter/renku-actions/test-renku@v1.9.1
- uses: SwissDataScienceCenter/renku-actions/test-renku@v1.10.0
with:
kubeconfig: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
renku-release: ci-renku-${{ github.event.number }}
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
]

steps:
- uses: SwissDataScienceCenter/renku-actions/test-renku-cypress@v1.9.1
- uses: SwissDataScienceCenter/renku-actions/test-renku-cypress@v1.10.0
if: github.event.action != 'closed' && needs.check-deploy.outputs.pr-contains-string == 'true' && needs.check-deploy.outputs.test-enabled == 'true'
with:
e2e-target: ${{ matrix.tests }}
Expand All @@ -162,7 +162,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: renku teardown
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.9.1
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.10.0
env:
HELM_RELEASE_REGEX: "^ci-renku-${{ github.event.number }}$"
GITLAB_TOKEN: ${{ secrets.DEV_GITLAB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/renku-dev-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
github.event.client_payload.message == 'Helm test succeeded' }}
runs-on: ubuntu-20.04
steps:
- uses: SwissDataScienceCenter/renku-actions/test-renku@v1.9.1
- uses: SwissDataScienceCenter/renku-actions/test-renku@v1.10.0
with:
kubeconfig: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
renku-release: renku
Expand All @@ -22,7 +22,7 @@ jobs:
github.event.client_payload.message == 'Helm test succeeded' }}
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- uses: cypress-io/github-action@v5
id: cypress
env:
Expand Down
21 changes: 20 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,28 @@
.. _changelog:

0.48.x
0.48.0
------

This release contains bug fixes to renku core service.

User-Facing Changes
~~~~~~~~~~~~~~~~~~~

**🐞 Bug Fixes**

- **Core Service**: Fix issue with having to run project migration twice to migrate the Dockerfile/project template.
(`#3690 <https://github.com/SwissDataScienceCenter/renku-python/issues/3690>`__)

Individual Components
~~~~~~~~~~~~~~~~~~~~~

- `renku-python 2.9.2 <https://github.com/SwissDataScienceCenter/renku-python/releases/tag/2.9.2>`_

0.47.1
------

This release only includes changes to the documentation and updates to the acceptance tests.
It doesn't bring any new features or bug fixes.

0.47.0
------
Expand Down
85 changes: 56 additions & 29 deletions cypress-tests/cypress/e2e/useSession.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -224,20 +224,12 @@ describe("Basic public project functionality", () => {
});

it("Start a new session with cloud storage attached.", () => {
cy.stopAllSessionsForProject(projectIdentifier);

cy.intercept("/ui-server/api/data/storage*").as("getProjectCloudStorage");

cy.getProjectSection("Settings").click();
cy.getDataCy("settings-navbar")
.contains("a.nav-link", "Cloud Storage")
.should("be.visible")
.click();

// Add a S3 storage configuration if it doesn't exist
cy.wait("@getProjectCloudStorage").then(({ response }) => {
const storages = response.body as { storage: { name: string } }[];
if (storages.find(({ storage }) => storage.name === "data_s3")) {
// verify that cloud storage is supported in the deployment
cy.request({ url: "ui-server/api/notebooks/version" }).then((resp) => {
if (!resp.body.versions[0].data.cloudstorageEnabled) {
cy.log(
"Skipping the test since the deployment doesn't support Cloud Storage"
);
return;
}

Expand Down Expand Up @@ -285,13 +277,6 @@ describe("Basic public project functionality", () => {
cy.getDataCy("cloud-storage-edit-close-button")
.should("be.visible")
.click();
});

cy.getDataCy("more-menu").should("be.visible").click();
cy.getProjectPageLink(projectIdentifier, "sessions/new")
.should("be.visible")
.first()
.click();

// Wait for the image to be ready and start a session
cy.get(".renku-container")
Expand Down Expand Up @@ -330,15 +315,57 @@ describe("Basic public project functionality", () => {
cy.get(".jp-DirListing-item")
.contains("README.s3_structure")
.should("be.visible")
.dblclick();

cy.get(".jp-FileEditor", { timeout: TIMEOUTS.long }).should("be.visible");
cy.get(".jp-FileEditor")
.contains("The GIAB s3 bucket and URLs")
.first()
.click();

// Wait for the image to be ready and start a session
cy.get(".renku-container")
.contains("A session gives you an environment")
.should("exist");
cy.get(".renku-container .badge.bg-success", { timeout: TIMEOUTS.vlong })
.contains("available")
.should("exist");
cy.getDataCy("cloud-storage-item").contains("data_s3").should("exist");
cy.get("#cloud-storage-data_s3-active").should("be.checked");
cy.get(".renku-container button.btn-secondary", { timeout: TIMEOUTS.long })
.contains("Start Session")
.should("exist")
.click();
cy.get(".progress-box .progress-title").should("exist"); //.contains("Step 2 of 2");
cy.get("button")
.contains(projectTestConfig.projectName)
.should("be.visible");
cy.get(".progress-box .progress-title")
.contains("Starting Session")
.should("exist");
cy.get(".progress-box .progress-title", { timeout: TIMEOUTS.vlong }).should(
"not.exist"
);

// Verify that the S3 data is mounted
cy.getIframe("iframe#session-iframe").within(() => {
cy.get(".jp-DirListing-content", { timeout: TIMEOUTS.long }).should(
"be.visible"
);
cy.get(".jp-DirListing-item")
.contains("data_s3")
.should("be.visible")
.dblclick();

cy.get(".jp-DirListing-item")
.contains("README.s3_structure")
.should("be.visible")
.dblclick();

cy.get(".jp-FileEditor", { timeout: TIMEOUTS.long }).should("be.visible");
cy.get(".jp-FileEditor")
.contains("The GIAB s3 bucket and URLs")
.should("be.visible");
});

cy.pauseSession();
cy.deleteSession();
});

cy.pauseSession();
cy.deleteSession();
});

});
Binary file added docs/_static/images/cloud_storage_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/images/cloud_storage_10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/images/cloud_storage_11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/images/cloud_storage_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/images/cloud_storage_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/images/cloud_storage_4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/images/cloud_storage_5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/images/cloud_storage_6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/images/cloud_storage_7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/images/cloud_storage_8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/images/cloud_storage_9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 25 additions & 7 deletions docs/how-to-guides/admin/sessions-cloud-storage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,35 @@
Enable mounting cloud storage in users-sessions
-----------------------------------------------

Renkulab supports mounting cloud storage in users-sessions.
To enable the feature you need to set the following values in your `values-file.yaml`:
Renkulab supports mounting cloud storage in users-sessions. We use a CSI driver based on
`rclone <https://rclone.org/>`_.

To enable the feature you need to configure it in your `values-file.yaml`:

.. code-block:: yaml

# install the CSI driver
global:
csi-rclone:
install: true

notebooks:
cloudstorage:
s3:
enabled: true
installDatashim: true
enabled: true
storageClass: csi-rclone

csi-rclone:
csiNodepluginRclone:
# optional tolerations if using node pools with taints
tolerations:
- key: renku.io/dedicated
operator: Equal
value: user
effect: NoSchedule
- key: renku.io/gpu
operator: Equal
value: "true"
effect: NoSchedule

The `installDatashim` option will deploy the Datashim <https://datashim-io.github.io/datashim/> Helm chart in the same
namespace as the `Renkulab` chart.
The ``global.csi-rclone.install`` option will install the ``csi-rclone`` Helm chart in the same namespace
as the renku chart.
Loading
Loading