From 157057b65ab03749185e8d4637dd9cea72fa1e83 Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Wed, 25 Mar 2026 15:51:29 +0000
Subject: [PATCH] SET-2046 Fix canonical-k8s with ceph

Also fixes canonical k8s no-proxy
---
 kubernetes/pipeline/02configure                 | 14 +++++++++-----
 overlays/kubernetes/canonical-k8s-ceph-csi.yaml |  9 +++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 overlays/kubernetes/canonical-k8s-ceph-csi.yaml

diff --git a/kubernetes/pipeline/02configure b/kubernetes/pipeline/02configure
index 5cd7221..37a074f 100644
--- a/kubernetes/pipeline/02configure
+++ b/kubernetes/pipeline/02configure
@@ -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
 
@@ -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'
diff --git a/overlays/kubernetes/canonical-k8s-ceph-csi.yaml b/overlays/kubernetes/canonical-k8s-ceph-csi.yaml
new file mode 100644
index 0000000..6cb62b3
--- /dev/null
+++ b/overlays/kubernetes/canonical-k8s-ceph-csi.yaml
@@ -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']
+