From 6c999493fffa8b34037ee649e99193a491b16852 Mon Sep 17 00:00:00 2001 From: Michal Hucko Date: Fri, 5 Jul 2024 11:26:52 +0200 Subject: [PATCH] Update links and image for 1.9.0 (#196) * Update links and image for 1.9 * feat: update service command to use tini --------- Co-authored-by: Noha Ihab <49988746+NohaIhab@users.noreply.github.com> Co-authored-by: NohaIhab --- config.yaml | 4 ++-- metadata.yaml | 3 ++- src/charm.py | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config.yaml b/config.yaml index 37e32ff..7aaf10c 100644 --- a/config.yaml +++ b/config.yaml @@ -40,7 +40,7 @@ options: description: Whether to enable the registration flow on sign-in menu-link-order: type: string - default: '["Notebooks", "Experiments (AutoML)", "Experiments (KFP)", "Pipelines", "Runs", "Recurring Runs", "Volumes", "Tensorboards"]' + default: '["Notebooks", "Katib Experiments", "Experiments (KFP)", "Pipelines", "Runs", "Recurring Runs", "Volumes", "TensorBoards"]' description: > YAML or JSON formatted list of strings defining the order of the menu links in the dashboard sidebar. For usage details, see https://github.com/canonical/kubeflow-dashboard-operator. @@ -52,7 +52,7 @@ options: For usage details, see https://github.com/canonical/kubeflow-dashboard-operator. quick-link-order: type: string - default: '["Upload a pipeline","View all pipeline runs","Create a new Notebook server","View Katib Experiments"]' + default: '["Create a new Notebook server", "Upload a Pipeline", "View Pipeline Runs"]' description: > YAML or JSON formatted list of strings defining the order of the quick links in the dashboard sidebar. For usage details, see https://github.com/canonical/kubeflow-dashboard-operator. diff --git a/metadata.yaml b/metadata.yaml index 0a7ceb6..6e5b7ab 100755 --- a/metadata.yaml +++ b/metadata.yaml @@ -12,7 +12,8 @@ resources: type: oci-image description: 'Backing OCI image' auto-fetch: true - upstream-source: docker.io/kubeflownotebookswg/centraldashboard:v1.8.0 + # On using the ROCK, modify the service command in the charm.py to remove tini + upstream-source: docker.io/kubeflownotebookswg/centraldashboard:v1.9.0-rc.1 provides: links: interface: kubeflow_dashboard_links diff --git a/src/charm.py b/src/charm.py index 112d6fb..114e533 100755 --- a/src/charm.py +++ b/src/charm.py @@ -63,7 +63,10 @@ def __init__(self, *args): self._lightkube_field_manager = "lightkube" self._profiles_service = None self._name = self.model.app.name - self._service = "npm start" + # Remove tini when using the rock + # Uncomment when using the rock and remove the line below + # self._service = "npm start" + self._service = "/sbin/tini -- npm start" self._container_name = "kubeflow-dashboard" self._container = self.unit.get_container(self._name) self._configmap_name = self.model.config["dashboard-configmap"]