networks: Add Owner annottion to NetAttachDefs

zeeke · zeeke · commit ba3ea22ad388 · 2025-06-09T10:19:34.000+02:00
NetworkattachmentDefiitions are usually created in namespaces that are different
than the Sriov{Ib,OVS}Networks, so the OwnerReference object field can't be
used to endorse the ownership reference.

Add a `sriovnetwork.openshift.io/owner` annotation to put on the NetAttachDef
to avoid multiple {Sriov,SriovIb,OVS}Network objects does not override changes.

Signed-off-by: Andrea Panattoni &lt;apanatto@redhat.com&gt;
diff --git a/api/v1/helper.go b/api/v1/helper.go
@@ -651,6 +651,7 @@ func (cr *SriovIBNetwork) RenderNetAttDef() (*uns.Unstructured, error) {
 	} else {
 		data.Data["SriovNetworkNamespace"] = cr.Spec.NetworkNamespace
 	}
+	data.Data["Owner"] = cr.GroupVersionKind().GroupKind().String() + "/" + cr.GetNamespace() + "/" + cr.Name
 	data.Data["SriovCniResourceName"] = os.Getenv("RESOURCE_PREFIX") + "/" + cr.Spec.ResourceName
 
 	data.Data["StateConfigured"] = true
@@ -719,6 +720,7 @@ func (cr *SriovNetwork) RenderNetAttDef() (*uns.Unstructured, error) {
 	} else {
 		data.Data["SriovNetworkNamespace"] = cr.Spec.NetworkNamespace
 	}
+	data.Data["Owner"] = cr.GroupVersionKind().GroupKind().String() + "/" + cr.GetNamespace() + "/" + cr.Name
 	data.Data["SriovCniResourceName"] = os.Getenv("RESOURCE_PREFIX") + "/" + cr.Spec.ResourceName
 	data.Data["SriovCniVlan"] = cr.Spec.Vlan
 
@@ -837,6 +839,7 @@ func (cr *OVSNetwork) RenderNetAttDef() (*uns.Unstructured, error) {
 	} else {
 		data.Data["NetworkNamespace"] = cr.Spec.NetworkNamespace
 	}
+	data.Data["Owner"] = cr.GroupVersionKind().GroupKind().String() + "/" + cr.GetNamespace() + "/" + cr.Name
 	data.Data["CniResourceName"] = os.Getenv("RESOURCE_PREFIX") + "/" + cr.Spec.ResourceName
 
 	if cr.Spec.Capabilities == "" {
diff --git a/api/v1/helper_test.go b/api/v1/helper_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	intstrutil "k8s.io/apimachinery/pkg/util/intstr"
 
@@ -194,10 +195,8 @@ func TestRendering(t *testing.T) {
 			if err != nil {
 				t.Fatalf("failed reading .golden: %s", err)
 			}
-			t.Log(b.String())
-			if !bytes.Equal(b.Bytes(), g) {
-				t.Errorf("bytes do not match .golden file")
-			}
+
+			assert.Equal(t, string(g), b.String(), "bytes do not match .golden file [%s]", gp)
 		})
 	}
 }
@@ -241,10 +240,8 @@ func TestIBRendering(t *testing.T) {
 			if err != nil {
 				t.Fatalf("failed reading .golden: %s", err)
 			}
-			t.Log(b.String())
-			if !bytes.Equal(b.Bytes(), g) {
-				t.Errorf("bytes do not match .golden file")
-			}
+
+			assert.Equal(t, string(g), b.String(), "bytes do not match .golden file [%s]", gp)
 		})
 	}
 }
@@ -334,10 +331,8 @@ func TestOVSRendering(t *testing.T) {
 			if err != nil {
 				t.Fatalf("failed reading .golden: %s", err)
 			}
-			t.Log(b.String())
-			if !bytes.Equal(b.Bytes(), g) {
-				t.Errorf("bytes do not match .golden file")
-			}
+
+			assert.Equal(t, string(g), b.String(), "bytes do not match .golden file [%s]", gp)
 		})
 	}
 }
