Skip to content

Commit

Permalink
feat: add new amalthea helm chart (#88)
Browse files Browse the repository at this point in the history
  • Loading branch information
olevski authored Aug 23, 2024
1 parent bbd9623 commit 57bba14
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 1 deletion.
8 changes: 8 additions & 0 deletions check-pr-description/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ outputs:
amalthea:
description: amalthea reference as specified in the command string
value: ${{ steps.check-string.outputs.amalthea}}
amalthea-sessions:
description: reference to the new amalthea operator helm chart
value: ${{ steps.check-string.outputs.amalthea-sessions}}
extra-values:
description: "extra values passed to helm; separate multiple values with commas: key1=val1,key2=val2"
value: ${{ steps.check-string.outputs.extra-values }}
Expand Down Expand Up @@ -87,6 +90,11 @@ runs:
echo "renku-notebooks reference: ${BASH_REMATCH[1]}"
echo "renku-notebooks=@${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
fi
match="amalthea-sessions=(\S*)"
if [[ $command =~ $match ]]; then
echo "amalthea-sessions reference: ${BASH_REMATCH[1]}"
echo "amalthea-sessions=@${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
fi
match="amalthea=(\S*)"
if [[ $command =~ $match ]]; then
echo "amalthea reference: ${BASH_REMATCH[1]}"
Expand Down
2 changes: 2 additions & 0 deletions deploy-renku/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ deploy-pr:
renku_notebooks: "${{ needs.check-deploy.outputs.renku-notebooks }}"
renku_ui: "${{ needs.check-deploy.outputs.renku-ui }}"
renku_data_services: "${{ needs.check-deploy.outputs.renku-data-services }}"
amalthea: "${{ needs.check-deploy.outputs.amalthea }}"
amalthea_sessions: "${{ needs.check-deploy.outputs.amalthea-sessions }}"
secrets_storage: "${{ needs.check-deploy.outputs.secrets-storage}}"
renku_search: "${{ needs.check-deploy.outputs.renku-search }}"
extra_values: "${{ needs.check-deploy.outputs.extra-values }}"
Expand Down
16 changes: 15 additions & 1 deletion deploy-renku/deploy-dev-renku.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"renku-data-services",
"renku-search",
"amalthea",
"amalthea-sessions",
"secrets-storage",
]

Expand Down Expand Up @@ -92,7 +93,9 @@ def repo(self):
@property
def repo_url(self):
if self.component == "renku-core":
return f"https://github.com/SwissDataScienceCenter/renku-python.git"
return "https://github.com/SwissDataScienceCenter/renku-python.git"
if self.component == "amalthea-sessions":
return "https://github.com/SwissDataScienceCenter/amalthea.git"
if self.component == "secrets-storage":
return f"https://github.com/SwissDataScienceCenter/renku-data-services.git"
return f"https://github.com/SwissDataScienceCenter/{self.component}.git"
Expand Down Expand Up @@ -161,6 +164,17 @@ def configure_component_versions(component_versions: dict, values_file: Path) ->
continue
with open(reqs_path, "w") as f:
yaml.dump(reqs, f)
if component == "amalthea-sessions":
reqs_path = tempdir / "renku" / "helm-chart/renku/requirements.yaml"
with open(reqs_path) as f:
reqs = yaml.load(f, Loader=yaml.SafeLoader)
for dep in reqs["dependencies"]:
if dep["name"] == component.replace("_", "-"):
dep["version"] = req.version
dep["repository"] = req.helm_repo
continue
with open(reqs_path, "w") as f:
yaml.dump(reqs, f)
return patches


Expand Down

0 comments on commit 57bba14

Please sign in to comment.