refact: set const to common file (#1114)

* refact: set const to common file Signed-off-by: zwwhdls <[email protected]>
juicedata · Sep 23, 2024 · 2be416a · 2be416a
1 parent c6c8343
commit 2be416a
Show file tree

Hide file tree

Showing 36 changed files with 353 additions and 306 deletions.
diff --git a/cmd/app/mount_manager.go b/cmd/app/mount_manager.go
@@ -31,6 +31,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 
+	"github.com/juicedata/juicefs-csi-driver/pkg/common"
 	"github.com/juicedata/juicefs-csi-driver/pkg/config"
 	mountctrl "github.com/juicedata/juicefs-csi-driver/pkg/controller"
 	"github.com/juicedata/juicefs-csi-driver/pkg/k8sclient"
@@ -71,10 +72,10 @@ func NewMountManager(
 			Scheme: scheme,
 			SelectorsByObject: cache.SelectorsByObject{
 				&corev1.Pod{}: {
-					Label: labels.SelectorFromSet(labels.Set{config.PodTypeKey: config.PodTypeValue}),
+					Label: labels.SelectorFromSet(labels.Set{common.PodTypeKey: common.PodTypeValue}),
 				},
 				&batchv1.Job{}: {
-					Label: labels.SelectorFromSet(labels.Set{config.PodTypeKey: config.JobTypeValue}),
+					Label: labels.SelectorFromSet(labels.Set{common.PodTypeKey: common.JobTypeValue}),
 				},
 			},
 		}),

diff --git a/cmd/app/pod_manager.go b/cmd/app/pod_manager.go
@@ -26,7 +26,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 
-	"github.com/juicedata/juicefs-csi-driver/pkg/config"
+	"github.com/juicedata/juicefs-csi-driver/pkg/common"
 	mountctrl "github.com/juicedata/juicefs-csi-driver/pkg/controller"
 	"github.com/juicedata/juicefs-csi-driver/pkg/k8sclient"
 )
@@ -55,7 +55,7 @@ func NewPodManager() (*PodManager, error) {
 			Scheme: scheme,
 			SelectorsByObject: cache.SelectorsByObject{
 				&corev1.Pod{}: {
-					Label: labels.SelectorFromSet(labels.Set{config.PodTypeKey: config.PodTypeValue}),
+					Label: labels.SelectorFromSet(labels.Set{common.PodTypeKey: common.PodTypeValue}),
 				},
 			},
 		}),

diff --git a/cmd/app/webhook.go b/cmd/app/webhook.go
@@ -26,6 +26,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 
+	"github.com/juicedata/juicefs-csi-driver/pkg/common"
 	"github.com/juicedata/juicefs-csi-driver/pkg/config"
 	mountctrl "github.com/juicedata/juicefs-csi-driver/pkg/controller"
 	"github.com/juicedata/juicefs-csi-driver/pkg/k8sclient"
@@ -60,7 +61,7 @@ func NewWebhookManager(certDir string, webhookPort int, leaderElection bool,
 			Scheme: scheme,
 			SelectorsByObject: cache.SelectorsByObject{
 				&corev1.Pod{}: {
-					Label: labels.SelectorFromSet(labels.Set{config.InjectSidecarDone: config.True}),
+					Label: labels.SelectorFromSet(labels.Set{common.InjectSidecarDone: common.True}),
 				},
 			},
 		}),