diff --git a/api/v1/testdata/TestIBRendering/simpleib.golden b/api/v1/testdata/TestIBRendering/simpleib.golden
@@ -3,7 +3,8 @@
   "kind": "NetworkAttachmentDefinition",
   "metadata": {
     "annotations": {
-      "k8s.v1.cni.cncf.io/resourceName": "/testresource"
+      "k8s.v1.cni.cncf.io/resourceName": "/testresource",
+      "sriovnetwork.openshift.io/owner": "//test"
     },
     "name": null,
     "namespace": "testnamespace"
diff --git a/api/v1/testdata/TestOVSRendering/chained.golden b/api/v1/testdata/TestOVSRendering/chained.golden
@@ -3,7 +3,8 @@
   "kind": "NetworkAttachmentDefinition",
   "metadata": {
     "annotations": {
-      "k8s.v1.cni.cncf.io/resourceName": "/testresource"
+      "k8s.v1.cni.cncf.io/resourceName": "/testresource",
+      "sriovnetwork.openshift.io/owner": "//test"
     },
     "name": "test",
     "namespace": "testnamespace"
diff --git a/api/v1/testdata/TestOVSRendering/complexconf.golden b/api/v1/testdata/TestOVSRendering/complexconf.golden
@@ -3,7 +3,8 @@
   "kind": "NetworkAttachmentDefinition",
   "metadata": {
     "annotations": {
-      "k8s.v1.cni.cncf.io/resourceName": "/testresource"
+      "k8s.v1.cni.cncf.io/resourceName": "/testresource",
+      "sriovnetwork.openshift.io/owner": "//test"
     },
     "name": "test",
     "namespace": "testnamespace"
diff --git a/api/v1/testdata/TestOVSRendering/simpleovs.golden b/api/v1/testdata/TestOVSRendering/simpleovs.golden
@@ -3,7 +3,8 @@
   "kind": "NetworkAttachmentDefinition",
   "metadata": {
     "annotations": {
-      "k8s.v1.cni.cncf.io/resourceName": "/testresource"
+      "k8s.v1.cni.cncf.io/resourceName": "/testresource",
+      "sriovnetwork.openshift.io/owner": "//test"
     },
     "name": "test",
     "namespace": "testnamespace"
diff --git a/api/v1/testdata/TestRendering/chained.golden b/api/v1/testdata/TestRendering/chained.golden
@@ -3,7 +3,8 @@
   "kind": "NetworkAttachmentDefinition",
   "metadata": {
     "annotations": {
-      "k8s.v1.cni.cncf.io/resourceName": "/testresource"
+      "k8s.v1.cni.cncf.io/resourceName": "/testresource",
+      "sriovnetwork.openshift.io/owner": "//test"
     },
     "name": null,
     "namespace": "testnamespace"
diff --git a/api/v1/testdata/TestRendering/simple.golden b/api/v1/testdata/TestRendering/simple.golden
@@ -3,7 +3,8 @@
   "kind": "NetworkAttachmentDefinition",
   "metadata": {
     "annotations": {
-      "k8s.v1.cni.cncf.io/resourceName": "/testresource"
+      "k8s.v1.cni.cncf.io/resourceName": "/testresource",
+      "sriovnetwork.openshift.io/owner": "//test"
     },
     "name": null,
     "namespace": "testnamespace"
diff --git a/bindata/manifests/cni-config/ovs/ovs-cni-config.yaml b/bindata/manifests/cni-config/ovs/ovs-cni-config.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: {{.NetworkNamespace}}
   annotations:
     k8s.v1.cni.cncf.io/resourceName: {{.CniResourceName}}
+    sriovnetwork.openshift.io/owner: {{.Owner}}
 spec:
   config: '{
   "cniVersion":"1.0.0",
diff --git a/bindata/manifests/cni-config/sriov/sriov-cni-config.yaml b/bindata/manifests/cni-config/sriov/sriov-cni-config.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: {{.SriovNetworkNamespace}}
   annotations:
     k8s.v1.cni.cncf.io/resourceName: {{.SriovCniResourceName}}
+    sriovnetwork.openshift.io/owner: {{.Owner}}
 spec:
   config: '{
   "cniVersion":"1.0.0",
diff --git a/controllers/generic_network_controller.go b/controllers/generic_network_controller.go
@@ -38,6 +38,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	sriovnetworkv1 "github.com/k8snetworkplumbingwg/sriov-network-operator/api/v1"
+	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/consts"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/utils"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/vars"
 )
@@ -180,6 +181,20 @@ func (r *genericNetworkReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 		}
 	} else {
 		reqLogger.Info("NetworkAttachmentDefinition CR already exist")
+
+		foundOwner := found.GetAnnotations()[consts.OwnerAnnotation]
+		expectedOwner := netAttDef.GetAnnotations()[consts.OwnerAnnotation]
+
+		// Note for the future: the `foundOwner != ""` condition can be removed to make the oeprator not touching the NetworkAttachmentDefinition created
+		// by the user.
+		if foundOwner != "" && foundOwner != expectedOwner {
+			reqLogger.Info("A NetworkAttachmentDefinition with the same name already exists and it does not belong to this resource",
+				"Namespace", netAttDef.Namespace, "Name", netAttDef.Name,
+				"CurrentOwner", foundOwner, "ExpectedOwner", expectedOwner,
+			)
+			return reconcile.Result{}, err
+		}
+
 		if !equality.Semantic.DeepEqual(found.Spec, netAttDef.Spec) || !equality.Semantic.DeepEqual(found.GetAnnotations(), netAttDef.GetAnnotations()) {
 			reqLogger.Info("Update NetworkAttachmentDefinition CR", "Namespace", netAttDef.Namespace, "Name", netAttDef.Name)
 			netAttDef.SetResourceVersion(found.GetResourceVersion())
diff --git a/controllers/generic_network_controller_test.go b/controllers/generic_network_controller_test.go
@@ -0,0 +1,187 @@
+package controllers
+
+import (
+	"context"
+	"sync"
+	"time"
+
+	netattdefv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/ptr"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+
+	sriovnetworkv1 "github.com/k8snetworkplumbingwg/sriov-network-operator/api/v1"
+	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/consts"
+	"github.com/k8snetworkplumbingwg/sriov-network-operator/test/util"
+)
+
+var _ = Describe("All Network Controllers", Ordered, func() {
+	var cancel context.CancelFunc
+	var ctx context.Context
+
+	BeforeAll(func() {
+		By("Setup controller manager")
+		k8sManager, err := setupK8sManagerForTest()
+		Expect(err).ToNot(HaveOccurred())
+
+		err = (&SriovNetworkReconciler{
+			Client: k8sManager.GetClient(),
+			Scheme: k8sManager.GetScheme(),
+		}).SetupWithManager(k8sManager)
+		Expect(err).ToNot(HaveOccurred())
+
+		err = (&SriovIBNetworkReconciler{
+			Client: k8sManager.GetClient(),
+			Scheme: k8sManager.GetScheme(),
+		}).SetupWithManager(k8sManager)
+		Expect(err).ToNot(HaveOccurred())
+
+		err = (&OVSNetworkReconciler{
+			Client: k8sManager.GetClient(),
+			Scheme: k8sManager.GetScheme(),
+		}).SetupWithManager(k8sManager)
+		Expect(err).ToNot(HaveOccurred())
+
+		ctx, cancel = context.WithCancel(context.Background())
+
+		wg := sync.WaitGroup{}
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			defer GinkgoRecover()
+			By("Start controller manager")
+			err := k8sManager.Start(ctx)
+			Expect(err).ToNot(HaveOccurred())
+		}()
+
+		DeferCleanup(func() {
+			By("Shutdown controller manager")
+			cancel()
+			wg.Wait()
+		})
+	})
+
+	Context("owner-reference annotations", func() {
+		AfterEach(func() {
+			k8sClient.DeleteAllOf(ctx, &sriovnetworkv1.SriovNetwork{}, client.InNamespace(testNamespace))
+			k8sClient.DeleteAllOf(ctx, &sriovnetworkv1.SriovIBNetwork{}, client.InNamespace(testNamespace))
+			k8sClient.DeleteAllOf(ctx, &sriovnetworkv1.OVSNetwork{}, client.InNamespace(testNamespace))
+			k8sClient.DeleteAllOf(ctx, &netattdefv1.NetworkAttachmentDefinition{}, client.InNamespace("default"))
+		})
+
+		It("applies to new netattachdef", func() {
+			cr := sriovnetworkv1.SriovNetwork{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "sriovnet-blue",
+					Namespace: testNamespace,
+				},
+				Spec: sriovnetworkv1.SriovNetworkSpec{
+					NetworkNamespace: "default",
+				},
+			}
+
+			err := k8sClient.Create(ctx, &cr)
+			Expect(err).NotTo(HaveOccurred())
+
+			netAttDef := &netattdefv1.NetworkAttachmentDefinition{}
+			err = util.WaitForNamespacedObject(netAttDef, k8sClient, "default", cr.GetName(), util.RetryInterval, util.Timeout)
+			Expect(err).NotTo(HaveOccurred())
+
+			Expect(netAttDef.GetAnnotations()).To(HaveKeyWithValue(consts.OwnerAnnotation, "SriovNetwork.sriovnetwork.openshift.io/openshift-sriov-network-operator/sriovnet-blue"))
+		})
+
+		It("should migrate existing NetAttachDef to have a value for Owner annotation", func() {
+			netAttachDef := netattdefv1.NetworkAttachmentDefinition{
+				ObjectMeta: metav1.ObjectMeta{Name: "netuser", Namespace: "default"},
+				Spec: netattdefv1.NetworkAttachmentDefinitionSpec{
+					Config: "user created configration, to be overridden",
+				},
+			}
+			err := k8sClient.Create(ctx, &netAttachDef)
+			Expect(err).NotTo(HaveOccurred())
+
+			cr := sriovnetworkv1.SriovNetwork{
+				ObjectMeta: metav1.ObjectMeta{Name: "netuser", Namespace: testNamespace},
+				Spec:       sriovnetworkv1.SriovNetworkSpec{NetworkNamespace: "default"},
+			}
+			err = k8sClient.Create(ctx, &cr)
+			Expect(err).NotTo(HaveOccurred())
+
+			Eventually(func(g Gomega) {
+				netAttDef := &netattdefv1.NetworkAttachmentDefinition{}
+				err = util.WaitForNamespacedObject(netAttDef, k8sClient, "default", cr.GetName(), util.RetryInterval, util.Timeout)
+				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(netAttDef.GetAnnotations()).
+					To(HaveKeyWithValue(consts.OwnerAnnotation, "SriovNetwork.sriovnetwork.openshift.io/openshift-sriov-network-operator/netuser"))
+				g.Expect(netAttDef.Spec.Config).To(Equal(generateExpectedNetConfig(&cr)))
+			}).WithPolling(30 * time.Millisecond).WithTimeout(300 * time.Millisecond).Should(Succeed())
+		})
+
+		Context("does not override the NetAttachDefinition if the Owner annotation does not match", func() {
+			It("when using different network type with the same name", func() {
+				cr := sriovnetworkv1.SriovNetwork{
+					ObjectMeta: metav1.ObjectMeta{Name: "net1", Namespace: testNamespace},
+					Spec:       sriovnetworkv1.SriovNetworkSpec{NetworkNamespace: "default"},
+				}
+				err := k8sClient.Create(ctx, &cr)
+				Expect(err).NotTo(HaveOccurred())
+
+				netAttDef := &netattdefv1.NetworkAttachmentDefinition{}
+				err = util.WaitForNamespacedObject(netAttDef, k8sClient, "default", cr.GetName(), util.RetryInterval, util.Timeout)
+				Expect(err).NotTo(HaveOccurred())
+
+				cr2 := sriovnetworkv1.SriovIBNetwork{
+					ObjectMeta: metav1.ObjectMeta{Name: "net1", Namespace: testNamespace},
+					Spec:       sriovnetworkv1.SriovIBNetworkSpec{NetworkNamespace: "default"},
+				}
+				err = k8sClient.Create(ctx, &cr2)
+				Expect(err).NotTo(HaveOccurred())
+
+				Consistently(func(g Gomega) {
+					netAttDef := &netattdefv1.NetworkAttachmentDefinition{}
+					err = util.WaitForNamespacedObject(netAttDef, k8sClient, "default", cr.GetName(), util.RetryInterval, util.Timeout)
+					g.Expect(err).NotTo(HaveOccurred())
+					g.Expect(netAttDef.Spec.Config).To(ContainSubstring(`"sriov"`))
+					g.Expect(netAttDef.Spec.Config).ToNot(ContainSubstring(`"ib-sriov"`))
+				}).WithPolling(30 * time.Millisecond).WithTimeout(300 * time.Millisecond).Should(Succeed())
+			})
+
+			It("when using the same network type with the same name, in different namespaces", func() {
+				cr := sriovnetworkv1.SriovNetwork{
+					ObjectMeta: metav1.ObjectMeta{Name: "net2", Namespace: testNamespace},
+					Spec: sriovnetworkv1.SriovNetworkSpec{
+						NetworkNamespace: "default",
+						MinTxRate:        ptr.To(42),
+					},
+				}
+				err := k8sClient.Create(ctx, &cr)
+				Expect(err).NotTo(HaveOccurred())
+
+				netAttDef := &netattdefv1.NetworkAttachmentDefinition{}
+				err = util.WaitForNamespacedObject(netAttDef, k8sClient, "default", cr.GetName(), util.RetryInterval, util.Timeout)
+				Expect(err).NotTo(HaveOccurred())
+
+				cr2 := sriovnetworkv1.SriovNetwork{
+					ObjectMeta: metav1.ObjectMeta{Name: "net2", Namespace: "default"},
+					Spec: sriovnetworkv1.SriovNetworkSpec{
+						MinTxRate: ptr.To(84),
+					},
+				}
+				err = k8sClient.Create(ctx, &cr2)
+				Expect(err).NotTo(HaveOccurred())
+
+				Consistently(func(g Gomega) {
+					netAttDef := &netattdefv1.NetworkAttachmentDefinition{}
+					err = util.WaitForNamespacedObject(netAttDef, k8sClient, "default", cr.GetName(), util.RetryInterval, util.Timeout)
+					g.Expect(err).NotTo(HaveOccurred())
+					g.Expect(netAttDef.Spec.Config).To(ContainSubstring(`"min_tx_rate": 42`))
+					g.Expect(netAttDef.Spec.Config).ToNot(ContainSubstring(`"min_tx_rate": 84`))
+				}).WithPolling(30 * time.Millisecond).WithTimeout(300 * time.Millisecond).Should(Succeed())
+			})
+		})
+	})
+
+})
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -31,8 +31,10 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
+	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/config"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
@@ -67,6 +69,9 @@ func setupK8sManagerForTest() (manager.Manager, error) {
 	k8sManager, err := ctrl.NewManager(cfg, ctrl.Options{
 		Scheme:  scheme.Scheme,
 		Metrics: server.Options{BindAddress: "0"}, // we don't need metrics server for tests
+		Controller: config.Controller{
+			SkipNameValidation: ptr.To(true),
+		},
 	})
 
 	if err != nil {
diff --git a/pkg/consts/constants.go b/pkg/consts/constants.go
@@ -98,6 +98,8 @@ const (
 	MCPPauseAnnotationState = "sriovnetwork.openshift.io/state"
 	MCPPauseAnnotationTime  = "sriovnetwork.openshift.io/time"
 
+	OwnerAnnotation = "sriovnetwork.openshift.io/owner"
+
 	// NodeStateKeepUntilAnnotation contains name of the "keep until time" annotation for SriovNetworkNodeState object.
 	// The "keep until time" specifies the earliest time at which the state object can be removed
 	// if the daemon's pod is not found on the node.

Original file line number	Diff line number	Diff line change
`@@ -651,6 +651,7 @@ func (cr SriovIBNetwork) RenderNetAttDef() (uns.Unstructured, error) {`
`651`	`651`	`} else {`
`652`	`652`	`data.Data["SriovNetworkNamespace"] = cr.Spec.NetworkNamespace`
`653`	`653`	`}`
	`654`	`+ data.Data["Owner"] = cr.GroupVersionKind().GroupKind().String() + "/" + cr.GetNamespace() + "/" + cr.Name`
`654`	`655`	`data.Data["SriovCniResourceName"] = os.Getenv("RESOURCE_PREFIX") + "/" + cr.Spec.ResourceName`
`655`	`656`
`656`	`657`	`data.Data["StateConfigured"] = true`
`@@ -719,6 +720,7 @@ func (cr SriovNetwork) RenderNetAttDef() (uns.Unstructured, error) {`
`719`	`720`	`} else {`
`720`	`721`	`data.Data["SriovNetworkNamespace"] = cr.Spec.NetworkNamespace`
`721`	`722`	`}`
	`723`	`+ data.Data["Owner"] = cr.GroupVersionKind().GroupKind().String() + "/" + cr.GetNamespace() + "/" + cr.Name`
`722`	`724`	`data.Data["SriovCniResourceName"] = os.Getenv("RESOURCE_PREFIX") + "/" + cr.Spec.ResourceName`
`723`	`725`	`data.Data["SriovCniVlan"] = cr.Spec.Vlan`
`724`	`726`
`@@ -837,6 +839,7 @@ func (cr OVSNetwork) RenderNetAttDef() (uns.Unstructured, error) {`
`837`	`839`	`} else {`
`838`	`840`	`data.Data["NetworkNamespace"] = cr.Spec.NetworkNamespace`
`839`	`841`	`}`
	`842`	`+ data.Data["Owner"] = cr.GroupVersionKind().GroupKind().String() + "/" + cr.GetNamespace() + "/" + cr.Name`
`840`	`843`	`data.Data["CniResourceName"] = os.Getenv("RESOURCE_PREFIX") + "/" + cr.Spec.ResourceName`
`841`	`844`
`842`	`845`	`if cr.Spec.Capabilities == "" {`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import (`
`10`	`10`	`"testing"`
`11`	`11`
`12`	`12`	`"github.com/google/go-cmp/cmp"`
	`13`	`+ "github.com/stretchr/testify/assert"`
`13`	`14`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`14`	`15`	`intstrutil "k8s.io/apimachinery/pkg/util/intstr"`
`15`	`16`
`@@ -194,10 +195,8 @@ func TestRendering(t *testing.T) {`
`194`	`195`	`if err != nil {`
`195`	`196`	`t.Fatalf("failed reading .golden: %s", err)`
`196`	`197`	`}`
`197`		`- t.Log(b.String())`
`198`		`- if !bytes.Equal(b.Bytes(), g) {`
`199`		`- t.Errorf("bytes do not match .golden file")`
`200`		`- }`
	`198`	`+`
	`199`	`+ assert.Equal(t, string(g), b.String(), "bytes do not match .golden file [%s]", gp)`
`201`	`200`	`})`
`202`	`201`	`}`
`203`	`202`	`}`
`@@ -241,10 +240,8 @@ func TestIBRendering(t *testing.T) {`
`241`	`240`	`if err != nil {`
`242`	`241`	`t.Fatalf("failed reading .golden: %s", err)`
`243`	`242`	`}`
`244`		`- t.Log(b.String())`
`245`		`- if !bytes.Equal(b.Bytes(), g) {`
`246`		`- t.Errorf("bytes do not match .golden file")`
`247`		`- }`
	`243`	`+`
	`244`	`+ assert.Equal(t, string(g), b.String(), "bytes do not match .golden file [%s]", gp)`
`248`	`245`	`})`
`249`	`246`	`}`
`250`	`247`	`}`
`@@ -334,10 +331,8 @@ func TestOVSRendering(t *testing.T) {`
`334`	`331`	`if err != nil {`
`335`	`332`	`t.Fatalf("failed reading .golden: %s", err)`
`336`	`333`	`}`
`337`		`- t.Log(b.String())`
`338`		`- if !bytes.Equal(b.Bytes(), g) {`
`339`		`- t.Errorf("bytes do not match .golden file")`
`340`		`- }`
	`334`	`+`
	`335`	`+ assert.Equal(t, string(g), b.String(), "bytes do not match .golden file [%s]", gp)`
`341`	`336`	`})`
`342`	`337`	`}`
`343`	`338`	`}`