Skip to content

SET-2046 Fix canonical-k8s with ceph #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dosaboy merged 1 commit into from
Mar 27, 2026
Merged

SET-2046 Fix canonical-k8s with ceph #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions kubernetes/pipeline/02configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ fi

if [[ -n $proxy ]]; then
if has_opt --cdk; then
MOD_MSGS[1_proxy.0]="PROXY: Hostname ${proxy} resolves, setting containerd proxy to $proxy"
MOD_MSGS[1_proxy.0]="proxy: hostname $proxy resolves, setting containerd proxy to $proxy"
MOD_PARAMS[__CONTAINERD_PROXY__]=$proxy
else
MOD_MSGS[1_proxy.0]="PROXY: Hostname $proxy resolves, setting juju proxy to $proxy"
MOD_MSGS[1_proxy.0]="proxy: hostname $proxy resolves, setting juju proxy to $proxy"
# from https://documentation.ubuntu.com/canonical-kubernetes/latest/charm/howto/proxy
juju model-config juju-http-proxy=$proxy juju-https-proxy=$proxy juju-no-proxy="$_no_proxy"
juju model-config juju-http-proxy=$proxy juju-https-proxy=$proxy
fi
fi

Expand All @@ -137,8 +137,12 @@ do
conflicts_with $1 --rook-ceph
MOD_OVERLAYS+=( "ceph/ceph.yaml" )
MOD_OVERLAYS+=( "ceph/ceph-juju-storage.yaml" )
MOD_OVERLAYS+=( "kubernetes/k8s-ceph.yaml" )
MOD_OVERLAYS+=( "kubernetes/k8s-ceph-csi.yaml" )
if has_opt --cdk; then
MOD_OVERLAYS+=( "kubernetes/k8s-ceph.yaml" )
MOD_OVERLAYS+=( "kubernetes/k8s-ceph-csi.yaml" )
else
MOD_OVERLAYS+=( "kubernetes/canonical-k8s-ceph-csi.yaml" )
fi
;;
--ceph-proxy)
MOD_PARAMS[__CEPH_INTERFACE__]='ceph-proxy'
Expand Down
9 changes: 9 additions & 0 deletions overlays/kubernetes/canonical-k8s-ceph-csi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
applications:
ceph-csi:
charm: ceph-csi
channel: stable

relations:
- [ '__K8S_CONTROLLER_CHARM__:juju-info', 'ceph-csi:kubernetes' ]
- [ 'ceph-csi:ceph-client', 'ceph-mon:client']

Loading