From a7e9101db04e924f5328573572f0294c89b4d37f Mon Sep 17 00:00:00 2001 From: Travis Glenn Hansen Date: Thu, 1 Oct 2026 21:02:07 -0600 Subject: [PATCH] better handling of oci probe and proper logic around ctr options Signed-off-by: Travis Glenn Hansen --- examples/containerd-oci-ephemeral-inline.yaml | 2 ++ src/driver/ephemeral-inline-containerd-oci/index.js | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/containerd-oci-ephemeral-inline.yaml b/examples/containerd-oci-ephemeral-inline.yaml index ca227fc..a201116 100644 --- a/examples/containerd-oci-ephemeral-inline.yaml +++ b/examples/containerd-oci-ephemeral-inline.yaml @@ -6,3 +6,5 @@ containerd: # use k8s.io to use the k8s ns #namespace: default #creds encryption key + #env: + # foo: bar diff --git a/src/driver/ephemeral-inline-containerd-oci/index.js b/src/driver/ephemeral-inline-containerd-oci/index.js index b4a5ee0..3cfac90 100644 --- a/src/driver/ephemeral-inline-containerd-oci/index.js +++ b/src/driver/ephemeral-inline-containerd-oci/index.js @@ -133,7 +133,7 @@ class EphemeralInlineContainerDOciDriver extends CsiBaseDriver { } catch (err) { throw new GrpcError( grpc.status.FAILED_PRECONDITION, - `containerd is not available: ${String(err)}`, + `containerd is not available: ${JSON.stringify(err)}`, ); } @@ -149,7 +149,7 @@ class EphemeralInlineContainerDOciDriver extends CsiBaseDriver { const driver = this; let options = _.get(driver.options, "containerd", {}); options = options || {}; - return new CTR(options); + return new CTR({ containerd: options }); }); }