Skip to content

Commit

Permalink
Merge pull request openshift#972 from openshift-cherrypick-robot/cher…
Browse files Browse the repository at this point in the history
…ry-pick-969-to-release-4.14

[release-4.14] OCPBUGS-37653: Do not create default pool CR
  • Loading branch information
openshift-merge-bot[bot] authored Aug 1, 2024
2 parents 96c2605 + 717722a commit 9a8e9f2
Showing 1 changed file with 0 additions and 35 deletions.
35 changes: 0 additions & 35 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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{
Expand Down

0 comments on commit 9a8e9f2

Please sign in to comment.