diff --git a/cmd/initContainer/main.go b/cmd/initContainer/main.go index 8213bd8db1..0832a3d02f 100644 --- a/cmd/initContainer/main.go +++ b/cmd/initContainer/main.go @@ -87,7 +87,7 @@ func main() { os.Exit(1) } - kubeClient, err := utils.NewKubeClient(clientConfig) + kubeClient, err := kubernetes.NewForConfig(clientConfig) if err != nil { setupLog.Error(err, "Failed to create kubernetes client") os.Exit(1) diff --git a/cmd/kyverno/main.go b/cmd/kyverno/main.go index 366f0ae428..1687774c8d 100755 --- a/cmd/kyverno/main.go +++ b/cmd/kyverno/main.go @@ -12,12 +12,6 @@ import ( "strings" "time" - "github.com/prometheus/client_golang/prometheus/promhttp" - kubeinformers "k8s.io/client-go/informers" - "k8s.io/klog/v2" - "k8s.io/klog/v2/klogr" - log "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/kyverno/kyverno/pkg/background" generatecleanup "github.com/kyverno/kyverno/pkg/background/generate/cleanup" kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned" @@ -43,6 +37,12 @@ import ( "github.com/kyverno/kyverno/pkg/webhookconfig" "github.com/kyverno/kyverno/pkg/webhooks" webhookgenerate "github.com/kyverno/kyverno/pkg/webhooks/updaterequest" + "github.com/prometheus/client_golang/prometheus/promhttp" + kubeinformers "k8s.io/client-go/informers" + "k8s.io/client-go/kubernetes" + "k8s.io/klog/v2" + "k8s.io/klog/v2/klogr" + "sigs.k8s.io/controller-runtime/pkg/log" ) const resyncPeriod = 15 * time.Minute @@ -115,7 +115,7 @@ func main() { setupLog.Error(err, "Failed to create dynamic client") os.Exit(1) } - kubeClient, err := utils.NewKubeClient(clientConfig) + kubeClient, err := kubernetes.NewForConfig(clientConfig) if err != nil { setupLog.Error(err, "Failed to create kubernetes client") os.Exit(1) @@ -438,7 +438,7 @@ func main() { go grcc.Run(1, stopCh) } - kubeClientLeaderElection, err := utils.NewKubeClient(clientConfig) + kubeClientLeaderElection, err := kubernetes.NewForConfig(clientConfig) if err != nil { setupLog.Error(err, "Failed to create kubernetes client") os.Exit(1) diff --git a/pkg/utils/util.go b/pkg/utils/util.go index 6cb2360dbf..897298fe75 100644 --- a/pkg/utils/util.go +++ b/pkg/utils/util.go @@ -20,8 +20,6 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/discovery" - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/rest" ) var regexVersion = regexp.MustCompile(`v(\d+).(\d+).(\d+)\.*`) @@ -101,15 +99,6 @@ func compareString(str, name string) bool { return str == name } -// NewKubeClient returns a new kubernetes client -func NewKubeClient(config *rest.Config) (kubernetes.Interface, error) { - kclient, err := kubernetes.NewForConfig(config) - if err != nil { - return nil, err - } - return kclient, nil -} - // CRDsInstalled checks if the Kyverno CRDs are installed or not func CRDsInstalled(discovery client.IDiscovery) bool { kyvernoCRDs := []string{"ClusterPolicy", "ClusterPolicyReport", "PolicyReport", "ClusterReportChangeRequest", "ReportChangeRequest"}