Fix: rollback to docker images for file-metrics-collector (#238)

* rollback rocks for file metrics collector * fix
canonical · Sep 16, 2024 · 125d792 · 125d792
1 parent f29ef60
commit 125d792
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/charms/katib-controller/src/default-custom-images.json b/charms/katib-controller/src/default-custom-images.json
@@ -3,9 +3,9 @@
     "default_trial_template_enas": "docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v0.17.0",
     "default_trial_template_pytorch": "docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.17.0",
     "early_stopping__medianstop": "docker.io/charmedkubeflow/earlystopping-medianstop:v0.17.0-92cd6d9",
-    "metrics_collector_sidecar__stdout": "docker.io/charmedkubeflow/file-metrics-collector:v0.17.0-867ad83",
-    "metrics_collector_sidecar__file": "docker.io/charmedkubeflow/file-metrics-collector:v0.17.0-867ad83",
-    "metrics_collector_sidecar__tensorflow_event": "docker.io/charmedkubeflow/tfevent-metrics-collector:v0.17.0-92cd6d9",
+    "metrics_collector_sidecar__stdout": "docker.io/kubeflowkatib/file-metrics-collector:v0.17.0",
+    "metrics_collector_sidecar__file": "docker.io/kubeflowkatib/file-metrics-collector:v0.17.0",
+    "metrics_collector_sidecar__tensorflow_event": "docker.io/kubeflowkatib/tfevent-metrics-collector:v0.17.0",
     "suggestion__random": "docker.io/charmedkubeflow/suggestion-hyperopt:v0.17.0-92cd6d9",
     "suggestion__tpe": "docker.io/charmedkubeflow/suggestion-hyperopt:v0.17.0-92cd6d9",
     "suggestion__grid": "docker.io/charmedkubeflow/suggestion-optuna:v0.17.0-92cd6d9",

diff --git a/charms/katib-controller/tests/integration/test_charm.py b/charms/katib-controller/tests/integration/test_charm.py
@@ -25,11 +25,11 @@
 KATIB_VERSION = "v0.17.0"
 TRIAL_TEMPLATE = "trial-template"
 EXPECTED_KATIB_CONFIG = {
-    "katib-config.yaml": "---\napiVersion: config.kubeflow.org/v1beta1\nkind: KatibConfig\ninit:\n  controller:\n    webhookPort: 443\n    trialResources:\n      - Job.v1.batch\n      - TFJob.v1.kubeflow.org\n      - PyTorchJob.v1.kubeflow.org\n      - MPIJob.v1.kubeflow.org\n      - XGBoostJob.v1.kubeflow.org\n      - MXJob.v1.kubeflow.org\nruntime:\n  metricsCollectors:\n    - kind: StdOut\n      image: docker.io/charmedkubeflow/file-metrics-collector:%(katib_version)s-867ad83\n    - kind: File\n      image: docker.io/charmedkubeflow/file-metrics-collector:%(katib_version)s-867ad83\n    - kind: TensorFlowEvent\n      image: docker.io/charmedkubeflow/tfevent-metrics-collector:%(katib_version)s-92cd6d9\n      resources:\n        limits:\n          memory: 1Gi\n  suggestions:\n    - algorithmName: random\n      image: docker.io/charmedkubeflow/suggestion-hyperopt:%(katib_version)s-92cd6d9\n    - algorithmName: tpe\n      image: docker.io/charmedkubeflow/suggestion-hyperopt:%(katib_version)s-92cd6d9\n    - algorithmName: grid\n      image: docker.io/charmedkubeflow/suggestion-optuna:%(katib_version)s-92cd6d9\n    - algorithmName: hyperband\n      image: docker.io/charmedkubeflow/suggestion-hyperband:%(katib_version)s-92cd6d9\n    - algorithmName: bayesianoptimization\n      image: docker.io/charmedkubeflow/suggestion-skopt:%(katib_version)s-92cd6d9\n    - algorithmName: cmaes\n      image: docker.io/charmedkubeflow/suggestion-goptuna:%(katib_version)s-92cd6d9\n    - algorithmName: sobol\n      image: docker.io/charmedkubeflow/suggestion-goptuna:%(katib_version)s-92cd6d9\n    - algorithmName: multivariate-tpe\n      image: docker.io/charmedkubeflow/suggestion-optuna:%(katib_version)s-92cd6d9\n    - algorithmName: enas\n      image: docker.io/charmedkubeflow/suggestion-enas:%(katib_version)s-34dac59\n      resources:\n        limits:\n          memory: 400Mi\n    - algorithmName: darts\n      image: docker.io/charmedkubeflow/suggestion-nas-darts:%(katib_version)s-92cd6d9\n    - algorithmName: pbt\n      image: docker.io/charmedkubeflow/suggestion-pbt:%(katib_version)s-92cd6d9\n      persistentVolumeClaimSpec:\n        accessModes:\n          - ReadWriteMany\n        resources:\n          requests:\n            storage: 5Gi\n  earlyStoppings:\n    - algorithmName: medianstop\n      image: docker.io/charmedkubeflow/earlystopping-medianstop:%(katib_version)s-92cd6d9"  # noqa: E501
+    "katib-config.yaml": "---\napiVersion: config.kubeflow.org/v1beta1\nkind: KatibConfig\ninit:\n  controller:\n    webhookPort: 443\n    trialResources:\n      - Job.v1.batch\n      - TFJob.v1.kubeflow.org\n      - PyTorchJob.v1.kubeflow.org\n      - MPIJob.v1.kubeflow.org\n      - XGBoostJob.v1.kubeflow.org\n      - MXJob.v1.kubeflow.org\nruntime:\n  metricsCollectors:\n    - kind: StdOut\n      image: docker.io/kubeflowkatib/file-metrics-collector:%(katib_version)s\n    - kind: File\n      image: docker.io/kubeflowkatib/file-metrics-collector:%(katib_version)s\n    - kind: TensorFlowEvent\n      image: docker.io/kubeflowkatib/tfevent-metrics-collector:%(katib_version)s\n      resources:\n        limits:\n          memory: 1Gi\n  suggestions:\n    - algorithmName: random\n      image: docker.io/charmedkubeflow/suggestion-hyperopt:%(katib_version)s-92cd6d9\n    - algorithmName: tpe\n      image: docker.io/charmedkubeflow/suggestion-hyperopt:%(katib_version)s-92cd6d9\n    - algorithmName: grid\n      image: docker.io/charmedkubeflow/suggestion-optuna:%(katib_version)s-92cd6d9\n    - algorithmName: hyperband\n      image: docker.io/charmedkubeflow/suggestion-hyperband:%(katib_version)s-92cd6d9\n    - algorithmName: bayesianoptimization\n      image: docker.io/charmedkubeflow/suggestion-skopt:%(katib_version)s-92cd6d9\n    - algorithmName: cmaes\n      image: docker.io/charmedkubeflow/suggestion-goptuna:%(katib_version)s-92cd6d9\n    - algorithmName: sobol\n      image: docker.io/charmedkubeflow/suggestion-goptuna:%(katib_version)s-92cd6d9\n    - algorithmName: multivariate-tpe\n      image: docker.io/charmedkubeflow/suggestion-optuna:%(katib_version)s-92cd6d9\n    - algorithmName: enas\n      image: docker.io/charmedkubeflow/suggestion-enas:%(katib_version)s-34dac59\n      resources:\n        limits:\n          memory: 400Mi\n    - algorithmName: darts\n      image: docker.io/charmedkubeflow/suggestion-nas-darts:%(katib_version)s-92cd6d9\n    - algorithmName: pbt\n      image: docker.io/charmedkubeflow/suggestion-pbt:%(katib_version)s-92cd6d9\n      persistentVolumeClaimSpec:\n        accessModes:\n          - ReadWriteMany\n        resources:\n          requests:\n            storage: 5Gi\n  earlyStoppings:\n    - algorithmName: medianstop\n      image: docker.io/charmedkubeflow/earlystopping-medianstop:%(katib_version)s-92cd6d9"  # noqa: E501
     % {"katib_version": KATIB_VERSION},
 }
 EXPECTED_KATIB_CONFIG_CHANGED = {
-    "katib-config.yaml": "---\napiVersion: config.kubeflow.org/v1beta1\nkind: KatibConfig\ninit:\n  controller:\n    webhookPort: 443\n    trialResources:\n      - Job.v1.batch\n      - TFJob.v1.kubeflow.org\n      - PyTorchJob.v1.kubeflow.org\n      - MPIJob.v1.kubeflow.org\n      - XGBoostJob.v1.kubeflow.org\n      - MXJob.v1.kubeflow.org\nruntime:\n  metricsCollectors:\n    - kind: StdOut\n      image: docker.io/charmedkubeflow/file-metrics-collector:%(katib_version)s-867ad83\n    - kind: File\n      image: docker.io/charmedkubeflow/file-metrics-collector:%(katib_version)s-867ad83\n    - kind: TensorFlowEvent\n      image: docker.io/charmedkubeflow/tfevent-metrics-collector:%(katib_version)s-92cd6d9\n      resources:\n        limits:\n          memory: 1Gi\n  suggestions:\n    - algorithmName: random\n      image: docker.io/charmedkubeflow/suggestion-hyperopt:%(katib_version)s-92cd6d9\n    - algorithmName: tpe\n      image: docker.io/charmedkubeflow/suggestion-hyperopt:%(katib_version)s-92cd6d9\n    - algorithmName: grid\n      image: docker.io/charmedkubeflow/suggestion-optuna:%(katib_version)s-92cd6d9\n    - algorithmName: hyperband\n      image: docker.io/charmedkubeflow/suggestion-hyperband:%(katib_version)s-92cd6d9\n    - algorithmName: bayesianoptimization\n      image: docker.io/charmedkubeflow/suggestion-skopt:%(katib_version)s-92cd6d9\n    - algorithmName: cmaes\n      image: docker.io/charmedkubeflow/suggestion-goptuna:%(katib_version)s-92cd6d9\n    - algorithmName: sobol\n      image: docker.io/charmedkubeflow/suggestion-goptuna:%(katib_version)s-92cd6d9\n    - algorithmName: multivariate-tpe\n      image: docker.io/charmedkubeflow/suggestion-optuna:%(katib_version)s-92cd6d9\n    - algorithmName: enas\n      image: docker.io/charmedkubeflow/suggestion-enas:%(katib_version)s-34dac59\n      resources:\n        limits:\n          memory: 400Mi\n    - algorithmName: darts\n      image: docker.io/charmedkubeflow/suggestion-nas-darts:%(katib_version)s-92cd6d9\n    - algorithmName: pbt\n      image: docker.io/charmedkubeflow/suggestion-pbt:%(katib_version)s-92cd6d9\n      persistentVolumeClaimSpec:\n        accessModes:\n          - ReadWriteMany\n        resources:\n          requests:\n            storage: 5Gi\n  earlyStoppings:\n    - algorithmName: medianstop\n      image: custom:2.1"  # noqa: E501
+    "katib-config.yaml": "---\napiVersion: config.kubeflow.org/v1beta1\nkind: KatibConfig\ninit:\n  controller:\n    webhookPort: 443\n    trialResources:\n      - Job.v1.batch\n      - TFJob.v1.kubeflow.org\n      - PyTorchJob.v1.kubeflow.org\n      - MPIJob.v1.kubeflow.org\n      - XGBoostJob.v1.kubeflow.org\n      - MXJob.v1.kubeflow.org\nruntime:\n  metricsCollectors:\n    - kind: StdOut\n      image: docker.io/kubeflowkatib/file-metrics-collector:%(katib_version)s\n    - kind: File\n      image: docker.io/kubeflowkatib/file-metrics-collector:%(katib_version)s\n    - kind: TensorFlowEvent\n      image: docker.io/kubeflowkatib/tfevent-metrics-collector:%(katib_version)s\n      resources:\n        limits:\n          memory: 1Gi\n  suggestions:\n    - algorithmName: random\n      image: docker.io/charmedkubeflow/suggestion-hyperopt:%(katib_version)s-92cd6d9\n    - algorithmName: tpe\n      image: docker.io/charmedkubeflow/suggestion-hyperopt:%(katib_version)s-92cd6d9\n    - algorithmName: grid\n      image: docker.io/charmedkubeflow/suggestion-optuna:%(katib_version)s-92cd6d9\n    - algorithmName: hyperband\n      image: docker.io/charmedkubeflow/suggestion-hyperband:%(katib_version)s-92cd6d9\n    - algorithmName: bayesianoptimization\n      image: docker.io/charmedkubeflow/suggestion-skopt:%(katib_version)s-92cd6d9\n    - algorithmName: cmaes\n      image: docker.io/charmedkubeflow/suggestion-goptuna:%(katib_version)s-92cd6d9\n    - algorithmName: sobol\n      image: docker.io/charmedkubeflow/suggestion-goptuna:%(katib_version)s-92cd6d9\n    - algorithmName: multivariate-tpe\n      image: docker.io/charmedkubeflow/suggestion-optuna:%(katib_version)s-92cd6d9\n    - algorithmName: enas\n      image: docker.io/charmedkubeflow/suggestion-enas:%(katib_version)s-34dac59\n      resources:\n        limits:\n          memory: 400Mi\n    - algorithmName: darts\n      image: docker.io/charmedkubeflow/suggestion-nas-darts:%(katib_version)s-92cd6d9\n    - algorithmName: pbt\n      image: docker.io/charmedkubeflow/suggestion-pbt:%(katib_version)s-92cd6d9\n      persistentVolumeClaimSpec:\n        accessModes:\n          - ReadWriteMany\n        resources:\n          requests:\n            storage: 5Gi\n  earlyStoppings:\n    - algorithmName: medianstop\n      image: custom:2.1"  # noqa: E501
     % {"katib_version": KATIB_VERSION},
 }
 EXPECTED_TRIAL_TEMPLATE = {

diff --git a/charms/katib-db-manager/src/charm.py b/charms/katib-db-manager/src/charm.py
@@ -141,7 +141,7 @@ def _katib_db_manager_layer(self) -> Layer:
             "description": "Pebble config layer for katib-db-manager operator",
             "services": {
                 self._container_name: {
-                    "override": "replace",
+                    "override": "merge",
                     "summary": "Pebble service for katib-db-manager operator",
                     "startup": "enabled",
                     "command": self._exec_command,