diff --git a/api/v1/helper.go b/api/v1/helper.go index 9631c34a8..be122a2f1 100644 --- a/api/v1/helper.go +++ b/api/v1/helper.go @@ -465,8 +465,6 @@ func (s *SriovNetworkNodeState) GetDriverByPciAddress(addr string) string { func (cr *SriovIBNetwork) RenderNetAttDef() (*uns.Unstructured, error) { logger := log.WithName("renderNetAttDef") logger.Info("Start to render IB SRIOV CNI NetworkAttachementDefinition") - var err error - objs := []*uns.Unstructured{} // render RawCNIConfig manifests data := render.MakeRenderData() @@ -511,7 +509,7 @@ func (cr *SriovIBNetwork) RenderNetAttDef() (*uns.Unstructured, error) { data.Data["MetaPlugins"] = cr.Spec.MetaPluginsConfig } - objs, err = render.RenderDir(MANIFESTS_PATH, &data) + objs, err := render.RenderDir(MANIFESTS_PATH, &data) if err != nil { return nil, err } @@ -548,8 +546,6 @@ func (cr *SriovIBNetwork) DeleteNetAttDef(c client.Client) error { func (cr *SriovNetwork) RenderNetAttDef() (*uns.Unstructured, error) { logger := log.WithName("renderNetAttDef") logger.Info("Start to render SRIOV CNI NetworkAttachementDefinition") - var err error - objs := []*uns.Unstructured{} // render RawCNIConfig manifests data := render.MakeRenderData() @@ -637,7 +633,7 @@ func (cr *SriovNetwork) RenderNetAttDef() (*uns.Unstructured, error) { data.Data["MetaPlugins"] = cr.Spec.MetaPluginsConfig } - objs, err = render.RenderDir(MANIFESTS_PATH, &data) + objs, err := render.RenderDir(MANIFESTS_PATH, &data) if err != nil { return nil, err } diff --git a/controllers/sriovnetworknodepolicy_controller.go b/controllers/sriovnetworknodepolicy_controller.go index 26b65fba4..7ef5afc1e 100644 --- a/controllers/sriovnetworknodepolicy_controller.go +++ b/controllers/sriovnetworknodepolicy_controller.go @@ -110,7 +110,10 @@ func (r *SriovNetworkNodePolicyReconciler) Reconcile(ctx context.Context, req ct } // Fetch the Nodes nodeList := &corev1.NodeList{} - lo := &client.MatchingLabels{} + lo := &client.MatchingLabels{ + "node-role.kubernetes.io/worker": "", + "beta.kubernetes.io/os": "linux", + } defaultOpConf := &sriovnetworkv1.SriovOperatorConfig{} if err := r.Get(context.TODO(), types.NamespacedName{Namespace: namespace, Name: constants.DEFAULT_CONFIG_NAME}, defaultOpConf); err != nil { return reconcile.Result{}, err @@ -118,11 +121,6 @@ func (r *SriovNetworkNodePolicyReconciler) Reconcile(ctx context.Context, req ct if len(defaultOpConf.Spec.ConfigDaemonNodeSelector) > 0 { labels := client.MatchingLabels(defaultOpConf.Spec.ConfigDaemonNodeSelector) lo = &labels - } else { - lo = &client.MatchingLabels{ - "node-role.kubernetes.io/worker": "", - "beta.kubernetes.io/os": "linux", - } } err = r.List(context.TODO(), nodeList, lo) if err != nil { @@ -530,7 +528,6 @@ func setDsNodeAffinity(pl *sriovnetworkv1.SriovNetworkNodePolicyList, ds *appsv1 func nodeSelectorTermsForPolicyList(policies []sriovnetworkv1.SriovNetworkNodePolicy) []corev1.NodeSelectorTerm { terms := []corev1.NodeSelectorTerm{} for _, p := range policies { - nodeSelector := corev1.NodeSelectorTerm{} if len(p.Spec.NodeSelector) == 0 { continue } @@ -548,7 +545,7 @@ func nodeSelectorTermsForPolicyList(policies []sriovnetworkv1.SriovNetworkNodePo sort.Slice(expressions, func(i, j int) bool { return expressions[i].Key < expressions[j].Key }) - nodeSelector = corev1.NodeSelectorTerm{ + nodeSelector := corev1.NodeSelectorTerm{ MatchExpressions: expressions, } terms = append(terms, nodeSelector) @@ -561,10 +558,8 @@ func nodeSelectorTermsForPolicyList(policies []sriovnetworkv1.SriovNetworkNodePo func renderDsForCR(path string, data *render.RenderData) ([]*uns.Unstructured, error) { logger := log.Log.WithName("renderDsForCR") logger.Info("Start to render objects") - var err error - objs := []*uns.Unstructured{} - objs, err = render.RenderDir(path, data) + objs, err := render.RenderDir(path, data) if err != nil { return nil, errs.Wrap(err, "failed to render OpenShiftSRIOV Network manifests") } diff --git a/controllers/sriovoperatorconfig_controller.go b/controllers/sriovoperatorconfig_controller.go index e7b96e860..bbedcb52f 100644 --- a/controllers/sriovoperatorconfig_controller.go +++ b/controllers/sriovoperatorconfig_controller.go @@ -166,8 +166,6 @@ func (r *SriovOperatorConfigReconciler) syncPluginDaemonSet(dc *sriovnetworkv1.S func (r *SriovOperatorConfigReconciler) syncConfigDaemonSet(dc *sriovnetworkv1.SriovOperatorConfig) error { logger := log.Log.WithName("syncConfigDaemonset") logger.Info("Start to sync config daemonset") - // var err error - objs := []*uns.Unstructured{} data := render.MakeRenderData() data.Data["Image"] = os.Getenv("SRIOV_NETWORK_CONFIG_DAEMON_IMAGE") diff --git a/pkg/apply/merge_test.go b/pkg/apply/merge_test.go index 6be880335..8079c91ae 100644 --- a/pkg/apply/merge_test.go +++ b/pkg/apply/merge_test.go @@ -256,6 +256,7 @@ metadata: g.Expect(err).NotTo(HaveOccurred()) s, ok, err := uns.NestedSlice(upd.Object, "secrets") + g.Expect(err).NotTo(HaveOccurred()) g.Expect(ok).To(BeTrue()) g.Expect(s).To(ConsistOf("foo")) } diff --git a/pkg/webhook/validate.go b/pkg/webhook/validate.go index 6121a6435..2819b9f09 100644 --- a/pkg/webhook/validate.go +++ b/pkg/webhook/validate.go @@ -165,6 +165,9 @@ func dynamicValidateSriovNetworkNodePolicy(cr *sriovnetworkv1.SriovNetworkNodePo nodeList, err := kubeclient.CoreV1().Nodes().List(context.Background(), metav1.ListOptions{ LabelSelector: labels.Set(cr.Spec.NodeSelector).String(), }) + if err != nil { + return false, err + } nsList, err := snclient.SriovnetworkV1().SriovNetworkNodeStates(namespace).List(context.Background(), metav1.ListOptions{}) if err != nil { return false, err diff --git a/pkg/webhook/webhook.go b/pkg/webhook/webhook.go index 6adb1a87e..44e7d28f4 100644 --- a/pkg/webhook/webhook.go +++ b/pkg/webhook/webhook.go @@ -51,8 +51,6 @@ func ValidateCustomResource(ar v1.AdmissionReview) *v1.AdmissionResponse { if ar.Request.Operation == "DELETE" { raw = ar.Request.OldObject.Raw - } else { - raw = ar.Request.Object.Raw } switch ar.Request.Kind.Kind { diff --git a/test/conformance/tests/sriov_operator.go b/test/conformance/tests/sriov_operator.go index 1cda9b7b7..c1db16ced 100644 --- a/test/conformance/tests/sriov_operator.go +++ b/test/conformance/tests/sriov_operator.go @@ -840,6 +840,7 @@ var _ = Describe("[sriov] operator", func() { By("Create first Pod which consumes all available VFs") sriovDevice, err := sriovInfos.FindOneSriovDevice(node) + Expect(err).ToNot(HaveOccurred()) ipam := `{"type": "host-local","ranges": [[{"subnet": "3ffe:ffff:0:01ff::/64"}]],"dataDir": "/run/my-orchestrator/container-ipam-state"}` err = network.CreateSriovNetwork(clients, sriovDevice, sriovNetworkName, namespaces.Test, operatorNamespace, resourceName, ipam) Expect(err).ToNot(HaveOccurred()) @@ -1209,7 +1210,7 @@ var _ = Describe("[sriov] operator", func() { BeforeEach(func() { var node string resourceName := "mturesource" - numVfs := 5 + var numVfs int var intf *sriovv1.InterfaceExt var err error @@ -1934,6 +1935,7 @@ func daemonsScheduledOnNodes(selector string) bool { nn, err := clients.Nodes().List(context.Background(), metav1.ListOptions{ LabelSelector: selector, }) + Expect(err).ToNot(HaveOccurred()) nodes := nn.Items daemons, err := clients.Pods(operatorNamespace).List(context.Background(), metav1.ListOptions{LabelSelector: "app=sriov-network-config-daemon"}) diff --git a/test/util/client/clients.go b/test/util/client/clients.go index 029f9c131..317424728 100644 --- a/test/util/client/clients.go +++ b/test/util/client/clients.go @@ -74,5 +74,8 @@ func New(kubeconfig string) *ClientSet { clientSet.Client, err = runtimeclient.New(config, client.Options{ Scheme: crScheme, }) + if err != nil { + return nil + } return clientSet } diff --git a/test/validation/tests/validation.go b/test/validation/tests/validation.go index 52090bf11..7979b31d6 100644 --- a/test/validation/tests/validation.go +++ b/test/validation/tests/validation.go @@ -45,13 +45,6 @@ const ( sriovOperatorConfigs = "sriovoperatorconfigs.sriovnetwork.openshift.io" ) -func init() { - roleWorkerCNF := os.Getenv("ROLE_WORKER_CNF") - if roleWorkerCNF == "" { - roleWorkerCNF = "worker-cnf" - } -} - var _ = Describe("validation", func() { Context("sriov", func() {