From e07599ca8e2b9d4b36018f3e104bbea711523b4b Mon Sep 17 00:00:00 2001 From: GigiaJ Date: Sun, 12 Oct 2025 12:50:58 -0500 Subject: [PATCH] Set wasabi to point to s3proxy --- .../main/k8s/add_ons/csi_driver/wasabi.cljs | 49 +++++++++---------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/iac/src/main/k8s/add_ons/csi_driver/wasabi.cljs b/iac/src/main/k8s/add_ons/csi_driver/wasabi.cljs index 405e9b5..9bcc55d 100644 --- a/iac/src/main/k8s/add_ons/csi_driver/wasabi.cljs +++ b/iac/src/main/k8s/add_ons/csi_driver/wasabi.cljs @@ -1,31 +1,26 @@ (ns k8s.add-ons.csi-driver.wasabi (:require [configs :refer [cfg]])) -(defn wasabi-config [] - (pulumi/Config. "wasabi")) - (def config - (let [wasabi-id (-> cfg :wasabiId) - wasabi-key (-> cfg :wasabiKey) - wasabi-secret-name "wasabi-csi-secrets" - wasabi-secret-namespace "kube-system"] - {:stack [:secret :storage-class :chart] - :app-namespace "kube-system" - :app-name "wasabi-csi" - :chart-opts {:chart "csi-s3" - :fetchOpts {:repo "https://yandex-cloud.github.io/k8s-csi-s3/charts"} - :helm-values-fn #(clj->js {:controller {:enabled false - :existingSecret {:name wasabi-secret-name } - :node {:existingSecret {:name wasabi-secret-name }}}})} - :storage-class-opts {:provisioner "ru.yandex.s3.csi" - :parameters {"endpoint" "https://s3.us-east-1.wasabisys.com" - "region" "us-east-1" - "bucket" "pulumi-csi-s3" - "mounter" "geesefs" - "csi.storage.k8s.io/provisioner-secret-name" wasabi-secret-name - "csi.storage.k8s.io/provisioner-secret-namespace" wasabi-secret-namespace - "csi.storage.k8s.io/node-publish-secret-name" wasabi-secret-name - "csi.storage.k8s.io/node-publish-secret-namespace" wasabi-secret-namespace}} - :secret-opts {:stringData {:accessKeyID wasabi-id - :secretAccessKey wasabi-key}} - :vault-load-yaml false})) + {:stack [:secret :chart] + :app-namespace "kube-system" + :no-namespace true + :app-name "wasabi-csi" + :chart-opts {:chart "csi-s3" + :fetchOpts {:repo "https://yandex-cloud.github.io/k8s-csi-s3/charts"} + :helm-values-fn #(clj->js {:controller {:enabled false + :existingSecret {:name "wasabi-csi-secrets"} + :node {:existingSecret {:name "wasabi-csi-secrets"}}}} + + #_:storageClass #_{:create true + :name "csi-s3-sc" + :singleBucket "pulumi-harbor" + :region "us-east-1" + :accessKeyID "something" + :secretAccessKey "something" + ;;:bucket "pulumi-harbor" + })} + :secret-opts {:stringData {:accessKeyID (-> cfg :wasabiId) + :secretAccessKey (-> cfg :wasabiKey) + :endpoint "http://s3proxy.s3proxy.svc.cluster.local"}} + :vault-load-yaml false})