diff --git a/pkg/common/common.go b/pkg/common/common.go
@@ -0,0 +1,83 @@
+/*
+ Copyright 2024 Juicedata Inc
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package common
+
+const (
+	// DriverName to be registered
+	CSINodeLabelKey      = "app"
+	CSINodeLabelValue    = "juicefs-csi-node"
+	PodTypeKey           = "app.kubernetes.io/name"
+	PodTypeValue         = "juicefs-mount"
+	PodUniqueIdLabelKey  = "volume-id"
+	PodJuiceHashLabelKey = "juicefs-hash"
+	Finalizer            = "juicefs.com/finalizer"
+	JuiceFSUUID          = "juicefs-uuid"
+	UniqueId             = "juicefs-uniqueid"
+	CleanCache           = "juicefs-clean-cache"
+	MountContainerName   = "jfs-mount"
+	JobTypeValue         = "juicefs-job"
+	JfsInsideContainer   = "JFS_INSIDE_CONTAINER"
+
+	// CSI Secret
+	ProvisionerSecretName           = "csi.storage.k8s.io/provisioner-secret-name"
+	ProvisionerSecretNamespace      = "csi.storage.k8s.io/provisioner-secret-namespace"
+	PublishSecretName               = "csi.storage.k8s.io/node-publish-secret-name"
+	PublishSecretNamespace          = "csi.storage.k8s.io/node-publish-secret-namespace"
+	ControllerExpandSecretName      = "csi.storage.k8s.io/controller-expand-secret-name"
+	ControllerExpandSecretNamespace = "csi.storage.k8s.io/controller-expand-secret-namespace"
+
+	// webhook
+	WebhookName          = "juicefs-admission-webhook"
+	True                 = "true"
+	False                = "false"
+	inject               = ".juicefs.com/inject"
+	injectSidecar        = ".sidecar" + inject
+	InjectSidecarDone    = "done" + injectSidecar
+	InjectSidecarDisable = "disable" + injectSidecar
+
+	// config in pv
+	MountPodCpuLimitKey    = "juicefs/mount-cpu-limit"
+	MountPodMemLimitKey    = "juicefs/mount-memory-limit"
+	MountPodCpuRequestKey  = "juicefs/mount-cpu-request"
+	MountPodMemRequestKey  = "juicefs/mount-memory-request"
+	MountPodLabelKey       = "juicefs/mount-labels"
+	MountPodAnnotationKey  = "juicefs/mount-annotations"
+	MountPodServiceAccount = "juicefs/mount-service-account"
+	MountPodImageKey       = "juicefs/mount-image"
+	DeleteDelay            = "juicefs/mount-delete-delay"
+	CleanCacheKey          = "juicefs/clean-cache"
+	CachePVC               = "juicefs/mount-cache-pvc"
+	CacheEmptyDir          = "juicefs/mount-cache-emptydir"
+	CacheInlineVolume      = "juicefs/mount-cache-inline-volume"
+	MountPodHostPath       = "juicefs/host-path"
+
+	// DeleteDelayTimeKey mount pod annotation
+	DeleteDelayTimeKey = "juicefs-delete-delay"
+	DeleteDelayAtKey   = "juicefs-delete-at"
+
+	// default value
+	DefaultMountPodCpuLimit   = "2000m"
+	DefaultMountPodMemLimit   = "5Gi"
+	DefaultMountPodCpuRequest = "1000m"
+	DefaultMountPodMemRequest = "1Gi"
+
+	// secret labels
+	JuicefsSecretLabelKey = "juicefs/secret"
+
+	PodInfoName      = "csi.storage.k8s.io/pod.name"
+	PodInfoNamespace = "csi.storage.k8s.io/pod.namespace"
+)
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -80,72 +80,6 @@ var (
 	DefaultEEMountImage = "juicedata/mount:ee-nightly" // mount pod ee image, override by ENV
 )
 
-const (
-	// DriverName to be registered
-	CSINodeLabelKey      = "app"
-	CSINodeLabelValue    = "juicefs-csi-node"
-	PodTypeKey           = "app.kubernetes.io/name"
-	PodTypeValue         = "juicefs-mount"
-	PodUniqueIdLabelKey  = "volume-id"
-	PodJuiceHashLabelKey = "juicefs-hash"
-	Finalizer            = "juicefs.com/finalizer"
-	JuiceFSUUID          = "juicefs-uuid"
-	UniqueId             = "juicefs-uniqueid"
-	CleanCache           = "juicefs-clean-cache"
-	MountContainerName   = "jfs-mount"
-	JobTypeValue         = "juicefs-job"
-	JfsInsideContainer   = "JFS_INSIDE_CONTAINER"
-
-	// CSI Secret
-	ProvisionerSecretName           = "csi.storage.k8s.io/provisioner-secret-name"
-	ProvisionerSecretNamespace      = "csi.storage.k8s.io/provisioner-secret-namespace"
-	PublishSecretName               = "csi.storage.k8s.io/node-publish-secret-name"
-	PublishSecretNamespace          = "csi.storage.k8s.io/node-publish-secret-namespace"
-	ControllerExpandSecretName      = "csi.storage.k8s.io/controller-expand-secret-name"
-	ControllerExpandSecretNamespace = "csi.storage.k8s.io/controller-expand-secret-namespace"
-
-	// webhook
-	WebhookName          = "juicefs-admission-webhook"
-	True                 = "true"
-	False                = "false"
-	inject               = ".juicefs.com/inject"
-	injectSidecar        = ".sidecar" + inject
-	InjectSidecarDone    = "done" + injectSidecar
-	InjectSidecarDisable = "disable" + injectSidecar
-
-	// config in pv
-	MountPodCpuLimitKey    = "juicefs/mount-cpu-limit"
-	MountPodMemLimitKey    = "juicefs/mount-memory-limit"
-	MountPodCpuRequestKey  = "juicefs/mount-cpu-request"
-	MountPodMemRequestKey  = "juicefs/mount-memory-request"
-	mountPodLabelKey       = "juicefs/mount-labels"
-	mountPodAnnotationKey  = "juicefs/mount-annotations"
-	mountPodServiceAccount = "juicefs/mount-service-account"
-	mountPodImageKey       = "juicefs/mount-image"
-	deleteDelay            = "juicefs/mount-delete-delay"
-	cleanCache             = "juicefs/clean-cache"
-	cachePVC               = "juicefs/mount-cache-pvc"
-	cacheEmptyDir          = "juicefs/mount-cache-emptydir"
-	cacheInlineVolume      = "juicefs/mount-cache-inline-volume"
-	mountPodHostPath       = "juicefs/host-path"
-
-	// DeleteDelayTimeKey mount pod annotation
-	DeleteDelayTimeKey = "juicefs-delete-delay"
-	DeleteDelayAtKey   = "juicefs-delete-at"
-
-	// default value
-	DefaultMountPodCpuLimit   = "2000m"
-	DefaultMountPodMemLimit   = "5Gi"
-	DefaultMountPodCpuRequest = "1000m"
-	DefaultMountPodMemRequest = "1Gi"
-
-	// secret labels
-	JuicefsSecretLabelKey = "juicefs/secret"
-
-	PodInfoName      = "csi.storage.k8s.io/pod.name"
-	PodInfoNamespace = "csi.storage.k8s.io/pod.namespace"
-)
-
 var interVolumesPrefix = []string{
 	"rsa-key",
 	"init-config",