From 697369d102f60230f9a8373b11ae6d8d5e725300 Mon Sep 17 00:00:00 2001 From: Ritwik Ranjan Date: Thu, 2 Jan 2025 14:02:32 +0000 Subject: [PATCH] fix: linter issues --- operator/cilium-crds/k8s/apis/cell.go | 2 +- operator/cilium-crds/k8s/resource_ctors.go | 2 +- operator/cilium-crds/k8s/resources.go | 2 +- operator/cmd/cilium-crds/zap_linux.go | 2 +- pkg/config/hubble_config_linux.go | 2 +- pkg/controllers/daemon/nodereconciler/cell_linux.go | 2 +- pkg/k8s/apiserver_linux.go | 2 +- pkg/managers/pluginmanager/cells_linux.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/operator/cilium-crds/k8s/apis/cell.go b/operator/cilium-crds/k8s/apis/cell.go index 87095de6e5..4c6d86b962 100644 --- a/operator/cilium-crds/k8s/apis/cell.go +++ b/operator/cilium-crds/k8s/apis/cell.go @@ -12,8 +12,8 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/pflag" - "github.com/cilium/hive/cell" k8sClient "github.com/cilium/cilium/pkg/k8s/client" + "github.com/cilium/hive/cell" ) // SkipCRDCreation specifies whether the CustomResourceDefinition will be diff --git a/operator/cilium-crds/k8s/resource_ctors.go b/operator/cilium-crds/k8s/resource_ctors.go index b7c76b447c..31f61a0083 100644 --- a/operator/cilium-crds/k8s/resource_ctors.go +++ b/operator/cilium-crds/k8s/resource_ctors.go @@ -13,12 +13,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/cache" - "github.com/cilium/hive/cell" cilium_api_v2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2" cilium_api_v2alpha1 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1" "github.com/cilium/cilium/pkg/k8s/client" "github.com/cilium/cilium/pkg/k8s/resource" "github.com/cilium/cilium/pkg/k8s/utils" + "github.com/cilium/hive/cell" ) var ErrNotACiliumEndpoint = errors.New("object is not a *cilium_api_v2.CiliumEndpoint") diff --git a/operator/cilium-crds/k8s/resources.go b/operator/cilium-crds/k8s/resources.go index 62f260c057..da8bc18afc 100644 --- a/operator/cilium-crds/k8s/resources.go +++ b/operator/cilium-crds/k8s/resources.go @@ -10,12 +10,12 @@ package k8s import ( - "github.com/cilium/hive/cell" "github.com/cilium/cilium/pkg/k8s" cilium_api_v2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2" cilium_api_v2alpha1 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1" "github.com/cilium/cilium/pkg/k8s/resource" slim_corev1 "github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1" + "github.com/cilium/hive/cell" ) const ( diff --git a/operator/cmd/cilium-crds/zap_linux.go b/operator/cmd/cilium-crds/zap_linux.go index a5db2813c9..9d78cc81ba 100644 --- a/operator/cmd/cilium-crds/zap_linux.go +++ b/operator/cmd/cilium-crds/zap_linux.go @@ -8,9 +8,9 @@ import ( "io" zaphook "github.com/Sytten/logrus-zap-hook" - "github.com/cilium/hive/cell" "github.com/cilium/cilium/pkg/logging" "github.com/cilium/cilium/pkg/option" + "github.com/cilium/hive/cell" "github.com/microsoft/retina/internal/buildinfo" "github.com/microsoft/retina/pkg/log" "github.com/sirupsen/logrus" diff --git a/pkg/config/hubble_config_linux.go b/pkg/config/hubble_config_linux.go index ba43ab71f9..3f24742459 100644 --- a/pkg/config/hubble_config_linux.go +++ b/pkg/config/hubble_config_linux.go @@ -5,8 +5,8 @@ package config import ( "path/filepath" - "github.com/cilium/hive/cell" "github.com/cilium/cilium/pkg/option" + "github.com/cilium/hive/cell" sharedconfig "github.com/microsoft/retina/pkg/shared/config" "github.com/sirupsen/logrus" "github.com/spf13/pflag" diff --git a/pkg/controllers/daemon/nodereconciler/cell_linux.go b/pkg/controllers/daemon/nodereconciler/cell_linux.go index 37a00da9e5..c2f97b5dbb 100644 --- a/pkg/controllers/daemon/nodereconciler/cell_linux.go +++ b/pkg/controllers/daemon/nodereconciler/cell_linux.go @@ -4,9 +4,9 @@ import ( "os" datapath "github.com/cilium/cilium/pkg/datapath/types" - "github.com/cilium/hive/cell" "github.com/cilium/cilium/pkg/ipcache" "github.com/cilium/cilium/pkg/node/types" + "github.com/cilium/hive/cell" "github.com/microsoft/retina/pkg/config" "github.com/microsoft/retina/pkg/log" "github.com/pkg/errors" diff --git a/pkg/k8s/apiserver_linux.go b/pkg/k8s/apiserver_linux.go index 120a2ffeb3..f766073a7a 100644 --- a/pkg/k8s/apiserver_linux.go +++ b/pkg/k8s/apiserver_linux.go @@ -1,10 +1,10 @@ package k8s import ( - "github.com/cilium/hive/cell" "github.com/cilium/cilium/pkg/identity" "github.com/cilium/cilium/pkg/ipcache" "github.com/cilium/cilium/pkg/source" + "github.com/cilium/hive/cell" "github.com/microsoft/retina/pkg/common" cc "github.com/microsoft/retina/pkg/controllers/cache" "github.com/sirupsen/logrus" diff --git a/pkg/managers/pluginmanager/cells_linux.go b/pkg/managers/pluginmanager/cells_linux.go index 9de8bb957c..5a77ef1c0b 100644 --- a/pkg/managers/pluginmanager/cells_linux.go +++ b/pkg/managers/pluginmanager/cells_linux.go @@ -4,8 +4,8 @@ import ( "context" "sync" - "github.com/cilium/hive/cell" v1 "github.com/cilium/cilium/pkg/hubble/api/v1" + "github.com/cilium/hive/cell" "github.com/microsoft/retina/pkg/config" "github.com/microsoft/retina/pkg/metrics" "github.com/microsoft/retina/pkg/telemetry"