diff --git a/pkg/udn/primary_network.go b/pkg/udn/primary_network.go index d581e95..a6362d2 100644 --- a/pkg/udn/primary_network.go +++ b/pkg/udn/primary_network.go @@ -17,13 +17,13 @@ func FindPrimaryNetwork(ctx context.Context, namespace string) (*v1.NetworkAttachmentDefinition, error) { nadList := v1.NetworkAttachmentDefinitionList{} if err := cli.List(ctx, &nadList, client.InNamespace(namespace)); err != nil { - return nil, fmt.Errorf("failed listing nads for pod namespace %q", namespace) + return nil, fmt.Errorf("failed listing nads for pod namespace %q: %w", namespace, err) } for _, nad := range nadList.Items { netConfig, err := config.NewConfig(nad.Spec.Config) if err != nil { - return nil, fmt.Errorf("failed to extract the relevant NAD information") + return nil, fmt.Errorf("failed to extract the relevant NAD information: %w", err) } if netConfig.Role == config.NetworkRolePrimary { return ptr.To(nad), nil diff --git a/pkg/vminetworkscontroller/vmi_controller_test.go b/pkg/vminetworkscontroller/vmi_controller_test.go index 35ffc2e..15c27d7 100644 --- a/pkg/vminetworkscontroller/vmi_controller_test.go +++ b/pkg/vminetworkscontroller/vmi_controller_test.go @@ -126,7 +126,7 @@ var _ = Describe("VMI IPAM controller", Serial, func() { vmiReconciler := NewVMIReconciler(mgr) if config.expectedError != nil { _, err := vmiReconciler.Reconcile(context.Background(), controllerruntime.Request{NamespacedName: vmiKey}) - Expect(err).To(MatchError(config.expectedError)) + Expect(err).To(MatchError(config.expectedError.Error())) } else { Expect( vmiReconciler.Reconcile(context.Background(), controllerruntime.Request{NamespacedName: vmiKey}), @@ -198,7 +198,7 @@ var _ = Describe("VMI IPAM controller", Serial, func() { inputNADs: []*nadv1.NetworkAttachmentDefinition{ dummyNADWrongFormat(nadName), }, - expectedError: fmt.Errorf("failed to extract the relevant NAD information"), + expectedError: fmt.Errorf("failed to extract the relevant NAD information: failed to extract CNI configuration from NAD: invalid character 'h' in literal true (expecting 'r')"), }), Entry("the associated VMI exists but points to a NAD that doesn't exist", testConfig{ inputVM: dummyVM(dummyVMISpec(nadName)),