Merge branch 'main' into fix/proxy-buffer-configmap

Author: vepatel

cmd/nginx-ingress/utils.go

@@ -11,7 +11,7 @@ func getBuildInfo() (commitHash string, commitTime string, dirtyBuild string) {
 
 	info, ok := debug.ReadBuildInfo()
 	if !ok {
-		return
+		return commitHash, commitTime, dirtyBuild
 	}
 	for _, kv := range info.Settings {
 		switch kv.Key {

internal/certmanager/test_files/context_builder.go

@@ -158,10 +158,10 @@ func (b *Builder) EnsureReactorCalled(testName string, fn coretesting.ReactionFu
 	return func(action coretesting.Action) (handled bool, ret runtime.Object, err error) {
 		handled, ret, err = fn(action)
 		if !handled {
-			return
+			return handled, ret, err
 		}
 		b.requiredReactors[testName] = true
-		return
+		return handled, ret, err
 	}
 }
 

internal/certmanager/test_files/reactors.go

@@ -44,7 +44,7 @@ func ObjectCreatedReactor(t *testing.T, b *Builder, expectedObj runtime.Object)
 	return func(action coretesting.Action) (handled bool, ret runtime.Object, err error) {
 		createAction, ok := action.(coretesting.CreateAction)
 		if !ok {
-			return
+			return handled, ret, err
 		}
 		obj := createAction.GetObject()
 		if !reflect.DeepEqual(obj, expectedObj) {
@@ -60,7 +60,7 @@ func ObjectDeletedReactor(t *testing.T, b *Builder, obj runtime.Object) coretest
 	return func(action coretesting.Action) (handled bool, ret runtime.Object, err error) {
 		delAction, ok := action.(coretesting.DeleteAction)
 		if !ok {
-			return
+			return handled, ret, err
 		}
 
 		namespace, name := delAction.GetNamespace(), delAction.GetName()

internal/k8s/utils.go

@@ -47,7 +47,7 @@ func (s *storeToIngressLister) GetByKeySafe(key string) (ing *networking.Ingress
 		return nil, exists, err
 	}
 	ing = item.(*networking.Ingress).DeepCopy()
-	return
+	return ing, exists, err
 }
 
 // List lists all Ingress' in the store.