From b79482aa050ad170666fc324edb5843907b38d96 Mon Sep 17 00:00:00 2001 From: liujian <54946465+redscholar@users.noreply.github.com> Date: Wed, 13 Nov 2024 14:06:59 +0800 Subject: [PATCH] refactor: move env to _const. (#2455) Co-authored-by: joyceliu --- pkg/connector/connector.go | 2 +- pkg/const/common.go | 11 +++++++++++ pkg/controllers/pipeline_controller.go | 9 +++++---- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/pkg/connector/connector.go b/pkg/connector/connector.go index cd6e8a524..048fe3ed5 100644 --- a/pkg/connector/connector.go +++ b/pkg/connector/connector.go @@ -121,7 +121,7 @@ func isLocalIP(ipAddr string) bool { func commandShell() string { // find command interpreter in env. default /bin/bash - sl, ok := os.LookupEnv("SHELL") + sl, ok := os.LookupEnv(_const.ENV_SHELL) if !ok { return "/bin/bash" } diff --git a/pkg/const/common.go b/pkg/const/common.go index 3ea218d51..b4daf568c 100644 --- a/pkg/const/common.go +++ b/pkg/const/common.go @@ -79,3 +79,14 @@ const ( // === From runtime === // VariableItem for "loop" argument when run a task. VariableItem = "item" ) + +const ( // === From env === + // ENV_SHELL which shell operator use in local connector. + ENV_SHELL = "SHELL" + // ENV_EXECUTOR_SERVICEACCOUNT use to run pipeline pod. + ENV_EXECUTOR_SERVICEACCOUNT = "EXECUTOR_SERVICEACCOUNT" + // ENV_EXECUTOR_IMAGE which image use in pipeline pod. + ENV_EXECUTOR_IMAGE = "EXECUTOR_IMAGE" + // ENV_EXECUTOR_IMAGE_PULLPOLICY which imagePolicy use in pipeline pod. + ENV_EXECUTOR_IMAGE_PULLPOLICY = "EXECUTOR_IMAGE_PULLPOLICY" +) diff --git a/pkg/controllers/pipeline_controller.go b/pkg/controllers/pipeline_controller.go index f8c074364..e4187e6b7 100644 --- a/pkg/controllers/pipeline_controller.go +++ b/pkg/controllers/pipeline_controller.go @@ -36,6 +36,7 @@ import ( ctrlfinalizer "sigs.k8s.io/controller-runtime/pkg/finalizer" kkcorev1 "github.com/kubesphere/kubekey/v4/pkg/apis/core/v1" + _const "github.com/kubesphere/kubekey/v4/pkg/const" ) const ( @@ -199,7 +200,7 @@ func (r *PipelineReconciler) dealRunningPipeline(ctx context.Context, pipeline * // checkServiceAccount when ServiceAccount is not exist, create it. func (r *PipelineReconciler) checkServiceAccount(ctx context.Context, pipeline kkcorev1.Pipeline) error { // get ServiceAccount name for executor pod - saName, ok := os.LookupEnv("EXECUTOR_SERVICEACCOUNT") + saName, ok := os.LookupEnv(_const.ENV_EXECUTOR_SERVICEACCOUNT) if !ok { saName = defaultServiceAccount } @@ -257,17 +258,17 @@ func (r *PipelineReconciler) checkServiceAccount(ctx context.Context, pipeline k // GenerateJobSpec for pipeline func (r *PipelineReconciler) GenerateJobSpec(pipeline kkcorev1.Pipeline) batchv1.JobSpec { // get ServiceAccount name for executor pod - saName, ok := os.LookupEnv("EXECUTOR_SERVICEACCOUNT") + saName, ok := os.LookupEnv(_const.ENV_EXECUTOR_SERVICEACCOUNT) if !ok { saName = defaultServiceAccount } // get image from env - image, ok := os.LookupEnv("EXECUTOR_IMAGE") + image, ok := os.LookupEnv(_const.ENV_EXECUTOR_IMAGE) if !ok { image = defaultExecutorImage } // get image from env - imagePullPolicy, ok := os.LookupEnv("EXECUTOR_IMAGE_PULLPOLICY") + imagePullPolicy, ok := os.LookupEnv(_const.ENV_EXECUTOR_IMAGE_PULLPOLICY) if !ok { imagePullPolicy = defaultPullPolicy }