From c469ee4f12d901226d3db4a562f8af2cd54f752a Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 25 Oct 2023 10:30:17 -0700 Subject: [PATCH 1/2] go.mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 4012c9c92..3c1fe79c5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/alluxio/k8s-operator +module github.com/Alluxio/k8s-operator go 1.19 From f34a7a74cd9c971eaf4c0bb4e4115fc93e92f7f0 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 25 Oct 2023 10:30:29 -0700 Subject: [PATCH 2/2] refactor --- cmd/alluxio/alluxio/alluxio.go | 6 +++--- cmd/alluxio/main.go | 4 ++-- cmd/dataset/dataset/dataset.go | 12 ++++++------ cmd/dataset/main.go | 4 ++-- csi/main.go | 2 +- pkg/alluxiocluster/alluxiocluster_controller.go | 6 +++--- pkg/alluxiocluster/create_alluxiocluster.go | 4 ++-- pkg/alluxiocluster/delete_alluxiocluster.go | 4 ++-- pkg/alluxiocluster/update_status.go | 8 ++++---- pkg/dataset/dataset_controller.go | 4 ++-- pkg/dataset/delete_dataset.go | 2 +- pkg/dataset/update_dataset_status.go | 4 ++-- pkg/load/create_load_job.go | 6 +++--- pkg/load/delete_load_job.go | 2 +- pkg/load/load_controller.go | 6 +++--- pkg/unload/unload.go | 6 +++--- pkg/unload/unload_controller.go | 4 ++-- pkg/update/create_update_job.go | 6 +++--- pkg/update/delete_update_job.go | 2 +- pkg/update/update_controller.go | 6 +++--- pkg/utils/component_utils.go | 4 ++-- pkg/utils/helm.go | 2 +- pkg/utils/kube_client.go | 2 +- 23 files changed, 53 insertions(+), 53 deletions(-) diff --git a/cmd/alluxio/alluxio/alluxio.go b/cmd/alluxio/alluxio/alluxio.go index 8b71cc167..3f27587b4 100644 --- a/cmd/alluxio/alluxio/alluxio.go +++ b/cmd/alluxio/alluxio/alluxio.go @@ -20,9 +20,9 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" - alluxiov1alpha1 "github.com/alluxio/k8s-operator/api/v1alpha1" - "github.com/alluxio/k8s-operator/pkg/alluxiocluster" - "github.com/alluxio/k8s-operator/pkg/logger" + alluxiov1alpha1 "github.com/Alluxio/k8s-operator/api/v1alpha1" + "github.com/Alluxio/k8s-operator/pkg/alluxiocluster" + "github.com/Alluxio/k8s-operator/pkg/logger" ) var ( diff --git a/cmd/alluxio/main.go b/cmd/alluxio/main.go index be332fb30..ea05761a2 100644 --- a/cmd/alluxio/main.go +++ b/cmd/alluxio/main.go @@ -14,8 +14,8 @@ package main import ( "os" - "github.com/alluxio/k8s-operator/cmd/alluxio/alluxio" - "github.com/alluxio/k8s-operator/pkg/logger" + "github.com/Alluxio/k8s-operator/cmd/alluxio/alluxio" + "github.com/Alluxio/k8s-operator/pkg/logger" ) func main() { diff --git a/cmd/dataset/dataset/dataset.go b/cmd/dataset/dataset/dataset.go index fc77be13e..37a1f780f 100644 --- a/cmd/dataset/dataset/dataset.go +++ b/cmd/dataset/dataset/dataset.go @@ -25,12 +25,12 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" - alluxiov1alpha1 "github.com/alluxio/k8s-operator/api/v1alpha1" - "github.com/alluxio/k8s-operator/pkg/dataset" - "github.com/alluxio/k8s-operator/pkg/load" - "github.com/alluxio/k8s-operator/pkg/logger" - "github.com/alluxio/k8s-operator/pkg/unload" - "github.com/alluxio/k8s-operator/pkg/update" + alluxiov1alpha1 "github.com/Alluxio/k8s-operator/api/v1alpha1" + "github.com/Alluxio/k8s-operator/pkg/dataset" + "github.com/Alluxio/k8s-operator/pkg/load" + "github.com/Alluxio/k8s-operator/pkg/logger" + "github.com/Alluxio/k8s-operator/pkg/unload" + "github.com/Alluxio/k8s-operator/pkg/update" ) var ( diff --git a/cmd/dataset/main.go b/cmd/dataset/main.go index bed2da7e3..92036647d 100644 --- a/cmd/dataset/main.go +++ b/cmd/dataset/main.go @@ -14,8 +14,8 @@ package main import ( "os" - "github.com/alluxio/k8s-operator/cmd/dataset/dataset" - "github.com/alluxio/k8s-operator/pkg/logger" + "github.com/Alluxio/k8s-operator/cmd/dataset/dataset" + "github.com/Alluxio/k8s-operator/pkg/logger" ) func main() { diff --git a/csi/main.go b/csi/main.go index 64a613825..81fc68791 100644 --- a/csi/main.go +++ b/csi/main.go @@ -26,7 +26,7 @@ import ( "github.com/golang/glog" "github.com/spf13/cobra" - "github.com/alluxio/csi/alluxio" + "github.com/Alluxio/csi/alluxio" ) var ( diff --git a/pkg/alluxiocluster/alluxiocluster_controller.go b/pkg/alluxiocluster/alluxiocluster_controller.go index 0ce3b0f88..ea7cfc814 100644 --- a/pkg/alluxiocluster/alluxiocluster_controller.go +++ b/pkg/alluxiocluster/alluxiocluster_controller.go @@ -20,9 +20,9 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - alluxiov1alpha1 "github.com/alluxio/k8s-operator/api/v1alpha1" - "github.com/alluxio/k8s-operator/pkg/finalizer" - "github.com/alluxio/k8s-operator/pkg/logger" + alluxiov1alpha1 "github.com/Alluxio/k8s-operator/api/v1alpha1" + "github.com/Alluxio/k8s-operator/pkg/finalizer" + "github.com/Alluxio/k8s-operator/pkg/logger" ) // AlluxioClusterReconciler reconciles a AlluxioCluster object diff --git a/pkg/alluxiocluster/create_alluxiocluster.go b/pkg/alluxiocluster/create_alluxiocluster.go index 39de6303f..062c08762 100644 --- a/pkg/alluxiocluster/create_alluxiocluster.go +++ b/pkg/alluxiocluster/create_alluxiocluster.go @@ -16,8 +16,8 @@ import ( "sigs.k8s.io/yaml" - "github.com/alluxio/k8s-operator/pkg/logger" - "github.com/alluxio/k8s-operator/pkg/utils" + "github.com/Alluxio/k8s-operator/pkg/logger" + "github.com/Alluxio/k8s-operator/pkg/utils" ) const chartPath = "/opt/charts/alluxio" diff --git a/pkg/alluxiocluster/delete_alluxiocluster.go b/pkg/alluxiocluster/delete_alluxiocluster.go index 9c069de99..640870f44 100644 --- a/pkg/alluxiocluster/delete_alluxiocluster.go +++ b/pkg/alluxiocluster/delete_alluxiocluster.go @@ -16,8 +16,8 @@ import ( "k8s.io/apimachinery/pkg/types" - "github.com/alluxio/k8s-operator/pkg/logger" - "github.com/alluxio/k8s-operator/pkg/utils" + "github.com/Alluxio/k8s-operator/pkg/logger" + "github.com/Alluxio/k8s-operator/pkg/utils" ) func DeleteAlluxioClusterIfExist(namespacedName types.NamespacedName) error { diff --git a/pkg/alluxiocluster/update_status.go b/pkg/alluxiocluster/update_status.go index 0afbece4b..4e141ae57 100644 --- a/pkg/alluxiocluster/update_status.go +++ b/pkg/alluxiocluster/update_status.go @@ -19,10 +19,10 @@ import ( "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" - alluxiov1alpha1 "github.com/alluxio/k8s-operator/api/v1alpha1" - "github.com/alluxio/k8s-operator/pkg/dataset" - "github.com/alluxio/k8s-operator/pkg/logger" - "github.com/alluxio/k8s-operator/pkg/utils" + alluxiov1alpha1 "github.com/Alluxio/k8s-operator/api/v1alpha1" + "github.com/Alluxio/k8s-operator/pkg/dataset" + "github.com/Alluxio/k8s-operator/pkg/logger" + "github.com/Alluxio/k8s-operator/pkg/utils" ) func UpdateStatus(alluxioClusterCtx AlluxioClusterReconcileReqCtx) (ctrl.Result, error) { diff --git a/pkg/dataset/dataset_controller.go b/pkg/dataset/dataset_controller.go index bad2b80b4..5bc1b57b5 100644 --- a/pkg/dataset/dataset_controller.go +++ b/pkg/dataset/dataset_controller.go @@ -20,8 +20,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - alluxiov1alpha1 "github.com/alluxio/k8s-operator/api/v1alpha1" - "github.com/alluxio/k8s-operator/pkg/logger" + alluxiov1alpha1 "github.com/Alluxio/k8s-operator/api/v1alpha1" + "github.com/Alluxio/k8s-operator/pkg/logger" ) // DatasetReconciler reconciles a Dataset object diff --git a/pkg/dataset/delete_dataset.go b/pkg/dataset/delete_dataset.go index cca37ac95..ff2283f3a 100644 --- a/pkg/dataset/delete_dataset.go +++ b/pkg/dataset/delete_dataset.go @@ -14,7 +14,7 @@ package dataset import ( ctrl "sigs.k8s.io/controller-runtime" - "github.com/alluxio/k8s-operator/pkg/logger" + "github.com/Alluxio/k8s-operator/pkg/logger" ) func DeleteDatasetIfExist(req ctrl.Request) (ctrl.Result, error) { diff --git a/pkg/dataset/update_dataset_status.go b/pkg/dataset/update_dataset_status.go index 3c0af6307..da3d7a3c6 100644 --- a/pkg/dataset/update_dataset_status.go +++ b/pkg/dataset/update_dataset_status.go @@ -16,8 +16,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime" - alluxiov1alpha1 "github.com/alluxio/k8s-operator/api/v1alpha1" - "github.com/alluxio/k8s-operator/pkg/logger" + alluxiov1alpha1 "github.com/Alluxio/k8s-operator/api/v1alpha1" + "github.com/Alluxio/k8s-operator/pkg/logger" ) func UpdateDatasetStatus(ctx DatasetReconcilerReqCtx) (ctrl.Result, error) { diff --git a/pkg/load/create_load_job.go b/pkg/load/create_load_job.go index a49079468..09ab4c979 100644 --- a/pkg/load/create_load_job.go +++ b/pkg/load/create_load_job.go @@ -21,9 +21,9 @@ import ( "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" - alluxiov1alpha1 "github.com/alluxio/k8s-operator/api/v1alpha1" - "github.com/alluxio/k8s-operator/pkg/logger" - "github.com/alluxio/k8s-operator/pkg/utils" + alluxiov1alpha1 "github.com/Alluxio/k8s-operator/api/v1alpha1" + "github.com/Alluxio/k8s-operator/pkg/logger" + "github.com/Alluxio/k8s-operator/pkg/utils" ) func (r *LoadReconciler) createLoadJob(ctx LoadReconcilerReqCtx) (ctrl.Result, error) { diff --git a/pkg/load/delete_load_job.go b/pkg/load/delete_load_job.go index 7fc7f00e0..fdacd226d 100644 --- a/pkg/load/delete_load_job.go +++ b/pkg/load/delete_load_job.go @@ -16,7 +16,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/alluxio/k8s-operator/pkg/logger" + "github.com/Alluxio/k8s-operator/pkg/logger" ) func (r *LoadReconciler) deleteJob(ctx LoadReconcilerReqCtx) (ctrl.Result, error) { diff --git a/pkg/load/load_controller.go b/pkg/load/load_controller.go index 092f2fd34..e5a828f50 100644 --- a/pkg/load/load_controller.go +++ b/pkg/load/load_controller.go @@ -22,9 +22,9 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - alluxiov1alpha1 "github.com/alluxio/k8s-operator/api/v1alpha1" - "github.com/alluxio/k8s-operator/pkg/logger" - "github.com/alluxio/k8s-operator/pkg/utils" + alluxiov1alpha1 "github.com/Alluxio/k8s-operator/api/v1alpha1" + "github.com/Alluxio/k8s-operator/pkg/logger" + "github.com/Alluxio/k8s-operator/pkg/utils" ) type LoadReconciler struct { diff --git a/pkg/unload/unload.go b/pkg/unload/unload.go index b9d3b2261..45f2f62ec 100644 --- a/pkg/unload/unload.go +++ b/pkg/unload/unload.go @@ -26,9 +26,9 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - alluxiov1alpha1 "github.com/alluxio/k8s-operator/api/v1alpha1" - "github.com/alluxio/k8s-operator/pkg/logger" - "github.com/alluxio/k8s-operator/pkg/utils" + alluxiov1alpha1 "github.com/Alluxio/k8s-operator/api/v1alpha1" + "github.com/Alluxio/k8s-operator/pkg/logger" + "github.com/Alluxio/k8s-operator/pkg/utils" ) func (r *UnloadReconciler) unload(ctx UnloadReconcilerReqCtx) (ctrl.Result, error) { diff --git a/pkg/unload/unload_controller.go b/pkg/unload/unload_controller.go index 2871aa60c..ea4220d26 100644 --- a/pkg/unload/unload_controller.go +++ b/pkg/unload/unload_controller.go @@ -21,8 +21,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime" client "sigs.k8s.io/controller-runtime/pkg/client" - alluxiov1alpha1 "github.com/alluxio/k8s-operator/api/v1alpha1" - "github.com/alluxio/k8s-operator/pkg/logger" + alluxiov1alpha1 "github.com/Alluxio/k8s-operator/api/v1alpha1" + "github.com/Alluxio/k8s-operator/pkg/logger" ) type UnloadReconciler struct { diff --git a/pkg/update/create_update_job.go b/pkg/update/create_update_job.go index ecb56756f..32971e249 100644 --- a/pkg/update/create_update_job.go +++ b/pkg/update/create_update_job.go @@ -21,9 +21,9 @@ import ( "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" - alluxiov1alpha1 "github.com/alluxio/k8s-operator/api/v1alpha1" - "github.com/alluxio/k8s-operator/pkg/logger" - "github.com/alluxio/k8s-operator/pkg/utils" + alluxiov1alpha1 "github.com/Alluxio/k8s-operator/api/v1alpha1" + "github.com/Alluxio/k8s-operator/pkg/logger" + "github.com/Alluxio/k8s-operator/pkg/utils" ) func (r *UpdateReconciler) createUpdateJob(ctx UpdateReconcilerReqCtx) (ctrl.Result, error) { diff --git a/pkg/update/delete_update_job.go b/pkg/update/delete_update_job.go index f4a4251c2..7c5568adb 100644 --- a/pkg/update/delete_update_job.go +++ b/pkg/update/delete_update_job.go @@ -16,7 +16,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/alluxio/k8s-operator/pkg/logger" + "github.com/Alluxio/k8s-operator/pkg/logger" ) func (r *UpdateReconciler) deleteJob(ctx UpdateReconcilerReqCtx) (ctrl.Result, error) { diff --git a/pkg/update/update_controller.go b/pkg/update/update_controller.go index f3b9f8886..4bb8342db 100644 --- a/pkg/update/update_controller.go +++ b/pkg/update/update_controller.go @@ -22,9 +22,9 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - alluxiov1alpha1 "github.com/alluxio/k8s-operator/api/v1alpha1" - "github.com/alluxio/k8s-operator/pkg/logger" - "github.com/alluxio/k8s-operator/pkg/utils" + alluxiov1alpha1 "github.com/Alluxio/k8s-operator/api/v1alpha1" + "github.com/Alluxio/k8s-operator/pkg/logger" + "github.com/Alluxio/k8s-operator/pkg/utils" ) type UpdateReconciler struct { diff --git a/pkg/utils/component_utils.go b/pkg/utils/component_utils.go index 97efebe87..7d498360b 100644 --- a/pkg/utils/component_utils.go +++ b/pkg/utils/component_utils.go @@ -18,8 +18,8 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - alluxiov1alpha1 "github.com/alluxio/k8s-operator/api/v1alpha1" - "github.com/alluxio/k8s-operator/pkg/logger" + alluxiov1alpha1 "github.com/Alluxio/k8s-operator/api/v1alpha1" + "github.com/Alluxio/k8s-operator/pkg/logger" ) type ComponentStatusReqCtx struct { diff --git a/pkg/utils/helm.go b/pkg/utils/helm.go index f639dcd8f..dc394c504 100644 --- a/pkg/utils/helm.go +++ b/pkg/utils/helm.go @@ -14,7 +14,7 @@ package utils import ( "os/exec" - "github.com/alluxio/k8s-operator/pkg/logger" + "github.com/Alluxio/k8s-operator/pkg/logger" ) type HelmContext struct { diff --git a/pkg/utils/kube_client.go b/pkg/utils/kube_client.go index 0bdd83282..821659cb1 100644 --- a/pkg/utils/kube_client.go +++ b/pkg/utils/kube_client.go @@ -15,7 +15,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" - "github.com/alluxio/k8s-operator/pkg/logger" + "github.com/Alluxio/k8s-operator/pkg/logger" ) func GetK8sClient() (*kubernetes.Clientset, error) {