diff --git a/.gitignore b/.gitignore index 031ef9a5..0ff32a56 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,6 @@ __pycache__/ .pytest_cache/ # dev -images/sds-lvm-csi/Makefile -images/sds-lvm-scheduler-extender/Makefile -images/sds-lvm-controller/Makefile +images/sds-local-volume-csi/Makefile +images/sds-local-volume-scheduler-extender/Makefile +images/sds-local-volume-controller/Makefile diff --git a/Chart.yaml b/Chart.yaml index 773c417f..699f8a6e 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,2 +1,2 @@ -name: sds-lvm +name: sds-local-volume version: 0.0.1 diff --git a/crds/lvmstorageclass.yaml b/crds/localstorageclass.yaml similarity index 94% rename from crds/lvmstorageclass.yaml rename to crds/localstorageclass.yaml index c4e45cfb..85f17c9d 100644 --- a/crds/lvmstorageclass.yaml +++ b/crds/localstorageclass.yaml @@ -1,17 +1,17 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: lvmstorageclasses.storage.deckhouse.io + name: localstorageclasses.storage.deckhouse.io labels: heritage: deckhouse - module: sds-lvm + module: sds-local-volume spec: group: storage.deckhouse.io scope: Cluster names: - plural: lvmstorageclasses - singular: lvmstorageclass - kind: LVMStorageClass + plural: localstorageclasses + singular: localstorageclass + kind: LocalStorageClass shortNames: - lsc preserveUnknownFields: false @@ -23,7 +23,7 @@ spec: openAPIV3Schema: type: object description: | - LVMStorageClass is a Kubernetes Custom Resource that defines a configuration for a Kubernetes Storage class. + LocalStorageClass is a Kubernetes Custom Resource that defines a configuration for a Kubernetes Storage class. required: - spec properties: diff --git a/hooks/common.py b/hooks/common.py index cacf39c9..d1c90472 100644 --- a/hooks/common.py +++ b/hooks/common.py @@ -22,8 +22,8 @@ import unittest -NAMESPACE = "d8-sds-lvm" -MODULE_NAME = "sdsLvm" +NAMESPACE = "d8-sds-local-volume" +MODULE_NAME = "sdsLocalVolume" def json_load(path: str): with open(path, "r", encoding="utf-8") as f: diff --git a/hooks/generate_webhook_certs.py b/hooks/generate_webhook_certs.py index de68a3ab..2ca2eb2b 100755 --- a/hooks/generate_webhook_certs.py +++ b/hooks/generate_webhook_certs.py @@ -32,7 +32,7 @@ def main(): f"webhooks.{common.NAMESPACE}.svc"]), values_path_prefix=f"{common.MODULE_NAME}.internal.customWebhookCert" ), - cn="sds-lvm-webhooks", + cn="sds-local-volume-webhooks", common_ca=True, namespace=common.NAMESPACE) diff --git a/images/sds-lvm-controller/Dockerfile b/images/sds-local-volume-controller/Dockerfile similarity index 68% rename from images/sds-lvm-controller/Dockerfile rename to images/sds-local-volume-controller/Dockerfile index 5b13dcb5..62d7027d 100644 --- a/images/sds-lvm-controller/Dockerfile +++ b/images/sds-local-volume-controller/Dockerfile @@ -9,9 +9,9 @@ ADD go.sum . RUN go mod download COPY . . WORKDIR /go/src/cmd -RUN GOOS=linux GOARCH=amd64 go build -o sds-lvm-controller +RUN GOOS=linux GOARCH=amd64 go build -o sds-local-volume-controller FROM --platform=linux/amd64 $BASE_ALPINE -COPY --from=builder /go/src/cmd/sds-lvm-controller /go/src/cmd/sds-lvm-controller +COPY --from=builder /go/src/cmd/sds-local-volume-controller /go/src/cmd/sds-local-volume-controller -ENTRYPOINT ["/go/src/cmd/sds-lvm-controller"] +ENTRYPOINT ["/go/src/cmd/sds-local-volume-controller"] diff --git a/images/sds-lvm-controller/api/v1alpha1/lvm_storage_class.go b/images/sds-local-volume-controller/api/v1alpha1/local_storage_class.go similarity index 51% rename from images/sds-lvm-controller/api/v1alpha1/lvm_storage_class.go rename to images/sds-local-volume-controller/api/v1alpha1/local_storage_class.go index 7db19641..8ddc29f8 100644 --- a/images/sds-lvm-controller/api/v1alpha1/lvm_storage_class.go +++ b/images/sds-local-volume-controller/api/v1alpha1/local_storage_class.go @@ -18,38 +18,38 @@ package v1alpha1 import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" -type LVMStorageClass struct { +type LocalStorageClass struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` - Spec LVMStorageClassSpec `json:"spec"` - Status *LVMStorageClassStatus `json:"status,omitempty"` + Spec LocalStorageClassSpec `json:"spec"` + Status *LocalStorageClassStatus `json:"status,omitempty"` } -// LVMStorageClassList contains a list of empty block device -type LVMStorageClassList struct { +// LocalStorageClassList contains a list of empty block device +type LocalStorageClassList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata"` - Items []LVMStorageClass `json:"items"` + Items []LocalStorageClass `json:"items"` } -type LVMStorageClassSpec struct { - IsDefault bool `json:"isDefault"` - Type string `json:"type"` - ReclaimPolicy string `json:"reclaimPolicy"` - VolumeBindingMode string `json:"volumeBindingMode"` - LVMVolumeGroups []LVMStorageClassLVG `json:"lvmVolumeGroups"` +type LocalStorageClassSpec struct { + IsDefault bool `json:"isDefault"` + Type string `json:"type"` + ReclaimPolicy string `json:"reclaimPolicy"` + VolumeBindingMode string `json:"volumeBindingMode"` + LVMVolumeGroups []LocalStorageClassLVG `json:"lvmVolumeGroups"` } -type LVMStorageClassStatus struct { +type LocalStorageClassStatus struct { Phase string `json:"phase,omitempty"` Reason string `json:"reason,omitempty"` } -type LVMStorageClassLVG struct { - Name string `json:"name"` - Thin *LVMStorageClassThinPool `json:"thin,omitempty"` +type LocalStorageClassLVG struct { + Name string `json:"name"` + Thin *LocalStorageClassThinPool `json:"thin,omitempty"` } -type LVMStorageClassThinPool struct { +type LocalStorageClassThinPool struct { PoolName string `json:"poolName"` } diff --git a/images/sds-lvm-controller/api/v1alpha1/lvm_volume_group.go b/images/sds-local-volume-controller/api/v1alpha1/lvm_volume_group.go similarity index 100% rename from images/sds-lvm-controller/api/v1alpha1/lvm_volume_group.go rename to images/sds-local-volume-controller/api/v1alpha1/lvm_volume_group.go diff --git a/images/sds-lvm-controller/api/v1alpha1/register.go b/images/sds-local-volume-controller/api/v1alpha1/register.go similarity index 87% rename from images/sds-lvm-controller/api/v1alpha1/register.go rename to images/sds-local-volume-controller/api/v1alpha1/register.go index 9a4263a1..e7a5d0dc 100644 --- a/images/sds-lvm-controller/api/v1alpha1/register.go +++ b/images/sds-local-volume-controller/api/v1alpha1/register.go @@ -23,9 +23,9 @@ import ( ) const ( - LVMStorageClassKind = "LVMStorageClass" - APIGroup = "storage.deckhouse.io" - APIVersion = "v1alpha1" + LocalStorageClassKind = "LocalStorageClass" + APIGroup = "storage.deckhouse.io" + APIVersion = "v1alpha1" ) // SchemeGroupVersion is group version used to register these objects @@ -41,8 +41,8 @@ var ( // Adds the list of known types to Scheme. func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &LVMStorageClass{}, - &LVMStorageClassList{}, + &LocalStorageClass{}, + &LocalStorageClassList{}, &LvmVolumeGroup{}, &LvmVolumeGroupList{}, ) diff --git a/images/sds-lvm-controller/api/v1alpha1/zz_generated.deepcopy.go b/images/sds-local-volume-controller/api/v1alpha1/zz_generated.deepcopy.go similarity index 87% rename from images/sds-lvm-controller/api/v1alpha1/zz_generated.deepcopy.go rename to images/sds-local-volume-controller/api/v1alpha1/zz_generated.deepcopy.go index 8a0e05f3..abf5c426 100644 --- a/images/sds-lvm-controller/api/v1alpha1/zz_generated.deepcopy.go +++ b/images/sds-local-volume-controller/api/v1alpha1/zz_generated.deepcopy.go @@ -19,7 +19,7 @@ package v1alpha1 import "k8s.io/apimachinery/pkg/runtime" // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *LVMStorageClass) DeepCopyInto(out *LVMStorageClass) { +func (in *LocalStorageClass) DeepCopyInto(out *LocalStorageClass) { *out = *in out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) @@ -27,17 +27,17 @@ func (in *LVMStorageClass) DeepCopyInto(out *LVMStorageClass) { } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EmptyBlockDevice. -func (in *LVMStorageClass) DeepCopy() *LVMStorageClass { +func (in *LocalStorageClass) DeepCopy() *LocalStorageClass { if in == nil { return nil } - out := new(LVMStorageClass) + out := new(LocalStorageClass) in.DeepCopyInto(out) return out } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *LVMStorageClass) DeepCopyObject() runtime.Object { +func (in *LocalStorageClass) DeepCopyObject() runtime.Object { if c := in.DeepCopy(); c != nil { return c } @@ -45,13 +45,13 @@ func (in *LVMStorageClass) DeepCopyObject() runtime.Object { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *LVMStorageClassList) DeepCopyInto(out *LVMStorageClassList) { +func (in *LocalStorageClassList) DeepCopyInto(out *LocalStorageClassList) { *out = *in out.TypeMeta = in.TypeMeta in.ListMeta.DeepCopyInto(&out.ListMeta) if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]LVMStorageClass, len(*in)) + *out = make([]LocalStorageClass, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -59,17 +59,17 @@ func (in *LVMStorageClassList) DeepCopyInto(out *LVMStorageClassList) { } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GuestbookList. -func (in *LVMStorageClassList) DeepCopy() *LVMStorageClassList { +func (in *LocalStorageClassList) DeepCopy() *LocalStorageClassList { if in == nil { return nil } - out := new(LVMStorageClassList) + out := new(LocalStorageClassList) in.DeepCopyInto(out) return out } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *LVMStorageClassList) DeepCopyObject() runtime.Object { +func (in *LocalStorageClassList) DeepCopyObject() runtime.Object { if c := in.DeepCopy(); c != nil { return c } diff --git a/images/sds-lvm-controller/cmd/main.go b/images/sds-local-volume-controller/cmd/main.go similarity index 89% rename from images/sds-lvm-controller/cmd/main.go rename to images/sds-local-volume-controller/cmd/main.go index 9d154a7f..1aa6ddf2 100644 --- a/images/sds-lvm-controller/cmd/main.go +++ b/images/sds-local-volume-controller/cmd/main.go @@ -21,12 +21,12 @@ import ( "fmt" "os" goruntime "runtime" - "sds-lvm-controller/api/v1alpha1" - "sds-lvm-controller/pkg/config" - "sds-lvm-controller/pkg/controller" - "sds-lvm-controller/pkg/kubutils" - "sds-lvm-controller/pkg/logger" - "sds-lvm-controller/pkg/monitoring" + "sds-local-volume-controller/api/v1alpha1" + "sds-local-volume-controller/pkg/config" + "sds-local-volume-controller/pkg/controller" + "sds-local-volume-controller/pkg/kubutils" + "sds-local-volume-controller/pkg/logger" + "sds-local-volume-controller/pkg/monitoring" v1 "k8s.io/api/core/v1" sv1 "k8s.io/api/storage/v1" @@ -98,7 +98,7 @@ func main() { metrics := monitoring.GetMetrics("") - if _, err = controller.RunLVMStorageClassWatcherController(mgr, *cfgParams, *log, metrics); err != nil { + if _, err = controller.RunLocalStorageClassWatcherController(mgr, *cfgParams, *log, metrics); err != nil { log.Error(err, "[main] unable to controller.RunBlockDeviceController") os.Exit(1) } diff --git a/images/sds-lvm-controller/go.mod b/images/sds-local-volume-controller/go.mod similarity index 98% rename from images/sds-lvm-controller/go.mod rename to images/sds-local-volume-controller/go.mod index 080c4672..1989965f 100644 --- a/images/sds-lvm-controller/go.mod +++ b/images/sds-local-volume-controller/go.mod @@ -1,4 +1,4 @@ -module sds-lvm-controller +module sds-local-volume-controller go 1.21 diff --git a/images/sds-lvm-controller/go.sum b/images/sds-local-volume-controller/go.sum similarity index 100% rename from images/sds-lvm-controller/go.sum rename to images/sds-local-volume-controller/go.sum diff --git a/images/sds-lvm-controller/pkg/config/config.go b/images/sds-local-volume-controller/pkg/config/config.go similarity index 96% rename from images/sds-lvm-controller/pkg/config/config.go rename to images/sds-local-volume-controller/pkg/config/config.go index 6775c087..140fe658 100644 --- a/images/sds-lvm-controller/pkg/config/config.go +++ b/images/sds-local-volume-controller/pkg/config/config.go @@ -15,7 +15,7 @@ package config import ( "os" - "sds-lvm-controller/pkg/logger" + "sds-local-volume-controller/pkg/logger" "time" ) diff --git a/images/sds-lvm-controller/pkg/controller/lvm_storage_class_watcher.go b/images/sds-local-volume-controller/pkg/controller/local_storage_class_watcher.go similarity index 70% rename from images/sds-lvm-controller/pkg/controller/lvm_storage_class_watcher.go rename to images/sds-local-volume-controller/pkg/controller/local_storage_class_watcher.go index 2aa42072..f97dfc86 100644 --- a/images/sds-lvm-controller/pkg/controller/lvm_storage_class_watcher.go +++ b/images/sds-local-volume-controller/pkg/controller/local_storage_class_watcher.go @@ -20,10 +20,10 @@ import ( "context" "errors" "fmt" - v1alpha1 "sds-lvm-controller/api/v1alpha1" - "sds-lvm-controller/pkg/config" - "sds-lvm-controller/pkg/logger" - "sds-lvm-controller/pkg/monitoring" + v1alpha1 "sds-local-volume-controller/api/v1alpha1" + "sds-local-volume-controller/pkg/config" + "sds-local-volume-controller/pkg/logger" + "sds-local-volume-controller/pkg/monitoring" "strings" "time" @@ -46,7 +46,7 @@ import ( ) const ( - LVMStorageClassCtrlName = "lvm-storage-class-controller" + LocalStorageClassCtrlName = "lvm-storage-class-controller" Thin = "Thin" Thick = "Thick" @@ -54,13 +54,13 @@ const ( StorageClassKind = "StorageClass" StorageClassAPIVersion = "storage.k8s.io/v1" - LVMStorageClassProvisioner = "lvm.csi.storage.deckhouse.io" - LVMTypeParamKey = LVMStorageClassProvisioner + "/lvm-type" - LVMVolumeBindingModeParamKey = LVMStorageClassProvisioner + "/volume-binding-mode" - LVMVolumeGroupsParamKey = LVMStorageClassProvisioner + "/lvm-volume-groups" + LocalStorageClassProvisioner = "local.csi.storage.deckhouse.io" + LVMTypeParamKey = LocalStorageClassProvisioner + "/lvm-type" + LVMVolumeBindingModeParamKey = LocalStorageClassProvisioner + "/volume-binding-mode" + LVMVolumeGroupsParamKey = LocalStorageClassProvisioner + "/lvm-volume-groups" DefaultStorageClassAnnotationKey = "storageclass.kubernetes.io/is-default-class" - LVMStorageClassFinalizerName = "lvmstorageclass.storage.deckhouse.io" + LocalStorageClassFinalizerName = "localstorageclass.storage.deckhouse.io" AllowVolumeExpansionDefaultValue = true @@ -76,7 +76,7 @@ type ( reconcileType string ) -func RunLVMStorageClassWatcherController( +func RunLocalStorageClassWatcherController( mgr manager.Manager, cfg config.Options, log logger.Logger, @@ -84,48 +84,48 @@ func RunLVMStorageClassWatcherController( ) (controller.Controller, error) { cl := mgr.GetClient() - c, err := controller.New(LVMStorageClassCtrlName, mgr, controller.Options{ + c, err := controller.New(LocalStorageClassCtrlName, mgr, controller.Options{ Reconciler: reconcile.Func(func(ctx context.Context, request reconcile.Request) (reconcile.Result, error) { - log.Info("[LVMStorageClassReconciler] starts Reconcile") - lsc := &v1alpha1.LVMStorageClass{} + log.Info("[LocalStorageClassReconciler] starts Reconcile") + lsc := &v1alpha1.LocalStorageClass{} err := cl.Get(ctx, request.NamespacedName, lsc) if err != nil && !errors2.IsNotFound(err) { - log.Error(err, fmt.Sprintf("[LVMStorageClassReconciler] unable to get LVMStorageClass, name: %s", request.Name)) + log.Error(err, fmt.Sprintf("[LocalStorageClassReconciler] unable to get LocalStorageClass, name: %s", request.Name)) return reconcile.Result{}, err } scList := &v1.StorageClassList{} err = cl.List(ctx, scList) if err != nil { - log.Error(err, "[LVMStorageClassReconciler] unable to list Storage Classes") + log.Error(err, "[LocalStorageClassReconciler] unable to list Storage Classes") return reconcile.Result{}, err } shouldRequeue, err := runEventReconcile(ctx, cl, log, scList, lsc) if err != nil { - log.Error(err, fmt.Sprintf("[LVMStorageClassReconciler] an error occured while reconciles the LVMStorageClass, name: %s", lsc.Name)) + log.Error(err, fmt.Sprintf("[LocalStorageClassReconciler] an error occured while reconciles the LocalStorageClass, name: %s", lsc.Name)) } if shouldRequeue { - log.Warning(fmt.Sprintf("[LVMStorageClassReconciler] Reconciler will requeue the request, name: %s", request.Name)) + log.Warning(fmt.Sprintf("[LocalStorageClassReconciler] Reconciler will requeue the request, name: %s", request.Name)) return reconcile.Result{ RequeueAfter: cfg.RequeueInterval * time.Second, }, nil } - log.Info("[LVMStorageClassReconciler] ends Reconcile") + log.Info("[LocalStorageClassReconciler] ends Reconcile") return reconcile.Result{}, err }), }) if err != nil { - log.Error(err, "[RunLVMStorageClassWatcherController] unable to create controller") + log.Error(err, "[RunLocalStorageClassWatcherController] unable to create controller") return nil, err } - err = c.Watch(source.Kind(mgr.GetCache(), &v1alpha1.LVMStorageClass{}), handler.Funcs{ + err = c.Watch(source.Kind(mgr.GetCache(), &v1alpha1.LocalStorageClass{}), handler.Funcs{ CreateFunc: func(ctx context.Context, e event.CreateEvent, q workqueue.RateLimitingInterface) { - log.Info(fmt.Sprintf("[CreateFunc] starts the reconciliation for the LVMStorageClass %s", e.Object.GetName())) - lsc, ok := e.Object.(*v1alpha1.LVMStorageClass) + log.Info(fmt.Sprintf("[CreateFunc] starts the reconciliation for the LocalStorageClass %s", e.Object.GetName())) + lsc, ok := e.Object.(*v1alpha1.LocalStorageClass) if !ok { err = errors.New("unable to cast event object to a given type") log.Error(err, "[CreateFunc] an error occurred while handling create event") @@ -136,7 +136,7 @@ func RunLVMStorageClassWatcherController( err = cl.List(ctx, scList) if err != nil { log.Error(err, "[CreateFunc] unable to list Storage Classes") - err = updateLVMStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, fmt.Sprintf("Unable to list storage classes, err: %s", err.Error())) + err = updateLocalStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, fmt.Sprintf("Unable to list storage classes, err: %s", err.Error())) q.AddAfter(reconcile.Request{ NamespacedName: types.NamespacedName{ Namespace: lsc.Namespace, @@ -148,11 +148,11 @@ func RunLVMStorageClassWatcherController( shouldRequeue, err := runEventReconcile(ctx, cl, log, scList, lsc) if err != nil { - log.Error(err, fmt.Sprintf("[CreateFunc] an error occured while reconciles the LVMStorageClass, name: %s", lsc.Name)) + log.Error(err, fmt.Sprintf("[CreateFunc] an error occured while reconciles the LocalStorageClass, name: %s", lsc.Name)) } if shouldRequeue { - log.Warning(fmt.Sprintf("[CreateFunc] the LVMStorageClass %s event will be requeued", lsc.Name)) + log.Warning(fmt.Sprintf("[CreateFunc] the LocalStorageClass %s event will be requeued", lsc.Name)) q.AddAfter(reconcile.Request{ NamespacedName: types.NamespacedName{ Namespace: lsc.Namespace, @@ -160,11 +160,11 @@ func RunLVMStorageClassWatcherController( }, }, cfg.RequeueInterval*time.Second) } - log.Info(fmt.Sprintf("[CreateFunc] ends the reconciliation for the LVMStorageClass %s", e.Object.GetName())) + log.Info(fmt.Sprintf("[CreateFunc] ends the reconciliation for the LocalStorageClass %s", e.Object.GetName())) }, UpdateFunc: func(ctx context.Context, e event.UpdateEvent, q workqueue.RateLimitingInterface) { - log.Info(fmt.Sprintf("[UpdateFunc] starts the reconciliation for the LVMStorageClass %s", e.ObjectNew.GetName())) - lsc, ok := e.ObjectNew.(*v1alpha1.LVMStorageClass) + log.Info(fmt.Sprintf("[UpdateFunc] starts the reconciliation for the LocalStorageClass %s", e.ObjectNew.GetName())) + lsc, ok := e.ObjectNew.(*v1alpha1.LocalStorageClass) if !ok { err = errors.New("unable to cast event object to a given type") log.Error(err, "[UpdateFunc] an error occurred while handling create event") @@ -175,7 +175,7 @@ func RunLVMStorageClassWatcherController( err = cl.List(ctx, scList) if err != nil { log.Error(err, "[UpdateFunc] unable to list Storage Classes") - err = updateLVMStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, fmt.Sprintf("Unable to list storage classes, err: %s", err.Error())) + err = updateLocalStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, fmt.Sprintf("Unable to list storage classes, err: %s", err.Error())) q.AddAfter(reconcile.Request{ NamespacedName: types.NamespacedName{ Namespace: lsc.Namespace, @@ -187,11 +187,11 @@ func RunLVMStorageClassWatcherController( shouldRequeue, err := runEventReconcile(ctx, cl, log, scList, lsc) if err != nil { - log.Error(err, fmt.Sprintf("[UpdateFunc] an error occured while reconciles the LVMStorageClass, name: %s", lsc.Name)) + log.Error(err, fmt.Sprintf("[UpdateFunc] an error occured while reconciles the LocalStorageClass, name: %s", lsc.Name)) } if shouldRequeue { - log.Warning(fmt.Sprintf("[UpdateFunc] the LVMStorageClass %s event will be requeued", lsc.Name)) + log.Warning(fmt.Sprintf("[UpdateFunc] the LocalStorageClass %s event will be requeued", lsc.Name)) q.AddAfter(reconcile.Request{ NamespacedName: types.NamespacedName{ Namespace: lsc.Namespace, @@ -200,32 +200,32 @@ func RunLVMStorageClassWatcherController( }, cfg.RequeueInterval*time.Second) } - log.Info(fmt.Sprintf("[UpdateFunc] ends the reconciliation for the LVMStorageClass %s", e.ObjectNew.GetName())) + log.Info(fmt.Sprintf("[UpdateFunc] ends the reconciliation for the LocalStorageClass %s", e.ObjectNew.GetName())) }, }) if err != nil { - log.Error(err, "[RunLVMStorageClassWatcherController] unable to watch the events") + log.Error(err, "[RunLocalStorageClassWatcherController] unable to watch the events") return nil, err } return c, nil } -func runEventReconcile(ctx context.Context, cl client.Client, log logger.Logger, scList *v1.StorageClassList, lsc *v1alpha1.LVMStorageClass) (bool, error) { +func runEventReconcile(ctx context.Context, cl client.Client, log logger.Logger, scList *v1.StorageClassList, lsc *v1alpha1.LocalStorageClass) (bool, error) { recType := identifyReconcileFunc(scList, lsc) log.Debug(fmt.Sprintf("[runEventReconcile] reconcile operation: %s", recType)) switch recType { case CreateReconcile: - log.Debug(fmt.Sprintf("[runEventReconcile] CreateReconcile starts reconciliataion for the LVMStorageClass, name: %s", lsc.Name)) + log.Debug(fmt.Sprintf("[runEventReconcile] CreateReconcile starts reconciliataion for the LocalStorageClass, name: %s", lsc.Name)) return reconcileLSCCreateFunc(ctx, cl, log, scList, lsc) case UpdateReconcile: - log.Debug(fmt.Sprintf("[runEventReconcile] UpdateReconcile starts reconciliataion for the LVMStorageClass, name: %s", lsc.Name)) + log.Debug(fmt.Sprintf("[runEventReconcile] UpdateReconcile starts reconciliataion for the LocalStorageClass, name: %s", lsc.Name)) return reconcileLSCUpdateFunc(ctx, cl, log, scList, lsc) case DeleteReconcile: - log.Debug(fmt.Sprintf("[runEventReconcile] DeleteReconcile starts reconciliataion for the LVMStorageClass, name: %s", lsc.Name)) + log.Debug(fmt.Sprintf("[runEventReconcile] DeleteReconcile starts reconciliataion for the LocalStorageClass, name: %s", lsc.Name)) return reconcileLSCDeleteFunc(ctx, cl, log, scList, lsc) default: - log.Debug(fmt.Sprintf("[runEventReconcile] the LVMStorageClass %s should not be reconciled", lsc.Name)) + log.Debug(fmt.Sprintf("[runEventReconcile] the LocalStorageClass %s should not be reconciled", lsc.Name)) } return false, nil @@ -236,9 +236,9 @@ func reconcileLSCDeleteFunc( cl client.Client, log logger.Logger, scList *v1.StorageClassList, - lsc *v1alpha1.LVMStorageClass, + lsc *v1alpha1.LocalStorageClass, ) (bool, error) { - log.Debug(fmt.Sprintf("[reconcileLSCDeleteFunc] tries to find a storage class for the LVMStorageClass %s", lsc.Name)) + log.Debug(fmt.Sprintf("[reconcileLSCDeleteFunc] tries to find a storage class for the LocalStorageClass %s", lsc.Name)) var sc *v1.StorageClass for _, s := range scList.Items { if s.Name == lsc.Name { @@ -247,24 +247,24 @@ func reconcileLSCDeleteFunc( } } if sc == nil { - log.Info(fmt.Sprintf("[reconcileLSCDeleteFunc] no storage class found for the LVMStorageClass, name: %s", lsc.Name)) + log.Info(fmt.Sprintf("[reconcileLSCDeleteFunc] no storage class found for the LocalStorageClass, name: %s", lsc.Name)) } if sc != nil { - log.Info(fmt.Sprintf("[reconcileLSCDeleteFunc] successfully found a storage class for the LVMStorageClass %s", lsc.Name)) + log.Info(fmt.Sprintf("[reconcileLSCDeleteFunc] successfully found a storage class for the LocalStorageClass %s", lsc.Name)) log.Debug(fmt.Sprintf("[reconcileLSCDeleteFunc] starts identifing a provisioner for the storage class %s", sc.Name)) - if sc.Provisioner != LVMStorageClassProvisioner { - log.Info(fmt.Sprintf("[reconcileLSCDeleteFunc] the storage class %s does not belongs to %s provisioner. It will not be deleted", sc.Name, LVMStorageClassProvisioner)) + if sc.Provisioner != LocalStorageClassProvisioner { + log.Info(fmt.Sprintf("[reconcileLSCDeleteFunc] the storage class %s does not belongs to %s provisioner. It will not be deleted", sc.Name, LocalStorageClassProvisioner)) } else { - log.Info(fmt.Sprintf("[reconcileLSCDeleteFunc] the storage class %s belongs to %s provisioner. It will be deleted", sc.Name, LVMStorageClassProvisioner)) + log.Info(fmt.Sprintf("[reconcileLSCDeleteFunc] the storage class %s belongs to %s provisioner. It will be deleted", sc.Name, LocalStorageClassProvisioner)) err := cl.Delete(ctx, sc) if err != nil { log.Error(err, fmt.Sprintf("[reconcileLSCDeleteFunc] unable to delete a storage class, name: %s", sc.Name)) - upErr := updateLVMStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, fmt.Sprintf("Unable to delete a storage class, err: %s", err.Error())) + upErr := updateLocalStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, fmt.Sprintf("Unable to delete a storage class, err: %s", err.Error())) if upErr != nil { - log.Error(upErr, fmt.Sprintf("[reconcileLSCDeleteFunc] unable to update the LVMStorageClass, name: %s", lsc.Name)) + log.Error(upErr, fmt.Sprintf("[reconcileLSCDeleteFunc] unable to update the LocalStorageClass, name: %s", lsc.Name)) } return true, err } @@ -272,26 +272,26 @@ func reconcileLSCDeleteFunc( } } - log.Debug(fmt.Sprintf("[reconcileLSCDeleteFunc] starts removing a finalizer %s from the LVMStorageClass, name: %s", LVMStorageClassFinalizerName, lsc.Name)) + log.Debug(fmt.Sprintf("[reconcileLSCDeleteFunc] starts removing a finalizer %s from the LocalStorageClass, name: %s", LocalStorageClassFinalizerName, lsc.Name)) removed, err := removeLVMSCFinalizerIfExists(ctx, cl, lsc) if err != nil { - log.Error(err, "[reconcileLSCDeleteFunc] unable to remove a finalizer %s from the LVMStorageClass, name: %s", LVMStorageClassFinalizerName, lsc.Name) - upErr := updateLVMStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, fmt.Sprintf("Unable to remove a finalizer, err: %s", err.Error())) + log.Error(err, "[reconcileLSCDeleteFunc] unable to remove a finalizer %s from the LocalStorageClass, name: %s", LocalStorageClassFinalizerName, lsc.Name) + upErr := updateLocalStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, fmt.Sprintf("Unable to remove a finalizer, err: %s", err.Error())) if upErr != nil { - log.Error(upErr, fmt.Sprintf("[reconcileLSCDeleteFunc] unable to update the LVMStorageClass, name: %s", lsc.Name)) + log.Error(upErr, fmt.Sprintf("[reconcileLSCDeleteFunc] unable to update the LocalStorageClass, name: %s", lsc.Name)) } return true, err } - log.Debug(fmt.Sprintf("[reconcileLSCDeleteFunc] the LVMStorageClass %s finalizer %s was removed: %t", lsc.Name, LVMStorageClassFinalizerName, removed)) + log.Debug(fmt.Sprintf("[reconcileLSCDeleteFunc] the LocalStorageClass %s finalizer %s was removed: %t", lsc.Name, LocalStorageClassFinalizerName, removed)) log.Debug("[reconcileLSCDeleteFunc] ends the reconciliation") return false, nil } -func removeLVMSCFinalizerIfExists(ctx context.Context, cl client.Client, lsc *v1alpha1.LVMStorageClass) (bool, error) { +func removeLVMSCFinalizerIfExists(ctx context.Context, cl client.Client, lsc *v1alpha1.LocalStorageClass) (bool, error) { removed := false for i, f := range lsc.Finalizers { - if f == LVMStorageClassFinalizerName { + if f == LocalStorageClassFinalizerName { lsc.Finalizers = append(lsc.Finalizers[:i], lsc.Finalizers[i+1:]...) removed = true break @@ -313,20 +313,20 @@ func reconcileLSCUpdateFunc( cl client.Client, log logger.Logger, scList *v1.StorageClassList, - lsc *v1alpha1.LVMStorageClass, + lsc *v1alpha1.LocalStorageClass, ) (bool, error) { - log.Debug(fmt.Sprintf("[reconcileLSCUpdateFunc] starts the LVMStorageClass %s validation", lsc.Name)) - valid, msg := validateLVMStorageClass(ctx, cl, scList, lsc) + log.Debug(fmt.Sprintf("[reconcileLSCUpdateFunc] starts the LocalStorageClass %s validation", lsc.Name)) + valid, msg := validateLocalStorageClass(ctx, cl, scList, lsc) if !valid { err := errors.New("validation failed. Check the resource's Status.Message for more information") - log.Error(err, fmt.Sprintf("[reconcileLSCUpdateFunc] Unable to reconcile the LVMStorageClass, name: %s", lsc.Name)) - upError := updateLVMStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, msg) + log.Error(err, fmt.Sprintf("[reconcileLSCUpdateFunc] Unable to reconcile the LocalStorageClass, name: %s", lsc.Name)) + upError := updateLocalStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, msg) if upError != nil { - log.Error(upError, fmt.Sprintf("[reconcileLSCUpdateFunc] unable to update the LVMStorageClass %s", lsc.Name)) + log.Error(upError, fmt.Sprintf("[reconcileLSCUpdateFunc] unable to update the LocalStorageClass %s", lsc.Name)) } return false, err } - log.Debug(fmt.Sprintf("[reconcileLSCUpdateFunc] successfully validated the LVMStorageClass, name: %s", lsc.Name)) + log.Debug(fmt.Sprintf("[reconcileLSCUpdateFunc] successfully validated the LocalStorageClass, name: %s", lsc.Name)) var sc *v1.StorageClass for _, s := range scList.Items { @@ -337,18 +337,18 @@ func reconcileLSCUpdateFunc( } if sc == nil { err := errors.New(fmt.Sprintf("a storage class %s does not exist", lsc.Name)) - log.Error(err, fmt.Sprintf("[reconcileLSCUpdateFunc] unable to find a storage class for the LVMStorageClass, name: %s", lsc.Name)) - upError := updateLVMStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, msg) + log.Error(err, fmt.Sprintf("[reconcileLSCUpdateFunc] unable to find a storage class for the LocalStorageClass, name: %s", lsc.Name)) + upError := updateLocalStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, msg) if upError != nil { - log.Error(upError, fmt.Sprintf("[reconcileLSCUpdateFunc] unable to update the LVMStorageClass %s", lsc.Name)) + log.Error(upError, fmt.Sprintf("[reconcileLSCUpdateFunc] unable to update the LocalStorageClass %s", lsc.Name)) } return false, err } - log.Debug(fmt.Sprintf("[reconcileLSCUpdateFunc] successfully found a storage class for the LVMStorageClass, name: %s", lsc.Name)) + log.Debug(fmt.Sprintf("[reconcileLSCUpdateFunc] successfully found a storage class for the LocalStorageClass, name: %s", lsc.Name)) sc = patchSCByLSC(sc, lsc) - log.Debug(fmt.Sprintf("[reconcileLSCUpdateFunc] patched a storage class by the LVMStorageClass, name: %s", lsc.Name)) + log.Debug(fmt.Sprintf("[reconcileLSCUpdateFunc] patched a storage class by the LocalStorageClass, name: %s", lsc.Name)) err := cl.Update(ctx, sc) if err != nil { @@ -357,17 +357,17 @@ func reconcileLSCUpdateFunc( } log.Debug(fmt.Sprintf("[reconcileLSCUpdateFunc] successfully updated the storage class, name: %s", sc.Name)) - err = updateLVMStorageClassPhase(ctx, cl, lsc, CreatedStatusPhase, "") + err = updateLocalStorageClassPhase(ctx, cl, lsc, CreatedStatusPhase, "") if err != nil { - log.Error(err, fmt.Sprintf("[reconcileLSCUpdateFunc] unable to update the LVMStorageClass, name: %s", lsc.Name)) + log.Error(err, fmt.Sprintf("[reconcileLSCUpdateFunc] unable to update the LocalStorageClass, name: %s", lsc.Name)) return true, err } - log.Debug(fmt.Sprintf("[reconcileLSCUpdateFunc] successfully updated the LVMStorageClass %s status", sc.Name)) + log.Debug(fmt.Sprintf("[reconcileLSCUpdateFunc] successfully updated the LocalStorageClass %s status", sc.Name)) return false, nil } -func patchSCByLSC(sc *v1.StorageClass, lsc *v1alpha1.LVMStorageClass) *v1.StorageClass { +func patchSCByLSC(sc *v1.StorageClass, lsc *v1alpha1.LocalStorageClass) *v1.StorageClass { lscDefault := "false" if lsc.Spec.IsDefault { lscDefault = "true" @@ -378,7 +378,7 @@ func patchSCByLSC(sc *v1.StorageClass, lsc *v1alpha1.LVMStorageClass) *v1.Storag return sc } -func identifyReconcileFunc(scList *v1.StorageClassList, lsc *v1alpha1.LVMStorageClass) reconcileType { +func identifyReconcileFunc(scList *v1.StorageClassList, lsc *v1alpha1.LocalStorageClass) reconcileType { should := shouldReconcileByCreateFunc(scList, lsc) if should { return CreateReconcile @@ -397,7 +397,7 @@ func identifyReconcileFunc(scList *v1.StorageClassList, lsc *v1alpha1.LVMStorage return "none" } -func shouldReconcileByDeleteFunc(lsc *v1alpha1.LVMStorageClass) bool { +func shouldReconcileByDeleteFunc(lsc *v1alpha1.LocalStorageClass) bool { if lsc.DeletionTimestamp != nil { return true } @@ -405,7 +405,7 @@ func shouldReconcileByDeleteFunc(lsc *v1alpha1.LVMStorageClass) bool { return false } -func shouldReconcileByUpdateFunc(scList *v1.StorageClassList, lsc *v1alpha1.LVMStorageClass) bool { +func shouldReconcileByUpdateFunc(scList *v1.StorageClassList, lsc *v1alpha1.LocalStorageClass) bool { if lsc.DeletionTimestamp != nil { return false } @@ -415,7 +415,7 @@ func shouldReconcileByUpdateFunc(scList *v1.StorageClassList, lsc *v1alpha1.LVMS } for _, sc := range scList.Items { - if sc.Name == lsc.Name && sc.Provisioner == LVMStorageClassProvisioner { + if sc.Name == lsc.Name && sc.Provisioner == LocalStorageClassProvisioner { lscDefault := "false" if lsc.Spec.IsDefault { lscDefault = "true" @@ -430,7 +430,7 @@ func shouldReconcileByUpdateFunc(scList *v1.StorageClassList, lsc *v1alpha1.LVMS return false } -func shouldReconcileByCreateFunc(scList *v1.StorageClassList, lsc *v1alpha1.LVMStorageClass) bool { +func shouldReconcileByCreateFunc(scList *v1.StorageClassList, lsc *v1alpha1.LocalStorageClass) bool { for _, sc := range scList.Items { if sc.Name == lsc.Name && lsc.Status != nil { @@ -446,42 +446,42 @@ func reconcileLSCCreateFunc( cl client.Client, log logger.Logger, scList *v1.StorageClassList, - lsc *v1alpha1.LVMStorageClass, + lsc *v1alpha1.LocalStorageClass, ) (bool, error) { - log.Debug(fmt.Sprintf("[reconcileLSCCreateFunc] starts the LVMStorageClass %s validation", lsc.Name)) - valid, msg := validateLVMStorageClass(ctx, cl, scList, lsc) + log.Debug(fmt.Sprintf("[reconcileLSCCreateFunc] starts the LocalStorageClass %s validation", lsc.Name)) + valid, msg := validateLocalStorageClass(ctx, cl, scList, lsc) if !valid { err := errors.New("validation failed. Check the resource's Status.Message for more information") - log.Error(err, fmt.Sprintf("[reconcileLSCCreateFunc] Unable to reconcile the LVMStorageClass, name: %s", lsc.Name)) - upError := updateLVMStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, msg) + log.Error(err, fmt.Sprintf("[reconcileLSCCreateFunc] Unable to reconcile the LocalStorageClass, name: %s", lsc.Name)) + upError := updateLocalStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, msg) if upError != nil { - log.Error(upError, fmt.Sprintf("[reconcileLSCCreateFunc] unable to update the LVMStorageClass %s", lsc.Name)) + log.Error(upError, fmt.Sprintf("[reconcileLSCCreateFunc] unable to update the LocalStorageClass %s", lsc.Name)) return true, upError } return false, err } - log.Debug(fmt.Sprintf("[reconcileLSCCreateFunc] successfully validated the LVMStorageClass, name: %s", lsc.Name)) + log.Debug(fmt.Sprintf("[reconcileLSCCreateFunc] successfully validated the LocalStorageClass, name: %s", lsc.Name)) - log.Debug(fmt.Sprintf("[reconcileLSCCreateFunc] starts storage class configuration for the LVMStorageClass, name: %s", lsc.Name)) + log.Debug(fmt.Sprintf("[reconcileLSCCreateFunc] starts storage class configuration for the LocalStorageClass, name: %s", lsc.Name)) sc, err := configureStorageClass(lsc) if err != nil { - log.Error(err, fmt.Sprintf("[reconcileLSCCreateFunc] unable to configure Storage Class for LVMStorageClass, name: %s", lsc.Name)) - upError := updateLVMStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, msg) + log.Error(err, fmt.Sprintf("[reconcileLSCCreateFunc] unable to configure Storage Class for LocalStorageClass, name: %s", lsc.Name)) + upError := updateLocalStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, msg) if upError != nil { - log.Error(upError, fmt.Sprintf("[reconcileLSCCreateFunc] unable to update the LVMStorageClass %s", lsc.Name)) + log.Error(upError, fmt.Sprintf("[reconcileLSCCreateFunc] unable to update the LocalStorageClass %s", lsc.Name)) return true, upError } return false, err } - log.Debug(fmt.Sprintf("[reconcileLSCCreateFunc] successfully configurated storage class for the LVMStorageClass, name: %s", lsc.Name)) + log.Debug(fmt.Sprintf("[reconcileLSCCreateFunc] successfully configurated storage class for the LocalStorageClass, name: %s", lsc.Name)) created, err := createStorageClassIfNotExists(ctx, cl, scList, sc) if err != nil { log.Error(err, fmt.Sprintf("[reconcileLSCCreateFunc] unable to create a Storage Class, name: %s", sc.Name)) - upError := updateLVMStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, msg) + upError := updateLocalStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, msg) if upError != nil { - log.Error(upError, fmt.Sprintf("[reconcileLSCCreateFunc] unable to update the LVMStorageClass %s", lsc.Name)) + log.Error(upError, fmt.Sprintf("[reconcileLSCCreateFunc] unable to update the LocalStorageClass %s", lsc.Name)) return true, upError } return true, err @@ -491,19 +491,19 @@ func reconcileLSCCreateFunc( log.Info(fmt.Sprintf("[reconcileLSCCreateFunc] successfully create storage class, name: %s", sc.Name)) } - err = updateLVMStorageClassPhase(ctx, cl, lsc, CreatedStatusPhase, "") + err = updateLocalStorageClassPhase(ctx, cl, lsc, CreatedStatusPhase, "") if err != nil { - log.Error(err, fmt.Sprintf("[reconcileLSCCreateFunc] unable to update the LVMStorageClass, name: %s", lsc.Name)) + log.Error(err, fmt.Sprintf("[reconcileLSCCreateFunc] unable to update the LocalStorageClass, name: %s", lsc.Name)) return true, err } - log.Debug(fmt.Sprintf("[reconcileLSCCreateFunc] successfully updated the LVMStorageClass %s status", sc.Name)) + log.Debug(fmt.Sprintf("[reconcileLSCCreateFunc] successfully updated the LocalStorageClass %s status", sc.Name)) added, err := addFinalizerIfNotExists(ctx, cl, lsc) if err != nil { - log.Error(err, fmt.Sprintf("[reconcileLSCCreateFunc] unable to add a finalizer %s to the LVMStorageClass %s", LVMStorageClassFinalizerName, lsc.Name)) + log.Error(err, fmt.Sprintf("[reconcileLSCCreateFunc] unable to add a finalizer %s to the LocalStorageClass %s", LocalStorageClassFinalizerName, lsc.Name)) return true, err } - log.Debug(fmt.Sprintf("[reconcileLSCCreateFunc] finalizer %s was added to the LVMStorageClass %s: %t", LVMStorageClassFinalizerName, lsc.Name, added)) + log.Debug(fmt.Sprintf("[reconcileLSCCreateFunc] finalizer %s was added to the LocalStorageClass %s: %t", LocalStorageClassFinalizerName, lsc.Name, added)) return false, nil } @@ -528,9 +528,9 @@ func createStorageClassIfNotExists( return true, err } -func addFinalizerIfNotExists(ctx context.Context, cl client.Client, lsc *v1alpha1.LVMStorageClass) (bool, error) { - if !slices.Contains(lsc.Finalizers, LVMStorageClassFinalizerName) { - lsc.Finalizers = append(lsc.Finalizers, LVMStorageClassFinalizerName) +func addFinalizerIfNotExists(ctx context.Context, cl client.Client, lsc *v1alpha1.LocalStorageClass) (bool, error) { + if !slices.Contains(lsc.Finalizers, LocalStorageClassFinalizerName) { + lsc.Finalizers = append(lsc.Finalizers, LocalStorageClassFinalizerName) } err := cl.Update(ctx, lsc) @@ -541,7 +541,7 @@ func addFinalizerIfNotExists(ctx context.Context, cl client.Client, lsc *v1alpha return true, nil } -func configureStorageClass(lsc *v1alpha1.LVMStorageClass) (*v1.StorageClass, error) { +func configureStorageClass(lsc *v1alpha1.LocalStorageClass) (*v1.StorageClass, error) { reclaimPolicy := corev1.PersistentVolumeReclaimPolicy(lsc.Spec.ReclaimPolicy) volumeBindingMode := v1.VolumeBindingMode(lsc.Spec.VolumeBindingMode) AllowVolumeExpansion := AllowVolumeExpansionDefaultValue @@ -568,7 +568,7 @@ func configureStorageClass(lsc *v1alpha1.LVMStorageClass) (*v1.StorageClass, err DefaultStorageClassAnnotationKey: isDefault, }, }, - Provisioner: LVMStorageClassProvisioner, + Provisioner: LocalStorageClassProvisioner, Parameters: map[string]string{ LVMTypeParamKey: lsc.Spec.Type, LVMVolumeBindingModeParamKey: lsc.Spec.VolumeBindingMode, @@ -582,15 +582,15 @@ func configureStorageClass(lsc *v1alpha1.LVMStorageClass) (*v1.StorageClass, err return sc, nil } -func updateLVMStorageClassPhase( +func updateLocalStorageClassPhase( ctx context.Context, cl client.Client, - lsc *v1alpha1.LVMStorageClass, + lsc *v1alpha1.LocalStorageClass, phase, reason string, ) error { if lsc.Status == nil { - lsc.Status = new(v1alpha1.LVMStorageClassStatus) + lsc.Status = new(v1alpha1.LocalStorageClassStatus) } lsc.Status.Phase = phase lsc.Status.Reason = reason @@ -604,11 +604,11 @@ func updateLVMStorageClassPhase( return nil } -func validateLVMStorageClass( +func validateLocalStorageClass( ctx context.Context, cl client.Client, scList *v1.StorageClassList, - lsc *v1alpha1.LVMStorageClass, + lsc *v1alpha1.LocalStorageClass, ) (bool, string) { var ( failedMsgBuilder strings.Builder @@ -666,9 +666,9 @@ func validateLVMStorageClass( return valid, failedMsgBuilder.String() } -func findUnmanagedDuplicatedSC(scList *v1.StorageClassList, lsc *v1alpha1.LVMStorageClass) string { +func findUnmanagedDuplicatedSC(scList *v1.StorageClassList, lsc *v1alpha1.LocalStorageClass) string { for _, sc := range scList.Items { - if sc.Name == lsc.Name && sc.Provisioner != LVMStorageClassProvisioner { + if sc.Name == lsc.Name && sc.Provisioner != LocalStorageClassProvisioner { return sc.Name } } @@ -676,7 +676,7 @@ func findUnmanagedDuplicatedSC(scList *v1.StorageClassList, lsc *v1alpha1.LVMSto return "" } -func findAnyThinPool(lsc *v1alpha1.LVMStorageClass) []string { +func findAnyThinPool(lsc *v1alpha1.LocalStorageClass) []string { badLvgs := make([]string, 0, len(lsc.Spec.LVMVolumeGroups)) for _, lvs := range lsc.Spec.LVMVolumeGroups { if lvs.Thin != nil { @@ -687,7 +687,7 @@ func findAnyThinPool(lsc *v1alpha1.LVMStorageClass) []string { return badLvgs } -func findNonexistentThinPools(lvgList *v1alpha1.LvmVolumeGroupList, lsc *v1alpha1.LVMStorageClass) []string { +func findNonexistentThinPools(lvgList *v1alpha1.LvmVolumeGroupList, lsc *v1alpha1.LocalStorageClass) []string { lvgs := make(map[string]v1alpha1.LvmVolumeGroup, len(lvgList.Items)) for _, lvg := range lvgList.Items { lvgs[lvg.Name] = lvg @@ -718,7 +718,7 @@ func findNonexistentThinPools(lvgList *v1alpha1.LvmVolumeGroupList, lsc *v1alpha return badLvgs } -func findNonexistentLVGs(lvgList *v1alpha1.LvmVolumeGroupList, lsc *v1alpha1.LVMStorageClass) []string { +func findNonexistentLVGs(lvgList *v1alpha1.LvmVolumeGroupList, lsc *v1alpha1.LocalStorageClass) []string { lvgs := make(map[string]struct{}, len(lvgList.Items)) for _, lvg := range lvgList.Items { lvgs[lvg.Name] = struct{}{} @@ -734,7 +734,7 @@ func findNonexistentLVGs(lvgList *v1alpha1.LvmVolumeGroupList, lsc *v1alpha1.LVM return nonexistent } -func findLVMVolumeGroupsOnTheSameNode(lvgList *v1alpha1.LvmVolumeGroupList, lsc *v1alpha1.LVMStorageClass) []string { +func findLVMVolumeGroupsOnTheSameNode(lvgList *v1alpha1.LvmVolumeGroupList, lsc *v1alpha1.LocalStorageClass) []string { nodesWithLVGs := make(map[string][]string, len(lsc.Spec.LVMVolumeGroups)) usedLVGs := make(map[string]struct{}, len(lsc.Spec.LVMVolumeGroups)) for _, lvg := range lsc.Spec.LVMVolumeGroups { @@ -765,7 +765,7 @@ func findLVMVolumeGroupsOnTheSameNode(lvgList *v1alpha1.LvmVolumeGroupList, lsc return badLVGs } -func findOtherDefaultStorageClasses(scList *v1.StorageClassList, lsc *v1alpha1.LVMStorageClass) []string { +func findOtherDefaultStorageClasses(scList *v1.StorageClassList, lsc *v1alpha1.LocalStorageClass) []string { defaults := make([]string, 0, len(scList.Items)) for _, sc := range scList.Items { diff --git a/images/sds-lvm-controller/pkg/kubutils/kubernetes.go b/images/sds-local-volume-controller/pkg/kubutils/kubernetes.go similarity index 100% rename from images/sds-lvm-controller/pkg/kubutils/kubernetes.go rename to images/sds-local-volume-controller/pkg/kubutils/kubernetes.go diff --git a/images/sds-lvm-controller/pkg/logger/logger.go b/images/sds-local-volume-controller/pkg/logger/logger.go similarity index 100% rename from images/sds-lvm-controller/pkg/logger/logger.go rename to images/sds-local-volume-controller/pkg/logger/logger.go diff --git a/images/sds-lvm-controller/pkg/monitoring/monitoring.go b/images/sds-local-volume-controller/pkg/monitoring/monitoring.go similarity index 100% rename from images/sds-lvm-controller/pkg/monitoring/monitoring.go rename to images/sds-local-volume-controller/pkg/monitoring/monitoring.go diff --git a/images/sds-lvm-csi/Dockerfile b/images/sds-local-volume-csi/Dockerfile similarity index 75% rename from images/sds-lvm-csi/Dockerfile rename to images/sds-local-volume-csi/Dockerfile index fef5e95e..5170d8e9 100644 --- a/images/sds-lvm-csi/Dockerfile +++ b/images/sds-local-volume-csi/Dockerfile @@ -13,13 +13,13 @@ RUN go mod download COPY . . WORKDIR /go/src/cmd -RUN GOOS=linux GOARCH=amd64 go build -o sds-lvm-csi +RUN GOOS=linux GOARCH=amd64 go build -o sds-local-volume-csi FROM --platform=linux/amd64 $BASE_ALPINE ENV DEBIAN_FRONTEND noninteractive RUN apk add --no-cache lvm2 e2fsprogs e2fsprogs-extra xfsprogs xfsprogs-extra blkid -COPY --from=builder /go/src/cmd/sds-lvm-csi /go/src/cmd/sds-lvm-csi +COPY --from=builder /go/src/cmd/sds-local-volume-csi /go/src/cmd/sds-local-volume-csi -ENTRYPOINT ["/go/src/cmd/sds-lvm-csi"] +ENTRYPOINT ["/go/src/cmd/sds-local-volume-csi"] diff --git a/images/sds-lvm-csi/api/v1alpha1/lvm_logical_volume.go b/images/sds-local-volume-csi/api/v1alpha1/lvm_logical_volume.go similarity index 100% rename from images/sds-lvm-csi/api/v1alpha1/lvm_logical_volume.go rename to images/sds-local-volume-csi/api/v1alpha1/lvm_logical_volume.go diff --git a/images/sds-lvm-csi/api/v1alpha1/lvm_volume_group.go b/images/sds-local-volume-csi/api/v1alpha1/lvm_volume_group.go similarity index 100% rename from images/sds-lvm-csi/api/v1alpha1/lvm_volume_group.go rename to images/sds-local-volume-csi/api/v1alpha1/lvm_volume_group.go diff --git a/images/sds-lvm-csi/api/v1alpha1/register.go b/images/sds-local-volume-csi/api/v1alpha1/register.go similarity index 100% rename from images/sds-lvm-csi/api/v1alpha1/register.go rename to images/sds-local-volume-csi/api/v1alpha1/register.go diff --git a/images/sds-lvm-csi/api/v1alpha1/zz_generated.deepcopy.go b/images/sds-local-volume-csi/api/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from images/sds-lvm-csi/api/v1alpha1/zz_generated.deepcopy.go rename to images/sds-local-volume-csi/api/v1alpha1/zz_generated.deepcopy.go diff --git a/images/sds-lvm-csi/cmd/main.go b/images/sds-local-volume-csi/cmd/main.go similarity index 94% rename from images/sds-lvm-csi/cmd/main.go rename to images/sds-local-volume-csi/cmd/main.go index 3e80ad15..6a999c0d 100644 --- a/images/sds-lvm-csi/cmd/main.go +++ b/images/sds-local-volume-csi/cmd/main.go @@ -22,11 +22,11 @@ import ( "fmt" "os" "os/signal" - "sds-lvm-csi/api/v1alpha1" - "sds-lvm-csi/config" - "sds-lvm-csi/driver" - "sds-lvm-csi/pkg/kubutils" - "sds-lvm-csi/pkg/logger" + "sds-local-volume-csi/api/v1alpha1" + "sds-local-volume-csi/config" + "sds-local-volume-csi/driver" + "sds-local-volume-csi/pkg/kubutils" + "sds-local-volume-csi/pkg/logger" "syscall" diff --git a/images/sds-lvm-csi/config/config.go b/images/sds-local-volume-csi/config/config.go similarity index 97% rename from images/sds-lvm-csi/config/config.go rename to images/sds-local-volume-csi/config/config.go index 92d45673..1fd0cc18 100644 --- a/images/sds-lvm-csi/config/config.go +++ b/images/sds-local-volume-csi/config/config.go @@ -19,7 +19,7 @@ package config import ( "fmt" "os" - "sds-lvm-csi/pkg/logger" + "sds-local-volume-csi/pkg/logger" ) const ( diff --git a/images/sds-lvm-csi/driver/controller.go b/images/sds-local-volume-csi/driver/controller.go similarity index 96% rename from images/sds-lvm-csi/driver/controller.go rename to images/sds-local-volume-csi/driver/controller.go index 1d91c699..02d67056 100644 --- a/images/sds-lvm-csi/driver/controller.go +++ b/images/sds-local-volume-csi/driver/controller.go @@ -20,8 +20,8 @@ import ( "context" "errors" "fmt" - "sds-lvm-csi/internal" - "sds-lvm-csi/pkg/utils" + "sds-local-volume-csi/internal" + "sds-local-volume-csi/pkg/utils" kerrors "k8s.io/apimachinery/pkg/api/errors" @@ -45,8 +45,8 @@ func (d *Driver) CreateVolume(ctx context.Context, request *csi.CreateVolumeRequ return nil, status.Error(codes.InvalidArgument, "Volume Capability cannot de empty") } - LvmBindingMode := request.GetParameters()[internal.LvmBindingModeKey] - d.log.Info(fmt.Sprintf("storage class LvmBindingMode: %s", LvmBindingMode)) + BindingMode := request.GetParameters()[internal.BindingModeKey] + d.log.Info(fmt.Sprintf("storage class BindingMode: %s", BindingMode)) LvmType := request.GetParameters()[internal.LvmTypeKey] d.log.Info(fmt.Sprintf("storage class LvmType: %s", LvmType)) @@ -70,9 +70,9 @@ func (d *Driver) CreateVolume(ctx context.Context, request *csi.CreateVolumeRequ d.log.Info(fmt.Sprintf("llv size: %s ", llvSize.String())) var preferredNode string - switch LvmBindingMode { + switch BindingMode { case internal.BindingModeI: - d.log.Info(fmt.Sprintf("LvmBindingMode is %s. Start selecting node", internal.BindingModeI)) + d.log.Info(fmt.Sprintf("BindingMode is %s. Start selecting node", internal.BindingModeI)) selectedNodeName, freeSpace, err := utils.GetNodeWithMaxFreeSpace(*d.log, storageClassLVGs, storageClassLVGParametersMap, LvmType) if err != nil { d.log.Error(err, "error GetNodeMaxVGSize") @@ -86,7 +86,7 @@ func (d *Driver) CreateVolume(ctx context.Context, request *csi.CreateVolumeRequ } } case internal.BindingModeWFFC: - d.log.Info(fmt.Sprintf("LvmBindingMode is %s. Get preferredNode", internal.BindingModeWFFC)) + d.log.Info(fmt.Sprintf("BindingMode is %s. Get preferredNode", internal.BindingModeWFFC)) if len(request.AccessibilityRequirements.Preferred) != 0 { t := request.AccessibilityRequirements.Preferred[0].Segments preferredNode = t[internal.TopologyKey] diff --git a/images/sds-lvm-csi/driver/driver.go b/images/sds-local-volume-csi/driver/driver.go similarity index 97% rename from images/sds-lvm-csi/driver/driver.go rename to images/sds-local-volume-csi/driver/driver.go index b21066d3..8a4a001f 100644 --- a/images/sds-lvm-csi/driver/driver.go +++ b/images/sds-local-volume-csi/driver/driver.go @@ -26,8 +26,8 @@ import ( "os" "path" "path/filepath" - "sds-lvm-csi/pkg/logger" - "sds-lvm-csi/pkg/utils" + "sds-local-volume-csi/pkg/logger" + "sds-local-volume-csi/pkg/utils" "sync" "time" @@ -40,7 +40,7 @@ import ( const ( // DefaultDriverName defines the name that is used in Kubernetes and the CSI // system for the canonical, official name of this plugin - DefaultDriverName = "lvm.csi.storage.deckhouse.io" + DefaultDriverName = "local.csi.storage.deckhouse.io" // DefaultAddress is the default address that the csi plugin will serve its // http handler on. DefaultAddress = "127.0.0.1:12302" diff --git a/images/sds-lvm-csi/driver/health.go b/images/sds-local-volume-csi/driver/health.go similarity index 100% rename from images/sds-lvm-csi/driver/health.go rename to images/sds-local-volume-csi/driver/health.go diff --git a/images/sds-lvm-csi/driver/identity.go b/images/sds-local-volume-csi/driver/identity.go similarity index 100% rename from images/sds-lvm-csi/driver/identity.go rename to images/sds-local-volume-csi/driver/identity.go diff --git a/images/sds-lvm-csi/driver/node.go b/images/sds-local-volume-csi/driver/node.go similarity index 99% rename from images/sds-lvm-csi/driver/node.go rename to images/sds-local-volume-csi/driver/node.go index 04320496..aa1dd17d 100644 --- a/images/sds-lvm-csi/driver/node.go +++ b/images/sds-local-volume-csi/driver/node.go @@ -19,7 +19,7 @@ package driver import ( "context" "fmt" - "sds-lvm-csi/internal" + "sds-local-volume-csi/internal" "github.com/container-storage-interface/spec/lib/go/csi" "google.golang.org/grpc/codes" diff --git a/images/sds-lvm-csi/go.mod b/images/sds-local-volume-csi/go.mod similarity index 98% rename from images/sds-lvm-csi/go.mod rename to images/sds-local-volume-csi/go.mod index 94f6aee6..1df6e911 100644 --- a/images/sds-lvm-csi/go.mod +++ b/images/sds-local-volume-csi/go.mod @@ -1,4 +1,4 @@ -module sds-lvm-csi +module sds-local-volume-csi go 1.21 diff --git a/images/sds-lvm-csi/go.sum b/images/sds-local-volume-csi/go.sum similarity index 100% rename from images/sds-lvm-csi/go.sum rename to images/sds-local-volume-csi/go.sum diff --git a/images/sds-lvm-csi/internal/const.go b/images/sds-local-volume-csi/internal/const.go similarity index 75% rename from images/sds-lvm-csi/internal/const.go rename to images/sds-local-volume-csi/internal/const.go index ea549009..73248269 100644 --- a/images/sds-lvm-csi/internal/const.go +++ b/images/sds-local-volume-csi/internal/const.go @@ -17,10 +17,10 @@ limitations under the License. package internal const ( - LvmTypeKey = "lvm.csi.storage.deckhouse.io/lvm-type" - LvmBindingModeKey = "lvm.csi.storage.deckhouse.io/volume-binding-mode" - LvmVolumeGroupKey = "lvm.csi.storage.deckhouse.io/lvm-volume-groups" - TopologyKey = "topology.sds-lvm-csi/node" + LvmTypeKey = "local.csi.storage.deckhouse.io/lvm-type" + BindingModeKey = "local.csi.storage.deckhouse.io/volume-binding-mode" + LvmVolumeGroupKey = "local.csi.storage.deckhouse.io/lvm-volume-groups" + TopologyKey = "topology.sds-local-volume-csi/node" SubPath = "subPath" VGNameKey = "vgname" LLMTypeThin = "Thin" diff --git a/images/sds-lvm-csi/pkg/kubutils/kubernetes.go b/images/sds-local-volume-csi/pkg/kubutils/kubernetes.go similarity index 100% rename from images/sds-lvm-csi/pkg/kubutils/kubernetes.go rename to images/sds-local-volume-csi/pkg/kubutils/kubernetes.go diff --git a/images/sds-lvm-csi/pkg/logger/logger.go b/images/sds-local-volume-csi/pkg/logger/logger.go similarity index 100% rename from images/sds-lvm-csi/pkg/logger/logger.go rename to images/sds-local-volume-csi/pkg/logger/logger.go diff --git a/images/sds-lvm-csi/pkg/utils/func.go b/images/sds-local-volume-csi/pkg/utils/func.go similarity index 99% rename from images/sds-lvm-csi/pkg/utils/func.go rename to images/sds-local-volume-csi/pkg/utils/func.go index 38eae5ed..c23185e1 100644 --- a/images/sds-lvm-csi/pkg/utils/func.go +++ b/images/sds-local-volume-csi/pkg/utils/func.go @@ -21,9 +21,9 @@ import ( "errors" "fmt" "math" - "sds-lvm-csi/api/v1alpha1" - "sds-lvm-csi/internal" - "sds-lvm-csi/pkg/logger" + "sds-local-volume-csi/api/v1alpha1" + "sds-local-volume-csi/internal" + "sds-local-volume-csi/pkg/logger" "time" "gopkg.in/yaml.v2" diff --git a/images/sds-lvm-csi/pkg/utils/type.go b/images/sds-local-volume-csi/pkg/utils/type.go similarity index 100% rename from images/sds-lvm-csi/pkg/utils/type.go rename to images/sds-local-volume-csi/pkg/utils/type.go diff --git a/images/sds-lvm-csi/pkg/utils/volume.go b/images/sds-local-volume-csi/pkg/utils/volume.go similarity index 99% rename from images/sds-lvm-csi/pkg/utils/volume.go rename to images/sds-local-volume-csi/pkg/utils/volume.go index a64f4c65..c4dec3e8 100644 --- a/images/sds-lvm-csi/pkg/utils/volume.go +++ b/images/sds-local-volume-csi/pkg/utils/volume.go @@ -19,7 +19,7 @@ package utils import ( "fmt" "os" - "sds-lvm-csi/pkg/logger" + "sds-local-volume-csi/pkg/logger" "time" mu "k8s.io/mount-utils" diff --git a/images/sds-lvm-scheduler-extender/Dockerfile b/images/sds-local-volume-scheduler-extender/Dockerfile similarity index 61% rename from images/sds-lvm-scheduler-extender/Dockerfile rename to images/sds-local-volume-scheduler-extender/Dockerfile index 384ea154..256a9c3f 100644 --- a/images/sds-lvm-scheduler-extender/Dockerfile +++ b/images/sds-local-volume-scheduler-extender/Dockerfile @@ -13,9 +13,9 @@ RUN go mod download COPY . . WORKDIR /go/src/cmd -RUN GOOS=linux GOARCH=amd64 go build -o sds-lvm-scheduler-extender +RUN GOOS=linux GOARCH=amd64 go build -o sds-local-volume-scheduler-extender FROM --platform=linux/amd64 $BASE_GOLANG_20_ALPINE -COPY --from=builder /go/src/cmd/sds-lvm-scheduler-extender /go/src/cmd/sds-lvm-scheduler-extender +COPY --from=builder /go/src/cmd/sds-local-volume-scheduler-extender /go/src/cmd/sds-local-volume-scheduler-extender -ENTRYPOINT ["/go/src/cmd/sds-lvm-scheduler-extender"] +ENTRYPOINT ["/go/src/cmd/sds-local-volume-scheduler-extender"] diff --git a/images/sds-lvm-scheduler-extender/api/v1alpha1/lvm_volume_group.go b/images/sds-local-volume-scheduler-extender/api/v1alpha1/lvm_volume_group.go similarity index 100% rename from images/sds-lvm-scheduler-extender/api/v1alpha1/lvm_volume_group.go rename to images/sds-local-volume-scheduler-extender/api/v1alpha1/lvm_volume_group.go diff --git a/images/sds-lvm-scheduler-extender/api/v1alpha1/register.go b/images/sds-local-volume-scheduler-extender/api/v1alpha1/register.go similarity index 100% rename from images/sds-lvm-scheduler-extender/api/v1alpha1/register.go rename to images/sds-local-volume-scheduler-extender/api/v1alpha1/register.go diff --git a/images/sds-lvm-scheduler-extender/api/v1alpha1/zz_generated.deepcopy.go b/images/sds-local-volume-scheduler-extender/api/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from images/sds-lvm-scheduler-extender/api/v1alpha1/zz_generated.deepcopy.go rename to images/sds-local-volume-scheduler-extender/api/v1alpha1/zz_generated.deepcopy.go diff --git a/images/sds-lvm-scheduler-extender/cmd/cmd/access_log.go b/images/sds-local-volume-scheduler-extender/cmd/cmd/access_log.go similarity index 100% rename from images/sds-lvm-scheduler-extender/cmd/cmd/access_log.go rename to images/sds-local-volume-scheduler-extender/cmd/cmd/access_log.go diff --git a/images/sds-lvm-scheduler-extender/cmd/cmd/access_log_test.go b/images/sds-local-volume-scheduler-extender/cmd/cmd/access_log_test.go similarity index 100% rename from images/sds-lvm-scheduler-extender/cmd/cmd/access_log_test.go rename to images/sds-local-volume-scheduler-extender/cmd/cmd/access_log_test.go diff --git a/images/sds-lvm-scheduler-extender/cmd/cmd/root.go b/images/sds-local-volume-scheduler-extender/cmd/cmd/root.go similarity index 92% rename from images/sds-lvm-scheduler-extender/cmd/cmd/root.go rename to images/sds-local-volume-scheduler-extender/cmd/cmd/root.go index dd5efd35..4aa2e69b 100644 --- a/images/sds-lvm-scheduler-extender/cmd/cmd/root.go +++ b/images/sds-local-volume-scheduler-extender/cmd/cmd/root.go @@ -23,10 +23,10 @@ import ( "net/http" "os" "os/signal" - "sds-lvm-scheduler-extender/api/v1alpha1" - "sds-lvm-scheduler-extender/pkg/kubutils" - "sds-lvm-scheduler-extender/pkg/logger" - "sds-lvm-scheduler-extender/pkg/scheduler" + "sds-local-volume-scheduler-extender/api/v1alpha1" + "sds-local-volume-scheduler-extender/pkg/kubutils" + "sds-local-volume-scheduler-extender/pkg/logger" + "sds-local-volume-scheduler-extender/pkg/scheduler" "sync" "syscall" "time" @@ -68,10 +68,10 @@ var config = &Config{ } var rootCmd = &cobra.Command{ - Use: "sds-lvm-scheduler", + Use: "sds-local-volume-scheduler", Version: "development", - Short: "a scheduler-extender for SDS-LVM", - Long: `A scheduler-extender for SDS-LVM. + Short: "a scheduler-extender for sds-local-volume", + Long: `A scheduler-extender for sds-local-volume. The extender implements filter and prioritize verbs. The filter verb is "filter" and served at "/filter" via HTTP. It filters out nodes that have less storage capacity than requested. diff --git a/images/sds-lvm-scheduler-extender/cmd/main.go b/images/sds-local-volume-scheduler-extender/cmd/main.go similarity index 91% rename from images/sds-lvm-scheduler-extender/cmd/main.go rename to images/sds-local-volume-scheduler-extender/cmd/main.go index 8a3b0cac..cd9cb8db 100644 --- a/images/sds-lvm-scheduler-extender/cmd/main.go +++ b/images/sds-local-volume-scheduler-extender/cmd/main.go @@ -16,7 +16,7 @@ limitations under the License. package main -import "sds-lvm-scheduler-extender/cmd/cmd" +import "sds-local-volume-scheduler-extender/cmd/cmd" func main() { cmd.Execute() diff --git a/images/sds-lvm-scheduler-extender/config/config.go b/images/sds-local-volume-scheduler-extender/config/config.go similarity index 95% rename from images/sds-lvm-scheduler-extender/config/config.go rename to images/sds-local-volume-scheduler-extender/config/config.go index 662de7e2..53fff5b4 100644 --- a/images/sds-lvm-scheduler-extender/config/config.go +++ b/images/sds-local-volume-scheduler-extender/config/config.go @@ -15,7 +15,7 @@ package config import ( "os" - "sds-lvm-scheduler-extender/pkg/logger" + "sds-local-volume-scheduler-extender/pkg/logger" ) const ( diff --git a/images/sds-lvm-scheduler-extender/go.mod b/images/sds-local-volume-scheduler-extender/go.mod similarity index 98% rename from images/sds-lvm-scheduler-extender/go.mod rename to images/sds-local-volume-scheduler-extender/go.mod index b08262b1..b883a5cf 100644 --- a/images/sds-lvm-scheduler-extender/go.mod +++ b/images/sds-local-volume-scheduler-extender/go.mod @@ -1,4 +1,4 @@ -module sds-lvm-scheduler-extender +module sds-local-volume-scheduler-extender go 1.21 diff --git a/images/sds-lvm-scheduler-extender/go.sum b/images/sds-local-volume-scheduler-extender/go.sum similarity index 100% rename from images/sds-lvm-scheduler-extender/go.sum rename to images/sds-local-volume-scheduler-extender/go.sum diff --git a/images/sds-lvm-scheduler-extender/pkg/kubutils/kubernetes.go b/images/sds-local-volume-scheduler-extender/pkg/kubutils/kubernetes.go similarity index 100% rename from images/sds-lvm-scheduler-extender/pkg/kubutils/kubernetes.go rename to images/sds-local-volume-scheduler-extender/pkg/kubutils/kubernetes.go diff --git a/images/sds-lvm-scheduler-extender/pkg/logger/logger.go b/images/sds-local-volume-scheduler-extender/pkg/logger/logger.go similarity index 100% rename from images/sds-lvm-scheduler-extender/pkg/logger/logger.go rename to images/sds-local-volume-scheduler-extender/pkg/logger/logger.go diff --git a/images/sds-lvm-scheduler-extender/pkg/scheduler/api.go b/images/sds-local-volume-scheduler-extender/pkg/scheduler/api.go similarity index 100% rename from images/sds-lvm-scheduler-extender/pkg/scheduler/api.go rename to images/sds-local-volume-scheduler-extender/pkg/scheduler/api.go diff --git a/images/sds-lvm-scheduler-extender/pkg/scheduler/filter.go b/images/sds-local-volume-scheduler-extender/pkg/scheduler/filter.go similarity index 98% rename from images/sds-lvm-scheduler-extender/pkg/scheduler/filter.go rename to images/sds-local-volume-scheduler-extender/pkg/scheduler/filter.go index b8811529..f60aeac4 100644 --- a/images/sds-lvm-scheduler-extender/pkg/scheduler/filter.go +++ b/images/sds-local-volume-scheduler-extender/pkg/scheduler/filter.go @@ -22,8 +22,8 @@ import ( "errors" "fmt" "net/http" - "sds-lvm-scheduler-extender/api/v1alpha1" - "sds-lvm-scheduler-extender/pkg/logger" + "sds-local-volume-scheduler-extender/api/v1alpha1" + "sds-local-volume-scheduler-extender/pkg/logger" "sync" corev1 "k8s.io/api/core/v1" @@ -34,8 +34,8 @@ import ( ) const ( - lvmTypeParamKey = "lvm.csi.storage.deckhouse.io/lvm-type" - lvmVolumeGroupsParamKey = "lvm.csi.storage.deckhouse.io/lvm-volume-groups" + lvmTypeParamKey = "local.csi.storage.deckhouse.io/lvm-type" + lvmVolumeGroupsParamKey = "local.csi.storage.deckhouse.io/lvm-volume-groups" thick = "Thick" thin = "Thin" diff --git a/images/sds-lvm-scheduler-extender/pkg/scheduler/filter_test.go b/images/sds-local-volume-scheduler-extender/pkg/scheduler/filter_test.go similarity index 100% rename from images/sds-lvm-scheduler-extender/pkg/scheduler/filter_test.go rename to images/sds-local-volume-scheduler-extender/pkg/scheduler/filter_test.go diff --git a/images/sds-lvm-scheduler-extender/pkg/scheduler/prioritize.go b/images/sds-local-volume-scheduler-extender/pkg/scheduler/prioritize.go similarity index 99% rename from images/sds-lvm-scheduler-extender/pkg/scheduler/prioritize.go rename to images/sds-local-volume-scheduler-extender/pkg/scheduler/prioritize.go index 031e07a8..aea67959 100644 --- a/images/sds-lvm-scheduler-extender/pkg/scheduler/prioritize.go +++ b/images/sds-local-volume-scheduler-extender/pkg/scheduler/prioritize.go @@ -23,7 +23,7 @@ import ( "fmt" "math" "net/http" - "sds-lvm-scheduler-extender/pkg/logger" + "sds-local-volume-scheduler-extender/pkg/logger" "sync" corev1 "k8s.io/api/core/v1" diff --git a/images/sds-lvm-scheduler-extender/pkg/scheduler/prioritize_test.go b/images/sds-local-volume-scheduler-extender/pkg/scheduler/prioritize_test.go similarity index 100% rename from images/sds-lvm-scheduler-extender/pkg/scheduler/prioritize_test.go rename to images/sds-local-volume-scheduler-extender/pkg/scheduler/prioritize_test.go diff --git a/images/sds-lvm-scheduler-extender/pkg/scheduler/route.go b/images/sds-local-volume-scheduler-extender/pkg/scheduler/route.go similarity index 97% rename from images/sds-lvm-scheduler-extender/pkg/scheduler/route.go rename to images/sds-local-volume-scheduler-extender/pkg/scheduler/route.go index 11494907..4176a928 100644 --- a/images/sds-lvm-scheduler-extender/pkg/scheduler/route.go +++ b/images/sds-local-volume-scheduler-extender/pkg/scheduler/route.go @@ -20,7 +20,7 @@ import ( "context" "fmt" "net/http" - "sds-lvm-scheduler-extender/pkg/logger" + "sds-local-volume-scheduler-extender/pkg/logger" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/images/sds-lvm-scheduler-extender/pkg/scheduler/route_test.go b/images/sds-local-volume-scheduler-extender/pkg/scheduler/route_test.go similarity index 100% rename from images/sds-lvm-scheduler-extender/pkg/scheduler/route_test.go rename to images/sds-local-volume-scheduler-extender/pkg/scheduler/route_test.go diff --git a/images/webhooks/src/validators/podSchedulerMutation.go b/images/webhooks/src/validators/podSchedulerMutation.go index ed34fafe..ce2b855f 100644 --- a/images/webhooks/src/validators/podSchedulerMutation.go +++ b/images/webhooks/src/validators/podSchedulerMutation.go @@ -30,8 +30,8 @@ import ( const ( annBetaStorageProvisioner = "volume.beta.kubernetes.io/storage-provisioner" annStorageProvisioner = "volume.kubernetes.io/storage-provisioner" - csiEndpoint = "lvm.csi.storage.deckhouse.io" - schedulerName = "sds-lvm" + csiEndpoint = "local.csi.storage.deckhouse.io" + schedulerName = "sds-local-volume" ) func PodSchedulerMutation(ctx context.Context, _ *model.AdmissionReview, obj metav1.Object) (*kwhmutating.MutatorResult, error) { diff --git a/module.yaml b/module.yaml index 036e9780..087d49b9 100644 --- a/module.yaml +++ b/module.yaml @@ -1,2 +1,2 @@ weight: 920 -description: "Local LVM provisioner" +description: "SDS local volume" diff --git a/templates/registry-secret.yaml b/templates/registry-secret.yaml index 655fe216..500f1b36 100644 --- a/templates/registry-secret.yaml +++ b/templates/registry-secret.yaml @@ -7,8 +7,8 @@ metadata: {{- include "helm_lib_module_labels" (list .) | nindent 2 }} type: kubernetes.io/dockerconfigjson data: -{{- if dig "registry" "dockercfg" false .Values.sdsLvm }} - .dockerconfigjson: {{ .Values.sdsLvm.registry.dockercfg }} +{{- if dig "registry" "dockercfg" false .Values.sdsLocalVolume }} + .dockerconfigjson: {{ .Values.sdsLocalVolume.registry.dockercfg }} {{- else }} .dockerconfigjson: "eyJhdXRocyI6IHsgInJlZ2lzdHJ5LmRlY2tob3VzZS5pbyI6IHt9fX0=" {{- end }} diff --git a/templates/sds-lvm-controller/deployment.yaml b/templates/sds-local-volume-controller/deployment.yaml similarity index 74% rename from templates/sds-lvm-controller/deployment.yaml rename to templates/sds-local-volume-controller/deployment.yaml index 3ae442e0..4c711e7a 100644 --- a/templates/sds-lvm-controller/deployment.yaml +++ b/templates/sds-local-volume-controller/deployment.yaml @@ -8,19 +8,19 @@ memory: 25Mi apiVersion: autoscaling.k8s.io/v1 kind: VerticalPodAutoscaler metadata: - name: sds-lvm-controller + name: sds-local-volume-controller namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-controller")) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-controller")) | nindent 2 }} spec: targetRef: apiVersion: "apps/v1" kind: Deployment - name: sds-lvm-controller + name: sds-local-volume-controller updatePolicy: updateMode: "Auto" resourcePolicy: containerPolicies: - - containerName: "sds-lvm-controller" + - containerName: "sds-local-volume-controller" minAllowed: {{- include "sds_lvm_controller_resources" . | nindent 8 }} maxAllowed: @@ -31,31 +31,31 @@ spec: apiVersion: policy/v1 kind: PodDisruptionBudget metadata: - name: sds-lvm-controller + name: sds-local-volume-controller namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-controller" )) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-controller" )) | nindent 2 }} spec: minAvailable: {{ include "helm_lib_is_ha_to_value" (list . 1 0) }} selector: matchLabels: - app: sds-lvm-controller + app: sds-local-volume-controller --- apiVersion: apps/v1 kind: Deployment metadata: - name: sds-lvm-controller + name: sds-local-volume-controller namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-controller")) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-controller")) | nindent 2 }} spec: {{- include "helm_lib_deployment_on_master_strategy_and_replicas_for_ha" . | nindent 2 }} revisionHistoryLimit: 2 selector: matchLabels: - app: sds-lvm-controller + app: sds-local-volume-controller template: metadata: labels: - app: sds-lvm-controller + app: sds-local-volume-controller spec: {{- include "helm_lib_priority_class" (tuple . "cluster-medium") | nindent 6 }} {{- include "helm_lib_node_selector" (tuple . "system") | nindent 6 }} @@ -63,10 +63,10 @@ spec: {{- include "helm_lib_module_pod_security_context_run_as_user_nobody" . | nindent 6 }} imagePullSecrets: - name: {{ .Chart.Name }}-module-registry - serviceAccountName: sds-lvm-controller + serviceAccountName: sds-local-volume-controller containers: - - name: sds-lvm-controller - image: {{ include "helm_lib_module_image" (list . "sdsLvmController") }} + - name: sds-local-volume-controller + image: {{ include "helm_lib_module_image" (list . "sdsLocalVolumeController") }} imagePullPolicy: IfNotPresent resources: requests: @@ -81,15 +81,15 @@ spec: type: spc_t env: - name: LOG_LEVEL -{{- if eq .Values.sdsLvm.logLevel "ERROR" }} +{{- if eq .Values.sdsLocalVolume.logLevel "ERROR" }} value: "0" -{{- else if eq .Values.sdsLvm.logLevel "WARN" }} +{{- else if eq .Values.sdsLocalVolume.logLevel "WARN" }} value: "1" -{{- else if eq .Values.sdsLvm.logLevel "INFO" }} +{{- else if eq .Values.sdsLocalVolume.logLevel "INFO" }} value: "2" -{{- else if eq .Values.sdsLvm.logLevel "DEBUG" }} +{{- else if eq .Values.sdsLocalVolume.logLevel "DEBUG" }} value: "3" -{{- else if eq .Values.sdsLvm.logLevel "TRACE" }} +{{- else if eq .Values.sdsLocalVolume.logLevel "TRACE" }} value: "4" {{- end }} - name: CONTROLLER_NAMESPACE diff --git a/templates/sds-lvm-controller/rbac-for-us.yaml b/templates/sds-local-volume-controller/rbac-for-us.yaml similarity index 76% rename from templates/sds-lvm-controller/rbac-for-us.yaml rename to templates/sds-local-volume-controller/rbac-for-us.yaml index a2473a1f..443c18a3 100644 --- a/templates/sds-lvm-controller/rbac-for-us.yaml +++ b/templates/sds-local-volume-controller/rbac-for-us.yaml @@ -2,17 +2,17 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: sds-lvm-controller + name: sds-local-volume-controller namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-controller")) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-controller")) | nindent 2 }} --- kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: sds-lvm-controller + name: sds-local-volume-controller namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-controller")) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-controller")) | nindent 2 }} rules: - apiGroups: - "" @@ -47,8 +47,8 @@ rules: kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: d8:{{ .Chart.Name }}:sds-lvm-controller - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-controller")) | nindent 2 }} + name: d8:{{ .Chart.Name }}:sds-local-volume-controller + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-controller")) | nindent 2 }} rules: - apiGroups: - "" @@ -71,7 +71,7 @@ rules: - apiGroups: - storage.deckhouse.io resources: - - lvmstorageclasses + - localstorageclasses - lvmvolumegroups verbs: - get @@ -95,16 +95,16 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: sds-lvm-controller + name: sds-local-volume-controller namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-controller")) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-controller")) | nindent 2 }} subjects: - kind: ServiceAccount - name: sds-lvm-controller + name: sds-local-volume-controller namespace: d8-{{ .Chart.Name }} roleRef: kind: Role - name: sds-lvm-controller + name: sds-local-volume-controller apiGroup: rbac.authorization.k8s.io @@ -112,15 +112,15 @@ roleRef: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: d8:{{ .Chart.Name }}:sds-lvm-controller - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-controller")) | nindent 2 }} + name: d8:{{ .Chart.Name }}:sds-local-volume-controller + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-controller")) | nindent 2 }} subjects: - kind: ServiceAccount - name: sds-lvm-controller + name: sds-local-volume-controller namespace: d8-{{ .Chart.Name }} roleRef: kind: ClusterRole - name: d8:{{ .Chart.Name }}:sds-lvm-controller + name: d8:{{ .Chart.Name }}:sds-local-volume-controller apiGroup: rbac.authorization.k8s.io diff --git a/templates/sds-lvm-csi/controller.yaml b/templates/sds-local-volume-csi/controller.yaml similarity index 91% rename from templates/sds-lvm-csi/controller.yaml rename to templates/sds-local-volume-csi/controller.yaml index 58887142..c91e785b 100644 --- a/templates/sds-lvm-csi/controller.yaml +++ b/templates/sds-local-volume-csi/controller.yaml @@ -39,14 +39,14 @@ memory: 25Mi apiVersion: autoscaling.k8s.io/v1 kind: VerticalPodAutoscaler metadata: - name: sds-lvm-csi-controller + name: sds-local-volume-csi-controller namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-csi-controller")) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-csi-controller")) | nindent 2 }} spec: targetRef: apiVersion: "apps/v1" kind: Deployment - name: sds-lvm-csi-controller + name: sds-local-volume-csi-controller updatePolicy: updateMode: "Auto" resourcePolicy: @@ -69,7 +69,7 @@ spec: maxAllowed: cpu: 20m memory: 50Mi - - containerName: sds-lvm-csi-plugin + - containerName: sds-local-volume-csi-plugin minAllowed: {{- include "sds_lvm_csi_plugin_resources" . | nindent 8 }} maxAllowed: @@ -91,19 +91,19 @@ spec: apiVersion: autoscaling.k8s.io/v1 kind: VerticalPodAutoscaler metadata: - name: sds-lvm-csi-node + name: sds-local-volume-csi-node namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-csi-node" "workload-resource-policy.deckhouse.io" "every-node")) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-csi-node" "workload-resource-policy.deckhouse.io" "every-node")) | nindent 2 }} spec: targetRef: apiVersion: "apps/v1" kind: DaemonSet - name: sds-lvm-csi-node + name: sds-local-volume-csi-node updatePolicy: updateMode: "Auto" resourcePolicy: containerPolicies: - - containerName: sds-lvm-csi-plugin + - containerName: sds-local-volume-csi-plugin minAllowed: {{- include "sds_lvm_csi_plugin_resources" . | nindent 8 }} maxAllowed: @@ -126,31 +126,31 @@ spec: apiVersion: policy/v1 kind: PodDisruptionBudget metadata: - name: sds-lvm-csi-controller + name: sds-local-volume-csi-controller namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-csi-controller")) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-csi-controller")) | nindent 2 }} spec: minAvailable: {{ include "helm_lib_is_ha_to_value" (list . 1 0) }} selector: matchLabels: - app: sds-lvm-csi-controller + app: sds-local-volume-csi-controller --- apiVersion: apps/v1 kind: DaemonSet metadata: - name: sds-lvm-csi-node + name: sds-local-volume-csi-node namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-csi-node")) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-csi-node")) | nindent 2 }} spec: revisionHistoryLimit: 2 selector: matchLabels: - app: sds-lvm-csi-node + app: sds-local-volume-csi-node template: metadata: labels: - app: sds-lvm-csi-node - name: sds-lvm-csi-node + app: sds-local-volume-csi-node + name: sds-local-volume-csi-node namespace: d8-{{ .Chart.Name }} spec: {{- include "helm_lib_tolerations" (tuple . "any-node" "storage-problems") | nindent 6 }} @@ -166,7 +166,7 @@ spec: - name: CSI_ENDPOINT value: /csi/csi.sock - name: DRIVER_REG_SOCK_PATH - value: /var/lib/kubelet/plugins/lvm.csi.storage.deckhouse.io/csi.sock + value: /var/lib/kubelet/plugins/local.csi.storage.deckhouse.io/csi.sock - name: KUBE_NODE_NAME valueFrom: fieldRef: @@ -180,7 +180,7 @@ spec: command: - /bin/sh - -c - - rm -rf /registration/lvm.csi.storage.deckhouse.io /registration/lvm.csi.storage.deckhouse.io-reg.sock + - rm -rf /registration/local.csi.storage.deckhouse.io /registration/local.csi.storage.deckhouse.io-reg.sock name: csi-node-driver-registrar resources: requests: @@ -227,13 +227,13 @@ spec: - name: CSI_ENDPOINT value: /csi/csi.sock - name: DRIVER_REG_SOCK_PATH - value: /var/lib/kubelet/plugins/lvm.csi.storage.deckhouse.io/csi.sock + value: /var/lib/kubelet/plugins/local.csi.storage.deckhouse.io/csi.sock - name: KUBE_NODE_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: {{ include "helm_lib_module_image" (list . "sdsLvmCsi") }} + image: {{ include "helm_lib_module_image" (list . "sdsLocalVolumeCsi") }} imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 @@ -244,7 +244,7 @@ spec: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 1 - name: sds-lvm-csi-plugin + name: sds-local-volume-csi-plugin ports: - containerPort: 9808 name: healthz @@ -284,7 +284,7 @@ spec: type: "" name: device-dir - hostPath: - path: /var/lib/kubelet/plugins/lvm.csi.storage.deckhouse.io + path: /var/lib/kubelet/plugins/local.csi.storage.deckhouse.io type: DirectoryOrCreate name: plugin-dir - hostPath: @@ -304,16 +304,16 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: sds-lvm-csi-controller + name: sds-local-volume-csi-controller namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-csi-controller" "workload-resource-policy.deckhouse.io" "system")) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-csi-controller" "workload-resource-policy.deckhouse.io" "system")) | nindent 2 }} spec: progressDeadlineSeconds: 600 replicas: {{ include "helm_lib_is_ha_to_value" (list . 2 1) }} revisionHistoryLimit: 2 selector: matchLabels: - app: sds-lvm-csi-controller + app: sds-local-volume-csi-controller strategy: type: RollingUpdate {{- if (include "helm_lib_ha_enabled" .) }} @@ -324,8 +324,8 @@ spec: template: metadata: labels: - app: sds-lvm-csi-controller - name: sds-lvm-csi-controller + app: sds-local-volume-csi-controller + name: sds-local-volume-csi-controller namespace: d8-{{ .Chart.Name }} spec: {{- include "helm_lib_priority_class" (tuple . "cluster-medium") | nindent 6 }} @@ -346,7 +346,7 @@ spec: {{- else }} nodeAffinity: {} {{- end }} -{{- with (index (fromYaml (include "helm_lib_pod_anti_affinity_for_ha" (list . (dict "app" "sds-lvm-csi-controller")))) "affinity") }} +{{- with (index (fromYaml (include "helm_lib_pod_anti_affinity_for_ha" (list . (dict "app" "sds-local-volume-csi-controller")))) "affinity") }} {{ toYaml . | nindent 8 }} {{- else }} podAntiAffinity: {} @@ -511,7 +511,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: {{ include "helm_lib_module_image" (list . "sdsLvmCsi") }} + image: {{ include "helm_lib_module_image" (list . "sdsLocalVolumeCsi") }} imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 @@ -522,7 +522,7 @@ spec: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 1 - name: sds-lvm-csi-plugin + name: sds-local-volume-csi-plugin ports: - containerPort: 9808 name: healthz diff --git a/templates/sds-lvm-csi/csidriver.yaml b/templates/sds-local-volume-csi/csidriver.yaml similarity index 73% rename from templates/sds-lvm-csi/csidriver.yaml rename to templates/sds-local-volume-csi/csidriver.yaml index e1b9b9a0..9cd93bfe 100644 --- a/templates/sds-lvm-csi/csidriver.yaml +++ b/templates/sds-local-volume-csi/csidriver.yaml @@ -1,7 +1,7 @@ apiVersion: storage.k8s.io/v1 kind: CSIDriver metadata: - name: lvm.csi.storage.deckhouse.io + name: local.csi.storage.deckhouse.io spec: attachRequired: true podInfoOnMount: false diff --git a/templates/sds-lvm-csi/rbac-for-us.yaml b/templates/sds-local-volume-csi/rbac-for-us.yaml similarity index 71% rename from templates/sds-lvm-csi/rbac-for-us.yaml rename to templates/sds-local-volume-csi/rbac-for-us.yaml index f09a4e66..7ac8f8d9 100644 --- a/templates/sds-lvm-csi/rbac-for-us.yaml +++ b/templates/sds-local-volume-csi/rbac-for-us.yaml @@ -4,8 +4,8 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: d8:{{ .Chart.Name }}:sds-lvm-csi-controller - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-csi-controller")) | nindent 2 }} + name: d8:{{ .Chart.Name }}:sds-local-volume-csi-controller + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-csi-controller")) | nindent 2 }} rules: - apiGroups: - storage.deckhouse.io @@ -24,14 +24,14 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: d8:{{ .Chart.Name }}:sds-lvm-csi-controller - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-csi-controller")) | nindent 2 }} + name: d8:{{ .Chart.Name }}:sds-local-volume-csi-controller + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-csi-controller")) | nindent 2 }} subjects: - kind: ServiceAccount name: csi namespace: d8-{{ .Chart.Name }} roleRef: kind: ClusterRole - name: d8:{{ .Chart.Name }}:sds-lvm-csi-controller + name: d8:{{ .Chart.Name }}:sds-local-volume-csi-controller apiGroup: rbac.authorization.k8s.io diff --git a/templates/sds-lvm-scheduler/configmap.yaml b/templates/sds-local-volume-scheduler-extender/configmap.yaml similarity index 91% rename from templates/sds-lvm-scheduler/configmap.yaml rename to templates/sds-local-volume-scheduler-extender/configmap.yaml index 6bfa6e97..f3ab88df 100644 --- a/templates/sds-lvm-scheduler/configmap.yaml +++ b/templates/sds-local-volume-scheduler-extender/configmap.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: ConfigMap metadata: - name: sds-lvm-scheduler + name: sds-local-volume-scheduler namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-scheduler")) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-scheduler")) | nindent 2 }} data: scheduler-extender-config.yaml: |- listen: "localhost:8099" @@ -19,7 +19,7 @@ data: {{- end }} kind: KubeSchedulerConfiguration profiles: - - schedulerName: sds-lvm + - schedulerName: sds-local-volume extenders: - urlPrefix: http://localhost:8099 filterVerb: filter diff --git a/templates/sds-lvm-scheduler/deployment.yaml b/templates/sds-local-volume-scheduler-extender/deployment.yaml similarity index 82% rename from templates/sds-lvm-scheduler/deployment.yaml rename to templates/sds-local-volume-scheduler-extender/deployment.yaml index 49b7b0df..5e75ad56 100644 --- a/templates/sds-lvm-scheduler/deployment.yaml +++ b/templates/sds-local-volume-scheduler-extender/deployment.yaml @@ -14,14 +14,14 @@ memory: 25Mi apiVersion: autoscaling.k8s.io/v1 kind: VerticalPodAutoscaler metadata: - name: sds-lvm-scheduler + name: sds-local-volume-scheduler namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-scheduler")) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-scheduler")) | nindent 2 }} spec: targetRef: apiVersion: "apps/v1" kind: Deployment - name: sds-lvm-scheduler + name: sds-local-volume-scheduler updatePolicy: updateMode: "Auto" resourcePolicy: @@ -32,7 +32,7 @@ spec: maxAllowed: memory: 60Mi cpu: 20m - - containerName: sds-lvm-scheduler-extender + - containerName: sds-local-volume-scheduler-extender minAllowed: {{- include "sds_lvm_scheduler_extender_resources" . | nindent 8 }} maxAllowed: @@ -43,37 +43,37 @@ spec: apiVersion: policy/v1 kind: PodDisruptionBudget metadata: - name: sds-lvm-scheduler + name: sds-local-volume-scheduler namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-scheduler" )) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-scheduler" )) | nindent 2 }} spec: minAvailable: {{ include "helm_lib_is_ha_to_value" (list . 1 0) }} selector: matchLabels: - app: sds-lvm-scheduler + app: sds-local-volume-scheduler --- apiVersion: apps/v1 kind: Deployment metadata: - name: sds-lvm-scheduler + name: sds-local-volume-scheduler namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-scheduler" )) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-scheduler" )) | nindent 2 }} spec: {{- include "helm_lib_deployment_strategy_and_replicas_for_ha" . | nindent 2 }} revisionHistoryLimit: 2 selector: matchLabels: - app: sds-lvm-scheduler + app: sds-local-volume-scheduler template: metadata: labels: - app: sds-lvm-scheduler + app: sds-local-volume-scheduler spec: {{- include "helm_lib_priority_class" (tuple . "system-cluster-critical") | nindent 6 }} {{- include "helm_lib_node_selector" (tuple . "system") | nindent 6 }} {{- include "helm_lib_tolerations" (tuple . "system") | nindent 6 }} {{- include "helm_lib_module_pod_security_context_run_as_user_nobody" . | nindent 6 }} - {{- include "helm_lib_pod_anti_affinity_for_ha" (list . (dict "app" "sds-lvm-scheduler")) | nindent 6 }} + {{- include "helm_lib_pod_anti_affinity_for_ha" (list . (dict "app" "sds-local-volume-scheduler")) | nindent 6 }} imagePullSecrets: - name: {{ .Chart.Name }}-module-registry containers: @@ -84,12 +84,12 @@ spec: {{- if semverCompare ">= 1.22" .Values.global.discovery.kubernetesVersion }} - --config=/etc/kubernetes/scheduler-config.yaml {{- else }} - - --scheduler-name=sds-lvm - - --policy-configmap=sds-lvm-scheduler + - --scheduler-name=sds-local-volume + - --policy-configmap=sds-local-volume-scheduler - --policy-configmap-namespace=d8-{{ .Chart.Name }} {{- end }} - --leader-elect=true - - --leader-elect-resource-name=sds-lvm-scheduler + - --leader-elect-resource-name=sds-local-volume-scheduler - --leader-elect-resource-namespace=$(NAMESPACE) env: - name: NAMESPACE @@ -130,15 +130,15 @@ spec: {{- if not ( .Values.global.enabledModules | has "vertical-pod-autoscaler-crd") }} {{- include "kube_scheduler_resources" . | nindent 14 }} {{- end }} - - name: sds-lvm-scheduler-extender + - name: sds-local-volume-scheduler-extender {{- include "helm_lib_module_container_security_context_read_only_root_filesystem_capabilities_drop_all" . | nindent 10 }} - image: {{ include "helm_lib_module_image" (list . "sdsLvmSchedulerExtender") }} + image: {{ include "helm_lib_module_image" (list . "sdsLocalVolumeSchedulerExtender") }} imagePullPolicy: IfNotPresent args: - - sds-lvm-scheduler-extender - - --config=/etc/sds-lvm-scheduler-extender/scheduler-extender-config.yaml + - sds-local-volume-scheduler-extender + - --config=/etc/sds-local-volume-scheduler-extender/scheduler-extender-config.yaml volumeMounts: - - mountPath: /etc/sds-lvm-scheduler-extender + - mountPath: /etc/sds-local-volume-scheduler-extender name: scheduler-config resources: requests: @@ -150,7 +150,7 @@ spec: volumes: - configMap: defaultMode: 420 - name: sds-lvm-scheduler + name: sds-local-volume-scheduler name: scheduler-config {{- end }} - serviceAccountName: sds-lvm-scheduler + serviceAccountName: sds-local-volume-scheduler diff --git a/templates/sds-lvm-scheduler/rbac-for-us.yaml b/templates/sds-local-volume-scheduler-extender/rbac-for-us.yaml similarity index 70% rename from templates/sds-lvm-scheduler/rbac-for-us.yaml rename to templates/sds-local-volume-scheduler-extender/rbac-for-us.yaml index 9b3da75e..316b9857 100644 --- a/templates/sds-lvm-scheduler/rbac-for-us.yaml +++ b/templates/sds-local-volume-scheduler-extender/rbac-for-us.yaml @@ -2,44 +2,44 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: sds-lvm-scheduler + name: sds-local-volume-scheduler namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-scheduler")) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-scheduler")) | nindent 2 }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: d8:{{ .Chart.Name }}:sds-lvm-scheduler-kube-scheduler - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-scheduler")) | nindent 2 }} + name: d8:{{ .Chart.Name }}:sds-local-volume-scheduler-kube-scheduler + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-scheduler")) | nindent 2 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole name: system:kube-scheduler subjects: - kind: ServiceAccount - name: sds-lvm-scheduler + name: sds-local-volume-scheduler namespace: d8-{{ .Chart.Name }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: d8:{{ .Chart.Name }}:sds-lvm-scheduler-volume-scheduler - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-scheduler")) | nindent 2 }} + name: d8:{{ .Chart.Name }}:sds-local-volume-scheduler-volume-scheduler + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-scheduler")) | nindent 2 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole name: system:volume-scheduler subjects: - kind: ServiceAccount - name: sds-lvm-scheduler + name: sds-local-volume-scheduler namespace: d8-{{ .Chart.Name }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: sds-lvm-scheduler + name: sds-local-volume-scheduler namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-scheduler")) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-scheduler")) | nindent 2 }} rules: - apiGroups: ["coordination.k8s.io"] resources: ["leases"] @@ -51,29 +51,29 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: sds-lvm-scheduler + name: sds-local-volume-scheduler namespace: d8-{{ .Chart.Name }} - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-scheduler")) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-scheduler")) | nindent 2 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: sds-lvm-scheduler + name: sds-local-volume-scheduler subjects: - kind: ServiceAccount - name: sds-lvm-scheduler + name: sds-local-volume-scheduler namespace: d8-{{ .Chart.Name }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: d8:{{ .Chart.Name }}:sds-lvm-scheduler:extension-apiserver-authentication-reader + name: d8:{{ .Chart.Name }}:sds-local-volume-scheduler:extension-apiserver-authentication-reader namespace: kube-system - {{- include "helm_lib_module_labels" (list . (dict "app" "sds-lvm-scheduler" )) | nindent 2 }} + {{- include "helm_lib_module_labels" (list . (dict "app" "sds-local-volume-scheduler" )) | nindent 2 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role name: extension-apiserver-authentication-reader subjects: - kind: ServiceAccount - name: sds-lvm-scheduler + name: sds-local-volume-scheduler namespace: d8-{{ .Chart.Name }} diff --git a/templates/webhooks/secret.yaml b/templates/webhooks/secret.yaml index 3ee40bc9..81d41327 100644 --- a/templates/webhooks/secret.yaml +++ b/templates/webhooks/secret.yaml @@ -7,6 +7,6 @@ metadata: {{- include "helm_lib_module_labels" (list . (dict "app" "webhooks")) | nindent 2 }} type: kubernetes.io/tls data: - ca.crt: {{ .Values.sdsLvm.internal.customWebhookCert.ca }} - tls.crt: {{ .Values.sdsLvm.internal.customWebhookCert.crt }} - tls.key: {{ .Values.sdsLvm.internal.customWebhookCert.key }} + ca.crt: {{ .Values.sdsLocalVolume.internal.customWebhookCert.ca }} + tls.crt: {{ .Values.sdsLocalVolume.internal.customWebhookCert.crt }} + tls.key: {{ .Values.sdsLocalVolume.internal.customWebhookCert.key }} diff --git a/templates/webhooks/webhook.yaml b/templates/webhooks/webhook.yaml index fb4e5cb5..4738dbed 100644 --- a/templates/webhooks/webhook.yaml +++ b/templates/webhooks/webhook.yaml @@ -24,7 +24,7 @@ webhooks: name: "webhooks" path: "/pod-scheduler-mutation" caBundle: | - {{ .Values.sdsLvm.internal.customWebhookCert.ca }} + {{ .Values.sdsLocalVolume.internal.customWebhookCert.ca }} admissionReviewVersions: ["v1", "v1beta1"] sideEffects: None diff --git a/werf.yaml b/werf.yaml index 046ff912..be817e1e 100644 --- a/werf.yaml +++ b/werf.yaml @@ -1,4 +1,4 @@ -project: sds-lvm +project: sds-local-volume configVersion: 1 --- {{ tpl (.Files.Get ".werf/images.yaml") $ }}