Skip to content

Commit

Permalink
Revert "chore: use charmedkubeflow/kubeflow-central-dashboard as oci-…
Browse files Browse the repository at this point in the history
…image (#178)" (#191)

This reverts commit 2811dcb.

This is a temporal workaround to help avoid #188. This change must be reverted again once the fix for it is available. Please note the fix depends on https://bugs.launchpad.net/juju/+bug/2066517.
  • Loading branch information
DnPlas authored May 23, 2024
1 parent 233261d commit ce0be86
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ resources:
type: oci-image
description: 'Backing OCI image'
auto-fetch: true
upstream-source: charmedkubeflow/kubeflow-central-dashboard:1.8-0719441
upstream-source: docker.io/kubeflownotebookswg/centraldashboard:v1.8.0
provides:
links:
interface: kubeflow_dashboard_links
Expand Down
12 changes: 3 additions & 9 deletions src/charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,7 @@ def __init__(self, *args):
self._lightkube_field_manager = "lightkube"
self._profiles_service = None
self._name = self.model.app.name

# The service name must be consistent with the one defined in the rockcraft project
self._pebble_service_name = "serve"
self._pebble_service_command = "/usr/bin/npm start"

self._service = "npm start"
self._container_name = "kubeflow-dashboard"
self._container = self.unit.get_container(self._name)
self._configmap_name = self.model.config["dashboard-configmap"]
Expand Down Expand Up @@ -164,14 +160,12 @@ def _kubeflow_dashboard_operator_layer(self) -> Layer:
"summary": "kubeflow-dashboard-operator layer",
"description": "pebble config layer for kubeflow_dashboard_operator",
"services": {
self._pebble_service_name: {
self._container_name: {
"override": "replace",
"summary": "entrypoint of the kubeflow_dashboard_operator image",
"command": self._pebble_service_command,
"command": self._service,
"startup": "enabled",
"working-dir": "/app",
"environment": {
"NODE_ENV": "production",
"USERID_HEADER": "kubeflow-userid",
"USERID_PREFIX": "",
"PROFILES_KFAM_SERVICE_HOST": f"{self.profiles_service}.{self.model.name}",
Expand Down

0 comments on commit ce0be86

Please sign in to comment.