From 717722a7beaaaeb54ba6b4a27a27940110ceb770 Mon Sep 17 00:00:00 2001 From: Sebastian Sch Date: Thu, 25 Jul 2024 16:03:20 +0300 Subject: [PATCH] Do not create default pool CR There is no need to create default pool the operator handles that. This was a left over on the feature parity backport Signed-off-by: Sebastian Sch --- main.go | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/main.go b/main.go index eaa90b995..71d7cc073 100644 --- a/main.go +++ b/main.go @@ -35,10 +35,8 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/util/intstr" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes" clientgoscheme "k8s.io/client-go/kubernetes/scheme" @@ -250,12 +248,6 @@ func main() { os.Exit(1) } - err = createDefaultPoolConfig(kubeClient) - if err != nil { - setupLog.Error(err, "unable to create default SriovNetworkPoolConfig") - os.Exit(1) - } - if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil { setupLog.Error(err, "unable to set up health check") os.Exit(1) @@ -292,33 +284,6 @@ func initNicIDMap() error { return nil } -func createDefaultPoolConfig(c client.Client) error { - logger := setupLog.WithName("createDefaultOperatorConfig") - - config := &sriovnetworkv1.SriovNetworkPoolConfig{} - err := c.Get(context.TODO(), types.NamespacedName{Name: consts.DefaultConfigName, Namespace: vars.Namespace}, config) - if err != nil { - if errors.IsNotFound(err) { - logger.Info("Create default SriovNetworkPoolConfig") - config.Namespace = vars.Namespace - config.Name = consts.DefaultConfigName - maxun := intstr.Parse("1") - config.Spec = sriovnetworkv1.SriovNetworkPoolConfigSpec{ - MaxUnavailable: &maxun, - NodeSelector: &metav1.LabelSelector{}, - } - err = c.Create(context.TODO(), config) - if err != nil { - return err - } - } - // Error reading the object - requeue the request. - return err - } - - return nil -} - func createDefaultPolicy(c client.Client) error { logger := setupLog.WithName("createDefaultPolicy") policy := &sriovnetworkv1.SriovNetworkNodePolicy{