Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,21 @@ options:
https://github.com/ceph/ceph-csi/blob/devel/examples/rbd/storageclass.yaml
type: string

image-registry:
type: string
default: "rocks.canonical.com:443/cdk"
description: |
Image registry for all Ceph CSI container images.

This value replaces the image registry in image URLs from the release
manifests. For example, an image URL like
`quay.io/cephcsi/cephcsi:v3.8.0` becomes
`rocks.canonical.com:443/cdk/cephcsi/cephcsi:v3.8.0` if set to
`rocks.canonical.com:443/cdk`.

Example:
juju config ceph-csi image-registry="rocks.canonical.com:443/cdk"

metrics-port-cephfsplugin:
default: -1
description: |
Expand Down
1 change: 0 additions & 1 deletion src/manifests_cephfs.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ def __init__(self, charm: "CephCsiCharm"):
def config(self) -> Dict:
"""Returns current config available from charm config and joined relations."""
config: Dict = {}
config["image-registry"] = "rocks.canonical.com:443/cdk"

config.update(**self.charm.ceph_context)
config.update(**self.charm.kubernetes_context)
Expand Down
2 changes: 1 addition & 1 deletion src/manifests_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def __call__(self) -> Optional[AnyResource]:


class ConfigManifests(SafeManifest):
"""Deployment Specific details for the aws-ebs-csi-driver."""
"""Manage Ceph CSI configuration manifests."""

def __init__(self, charm: "CephCsiCharm"):
self.namespace = cast(str, charm.stored.namespace)
Expand Down
3 changes: 1 addition & 2 deletions src/manifests_rbd.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class ProvisionerAdjustments(Patch):
"""Update RBD provisioner."""

def __call__(self, obj: AnyResource) -> None:
"""Use the image-registry config and updates container images in obj."""
"""Mutates CSI RBD Provisioner Deployment replicas/hostNetwork and DaemonSet kubelet_dir paths."""
if (
obj.kind == "Deployment"
and obj.metadata
Expand Down Expand Up @@ -177,7 +177,6 @@ def __init__(self, charm: "CephCsiCharm"):
def config(self) -> Dict:
"""Returns current config available from charm config and joined relations."""
config: Dict = {}
config["image-registry"] = "rocks.canonical.com:443/cdk"

config.update(**self.charm.ceph_context)
config.update(**self.charm.kubernetes_context)
Expand Down