mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

chore: remove useless util NewKubeClient (#3795)

Browse source
This commit is contained in:
Charles-Edouard Brétéché 2022-05-04 14:14:17 +02:00 • committed by GitHub
parent db735f2165
commit 0a783bdc7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/initContainer/main.go
View file

@ -87,7 +87,7 @@ func main() {
os.Exit(1) os.Exit(1)
} }
kubeClient, err := utils.NewKubeClient(clientConfig) kubeClient, err := kubernetes.NewForConfig(clientConfig)
if err != nil { if err != nil {
setupLog.Error(err, "Failed to create kubernetes client") setupLog.Error(err, "Failed to create kubernetes client")
os.Exit(1) os.Exit(1)

16
cmd/kyverno/main.go
View file

@ -12,12 +12,6 @@ import (
"strings" "strings"
"time" "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" "github.com/kyverno/kyverno/pkg/background"
generatecleanup "github.com/kyverno/kyverno/pkg/background/generate/cleanup" generatecleanup "github.com/kyverno/kyverno/pkg/background/generate/cleanup"
kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned" 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/webhookconfig"
"github.com/kyverno/kyverno/pkg/webhooks" "github.com/kyverno/kyverno/pkg/webhooks"
webhookgenerate "github.com/kyverno/kyverno/pkg/webhooks/updaterequest" 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 const resyncPeriod = 15 * time.Minute
@ -115,7 +115,7 @@ func main() {
setupLog.Error(err, "Failed to create dynamic client") setupLog.Error(err, "Failed to create dynamic client")
os.Exit(1) os.Exit(1)
} }
kubeClient, err := utils.NewKubeClient(clientConfig) kubeClient, err := kubernetes.NewForConfig(clientConfig)
if err != nil { if err != nil {
setupLog.Error(err, "Failed to create kubernetes client") setupLog.Error(err, "Failed to create kubernetes client")
os.Exit(1) os.Exit(1)
@ -438,7 +438,7 @@ func main() {
go grcc.Run(1, stopCh) go grcc.Run(1, stopCh)
} }
kubeClientLeaderElection, err := utils.NewKubeClient(clientConfig) kubeClientLeaderElection, err := kubernetes.NewForConfig(clientConfig)
if err != nil { if err != nil {
setupLog.Error(err, "Failed to create kubernetes client") setupLog.Error(err, "Failed to create kubernetes client")
os.Exit(1) os.Exit(1)

11
pkg/utils/util.go
View file

@ -20,8 +20,6 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/discovery" "k8s.io/client-go/discovery"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
) )
var regexVersion = regexp.MustCompile(`v(\d+).(\d+).(\d+)\.*`) var regexVersion = regexp.MustCompile(`v(\d+).(\d+).(\d+)\.*`)
@ -101,15 +99,6 @@ func compareString(str, name string) bool {
return str == name 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 // CRDsInstalled checks if the Kyverno CRDs are installed or not
func CRDsInstalled(discovery client.IDiscovery) bool { func CRDsInstalled(discovery client.IDiscovery) bool {
kyvernoCRDs := []string{"ClusterPolicy", "ClusterPolicyReport", "PolicyReport", "ClusterReportChangeRequest", "ReportChangeRequest"} kyvernoCRDs := []string{"ClusterPolicy", "ClusterPolicyReport", "PolicyReport", "ClusterReportChangeRequest", "ReportChangeRequest"}