diff --git a/lib/charms/kubernetes_manifests/v0/kubernetes_manifests.py b/lib/charms/resource_dispatcher/v0/kubernetes_manifests.py similarity index 98% rename from lib/charms/kubernetes_manifests/v0/kubernetes_manifests.py rename to lib/charms/resource_dispatcher/v0/kubernetes_manifests.py index 5a0acbc..b4743d5 100644 --- a/lib/charms/kubernetes_manifests/v0/kubernetes_manifests.py +++ b/lib/charms/resource_dispatcher/v0/kubernetes_manifests.py @@ -9,7 +9,7 @@ ```shell cd some-charm -charmcraft fetch-lib charms.kubernetes_manifests.v0.kubernetes_manifests +charmcraft fetch-lib charms.resource_dispatcher.v0.kubernetes_manifests ``` In your charm, the library can be used in two ways depending on whether the manifests @@ -20,7 +20,7 @@ In your charm do: ```python -from charms.kubernetes_manifests.v0.kubernetes_manifests import KubernetesManifestsRequirer, KubernetesManifest +from charms.resource_dispatcher.v0.kubernetes_manifests import KubernetesManifestsRequirer, KubernetesManifest # ... SECRETS_MANIFESTS = [ diff --git a/src/charm.py b/src/charm.py index ebf415c..bb97dc4 100755 --- a/src/charm.py +++ b/src/charm.py @@ -9,8 +9,8 @@ from charmed_kubeflow_chisme.exceptions import ErrorWithStatus, GenericCharmRuntimeError from charmed_kubeflow_chisme.kubernetes import KubernetesResourceHandler from charmed_kubeflow_chisme.lightkube.batch import delete_many -from charms.kubernetes_manifests.v0.kubernetes_manifests import KubernetesManifestsProvider from charms.observability_libs.v1.kubernetes_service_patch import KubernetesServicePatch +from charms.resource_dispatcher.v0.kubernetes_manifests import KubernetesManifestsProvider from lightkube import ApiError from lightkube.generic_resource import load_in_cluster_generic_resources from lightkube.models.core_v1 import ServicePort diff --git a/tests/integration/manifests-tester/src/charm.py b/tests/integration/manifests-tester/src/charm.py index 5278dd4..9585e92 100755 --- a/tests/integration/manifests-tester/src/charm.py +++ b/tests/integration/manifests-tester/src/charm.py @@ -12,7 +12,7 @@ from typing import List import yaml -from charms.kubernetes_manifests.v0.kubernetes_manifests import ( +from charms.resource_dispatcher.v0.kubernetes_manifests import ( KubernetesManifest, KubernetesManifestRequirerWrapper, KubernetesManifestsRequirer, diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py index d48ef86..d17db61 100644 --- a/tests/integration/test_charm.py +++ b/tests/integration/test_charm.py @@ -46,7 +46,7 @@ @pytest.fixture(scope="module") def copy_libraries_into_tester_charm() -> None: """Ensure that the tester charms use the current libraries.""" - lib = Path("lib/charms/kubernetes_manifests/v0/kubernetes_manifests.py") + lib = Path("lib/charms/resource_dispatcher/v0/kubernetes_manifests.py") Path(MANIFESTS_REQUIRER_TESTER_CHARM, lib.parent).mkdir(parents=True, exist_ok=True) shutil.copyfile(lib.as_posix(), (MANIFESTS_REQUIRER_TESTER_CHARM / lib).as_posix()) diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py index 80d7b92..5dfdc74 100644 --- a/tests/unit/test_charm.py +++ b/tests/unit/test_charm.py @@ -8,7 +8,7 @@ import pytest import yaml from charmed_kubeflow_chisme.exceptions import ErrorWithStatus, GenericCharmRuntimeError -from charms.kubernetes_manifests.v0.kubernetes_manifests import ( +from charms.resource_dispatcher.v0.kubernetes_manifests import ( KUBERNETES_MANIFESTS_FIELD, KubernetesManifest, ) diff --git a/tests/unit/test_resource_dispatcher_lib.py b/tests/unit/test_resource_dispatcher_lib.py index 327889b..8ee89ab 100644 --- a/tests/unit/test_resource_dispatcher_lib.py +++ b/tests/unit/test_resource_dispatcher_lib.py @@ -9,7 +9,7 @@ from ops.testing import Harness from lib.charms.harness_extensions.v0.capture_events import capture -from lib.charms.kubernetes_manifests.v0.kubernetes_manifests import ( +from lib.charms.resource_dispatcher.v0.kubernetes_manifests import ( KUBERNETES_MANIFESTS_FIELD, KubernetesManifest, KubernetesManifestRequirerWrapper,