From 34a1087445134b09b42f6048a22ee537a8dbcac5 Mon Sep 17 00:00:00 2001 From: Orfeas Kourkakis Date: Mon, 22 Jan 2024 10:32:52 +0200 Subject: [PATCH] feat: Integrate ROCKs into charms (#398) * Integrate ROCKs into charms * Modify `kfp-ui` command according to ROCK --- charms/kfp-api/metadata.yaml | 2 +- charms/kfp-persistence/metadata.yaml | 2 +- charms/kfp-schedwf/metadata.yaml | 2 +- charms/kfp-ui/metadata.yaml | 2 +- charms/kfp-ui/src/components/pebble_components.py | 5 ++++- charms/kfp-viewer/metadata.yaml | 2 +- charms/kfp-viz/metadata.yaml | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/charms/kfp-api/metadata.yaml b/charms/kfp-api/metadata.yaml index f00b7359..6f42cfae 100755 --- a/charms/kfp-api/metadata.yaml +++ b/charms/kfp-api/metadata.yaml @@ -15,7 +15,7 @@ resources: oci-image: type: oci-image description: Backing OCI image - upstream-source: gcr.io/ml-pipeline/api-server:2.0.3 + upstream-source: charmedkubeflow/api-server:2.0.3-e037d33 requires: mysql: interface: mysql diff --git a/charms/kfp-persistence/metadata.yaml b/charms/kfp-persistence/metadata.yaml index 97da8ef7..fd953c05 100755 --- a/charms/kfp-persistence/metadata.yaml +++ b/charms/kfp-persistence/metadata.yaml @@ -11,7 +11,7 @@ resources: oci-image: type: oci-image description: Backing OCI image - upstream-source: gcr.io/ml-pipeline/persistenceagent:2.0.3 + upstream-source: charmedkubeflow/persistenceagent:2.0.3-a3714a9 requires: kfp-api: interface: k8s-service diff --git a/charms/kfp-schedwf/metadata.yaml b/charms/kfp-schedwf/metadata.yaml index 60a70750..a58e1d8d 100755 --- a/charms/kfp-schedwf/metadata.yaml +++ b/charms/kfp-schedwf/metadata.yaml @@ -11,4 +11,4 @@ resources: oci-image: type: oci-image description: Backing OCI image - upstream-source: gcr.io/ml-pipeline/scheduledworkflow:2.0.3 + upstream-source: charmedkubeflow/scheduledworkflow:2.0.3-7d6d3e4 diff --git a/charms/kfp-ui/metadata.yaml b/charms/kfp-ui/metadata.yaml index b9ed0358..0017f9ce 100755 --- a/charms/kfp-ui/metadata.yaml +++ b/charms/kfp-ui/metadata.yaml @@ -11,7 +11,7 @@ resources: ml-pipeline-ui: type: oci-image description: OCI image for ml-pipeline-ui - upstream-source: gcr.io/ml-pipeline/frontend:2.0.3 + upstream-source: charmedkubeflow/frontend:2.0.3-d4ac42b requires: object-storage: interface: object-storage diff --git a/charms/kfp-ui/src/components/pebble_components.py b/charms/kfp-ui/src/components/pebble_components.py index 26861c2f..34faa377 100644 --- a/charms/kfp-ui/src/components/pebble_components.py +++ b/charms/kfp-ui/src/components/pebble_components.py @@ -37,7 +37,10 @@ def get_layer(self) -> Layer: self.service_name: { "override": "replace", "summary": "entry point for ml-pipeline-ui", - "command": "node dist/server.js ../client/ 3000", # Must be a string + # command should be updated each time we switch from upstream to ROCK image + # - upsstream: "command": "node dist/server.js ../client/ 3000" + # - rock: "command": "node /server/dist/server.js /client/ 3000" + "command": "node /server/dist/server.js /client/ 3000", # Must be a string "startup": "enabled", # TODO: are these still the correct settings? "environment": { diff --git a/charms/kfp-viewer/metadata.yaml b/charms/kfp-viewer/metadata.yaml index 4245445b..f5826beb 100755 --- a/charms/kfp-viewer/metadata.yaml +++ b/charms/kfp-viewer/metadata.yaml @@ -12,4 +12,4 @@ resources: kfp-viewer-image: type: oci-image description: OCI image for KFP Viewer - upstream-source: gcr.io/ml-pipeline/viewer-crd-controller:2.0.3 + upstream-source: charmedkubeflow/viewer-crd-controller:2.0.3-d89d9fc diff --git a/charms/kfp-viz/metadata.yaml b/charms/kfp-viz/metadata.yaml index 2fe61842..1662f9d5 100755 --- a/charms/kfp-viz/metadata.yaml +++ b/charms/kfp-viz/metadata.yaml @@ -11,7 +11,7 @@ resources: oci-image: type: oci-image description: OCI image for ml-pipeline-visualizationserver - upstream-source: gcr.io/ml-pipeline/visualization-server:2.0.3 + upstream-source: charmedkubeflow/visualization-server:2.0.3-8169d0c provides: kfp-viz: interface: k8s-service