Remove deprecated libraries, update other libs, add ci v1.23 (#8118)

internal/ingress/annotations/auth/main.go

@@ -22,7 +22,6 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/pkg/errors"
 	api "k8s.io/api/core/v1"
 	networking "k8s.io/api/networking/v1"
 	"k8s.io/client-go/tools/cache"
@@ -118,14 +117,14 @@ func (a auth) Parse(ing *networking.Ingress) (interface{}, error) {
 	s, err := parser.GetStringAnnotation("auth-secret", ing)
 	if err != nil {
 		return nil, ing_errors.LocationDenied{
-			Reason: errors.Wrap(err, "error reading secret name from annotation"),
+			Reason: fmt.Errorf("error reading secret name from annotation: %w", err),
 		}
 	}
 
 	sns, sname, err := cache.SplitMetaNamespaceKey(s)
 	if err != nil {
 		return nil, ing_errors.LocationDenied{
-			Reason: errors.Wrap(err, "error reading secret name from annotation"),
+			Reason: fmt.Errorf("error reading secret name from annotation: %w", err),
 		}
 	}
 
@@ -137,7 +136,7 @@ func (a auth) Parse(ing *networking.Ingress) (interface{}, error) {
 	secret, err := a.r.GetSecret(name)
 	if err != nil {
 		return nil, ing_errors.LocationDenied{
-			Reason: errors.Wrapf(err, "unexpected error reading secret %v", name),
+			Reason: fmt.Errorf("unexpected error reading secret %s: %w", name, err),
 		}
 	}
 
@@ -158,7 +157,7 @@ func (a auth) Parse(ing *networking.Ingress) (interface{}, error) {
 		}
 	default:
 		return nil, ing_errors.LocationDenied{
-			Reason: errors.Wrap(err, "invalid auth-secret-type in annotation, must be 'auth-file' or 'auth-map'"),
+			Reason: fmt.Errorf("invalid auth-secret-type in annotation, must be 'auth-file' or 'auth-map': %w", err),
 		}
 	}
 
@@ -179,14 +178,14 @@ func dumpSecretAuthFile(filename string, secret *api.Secret) error {
 	val, ok := secret.Data["auth"]
 	if !ok {
 		return ing_errors.LocationDenied{
-			Reason: errors.Errorf("the secret %v does not contain a key with value auth", secret.Name),
+			Reason: fmt.Errorf("the secret %s does not contain a key with value auth", secret.Name),
 		}
 	}
 
 	err := os.WriteFile(filename, val, file.ReadWriteByUser)
 	if err != nil {
 		return ing_errors.LocationDenied{
-			Reason: errors.Wrap(err, "unexpected error creating password file"),
+			Reason: fmt.Errorf("unexpected error creating password file: %w", err),
 		}
 	}
 
@@ -205,7 +204,7 @@ func dumpSecretAuthMap(filename string, secret *api.Secret) error {
 	err := os.WriteFile(filename, []byte(builder.String()), file.ReadWriteByUser)
 	if err != nil {
 		return ing_errors.LocationDenied{
-			Reason: errors.Wrap(err, "unexpected error creating password file"),
+			Reason: fmt.Errorf("unexpected error creating password file: %w", err),
 		}
 	}
 

internal/ingress/annotations/auth/main_test.go

@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pkg/errors"
+	"errors"
 
 	api "k8s.io/api/core/v1"
 	networking "k8s.io/api/networking/v1"
@@ -81,7 +81,7 @@ type mockSecret struct {
 
 func (m mockSecret) GetSecret(name string) (*api.Secret, error) {
 	if name != "default/demo-secret" {
-		return nil, errors.Errorf("there is no secret with name %v", name)
+		return nil, fmt.Errorf("there is no secret with name %v", name)
 	}
 
 	return &api.Secret{

internal/ingress/annotations/authtls/main.go

@@ -17,7 +17,7 @@ limitations under the License.
 package authtls
 
 import (
-	"github.com/pkg/errors"
+	"fmt"
 	networking "k8s.io/api/networking/v1"
 
 	"regexp"
@@ -102,7 +102,7 @@ func (a authTLS) Parse(ing *networking.Ingress) (interface{}, error) {
 
 	authCert, err := a.r.GetAuthCertificate(tlsauthsecret)
 	if err != nil {
-		e := errors.Wrap(err, "error obtaining certificate")
+		e := fmt.Errorf("error obtaining certificate: %w", err)
 		return &Config{}, ing_errors.LocationDenied{Reason: e}
 	}
 	config.AuthSSLCert = *authCert

internal/ingress/annotations/defaultbackend/main.go

@@ -19,7 +19,6 @@ package defaultbackend
 import (
 	"fmt"
 
-	"github.com/pkg/errors"
 	networking "k8s.io/api/networking/v1"
 
 	"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
@@ -46,7 +45,7 @@ func (db backend) Parse(ing *networking.Ingress) (interface{}, error) {
 	name := fmt.Sprintf("%v/%v", ing.Namespace, s)
 	svc, err := db.r.GetService(name)
 	if err != nil {
-		return nil, errors.Wrapf(err, "unexpected error reading service %v", name)
+		return nil, fmt.Errorf("unexpected error reading service %s: %w", name, err)
 	}
 
 	return svc, nil

internal/ingress/annotations/fastcgi/main.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/pkg/errors"
 	networking "k8s.io/api/networking/v1"
 	"k8s.io/client-go/tools/cache"
 
@@ -85,7 +84,7 @@ func (a fastcgi) Parse(ing *networking.Ingress) (interface{}, error) {
 	cmns, cmn, err := cache.SplitMetaNamespaceKey(cm)
 	if err != nil {
 		return fcgiConfig, ing_errors.LocationDenied{
-			Reason: errors.Wrap(err, "error reading configmap name from annotation"),
+			Reason: fmt.Errorf("error reading configmap name from annotation: %w", err),
 		}
 	}
 
@@ -97,7 +96,7 @@ func (a fastcgi) Parse(ing *networking.Ingress) (interface{}, error) {
 	cmap, err := a.r.GetConfigMap(cm)
 	if err != nil {
 		return fcgiConfig, ing_errors.LocationDenied{
-			Reason: errors.Wrapf(err, "unexpected error reading configmap %v", cm),
+			Reason: fmt.Errorf("unexpected error reading configmap %s: %w", cm, err),
 		}
 	}
 

internal/ingress/annotations/globalratelimit/main.go

@@ -17,10 +17,10 @@ limitations under the License.
 package globalratelimit
 
 import (
+	"fmt"
 	"strings"
 	"time"
 
-	"github.com/pkg/errors"
 	networking "k8s.io/api/networking/v1"
 
 	"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
@@ -86,7 +86,7 @@ func (a globalratelimit) Parse(ing *networking.Ingress) (interface{}, error) {
 	windowSize, err := time.ParseDuration(rawWindowSize)
 	if err != nil {
 		return config, ing_errors.LocationDenied{
-			Reason: errors.Wrap(err, "failed to parse 'global-rate-limit-window' value"),
+			Reason: fmt.Errorf("failed to parse 'global-rate-limit-window' value: %w", err),
 		}
 	}
 

internal/ingress/annotations/globalratelimit/main_test.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/pkg/errors"
 	api "k8s.io/api/core/v1"
 	networking "k8s.io/api/networking/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -159,8 +158,7 @@ func TestGlobalRateLimiting(t *testing.T) {
 			},
 			&Config{},
 			ing_errors.LocationDenied{
-				Reason: errors.Wrap(fmt.Errorf(`time: unknown unit "mb" in duration "2mb"`),
-					"failed to parse 'global-rate-limit-window' value"),
+				Reason: fmt.Errorf("failed to parse 'global-rate-limit-window' value: time: unknown unit \"mb\" in duration \"2mb\""),
 			},
 		},
 	}

internal/ingress/annotations/ipwhitelist/main.go

@@ -17,11 +17,10 @@ limitations under the License.
 package ipwhitelist
 
 import (
+	"fmt"
 	"sort"
 	"strings"
 
-	"github.com/pkg/errors"
-
 	networking "k8s.io/api/networking/v1"
 	"k8s.io/ingress-nginx/internal/net"
 
@@ -75,7 +74,7 @@ func (a ipwhitelist) Parse(ing *networking.Ingress) (interface{}, error) {
 	ipnets, ips, err := net.ParseIPNets(values...)
 	if err != nil && len(ips) == 0 {
 		return &SourceRange{CIDR: defBackend.WhitelistSourceRange}, ing_errors.LocationDenied{
-			Reason: errors.Wrap(err, "the annotation does not contain a valid IP address or network"),
+			Reason: fmt.Errorf("the annotation does not contain a valid IP address or network: %w", err),
 		}
 	}
 

internal/ingress/annotations/proxyssl/main.go

@@ -17,11 +17,11 @@ limitations under the License.
 package proxyssl
 
 import (
+	"fmt"
 	"regexp"
 	"sort"
 	"strings"
 
-	"github.com/pkg/errors"
 	networking "k8s.io/api/networking/v1"
 	"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
 	ing_errors "k8s.io/ingress-nginx/internal/ingress/errors"
@@ -132,7 +132,7 @@ func (p proxySSL) Parse(ing *networking.Ingress) (interface{}, error) {
 
 	proxyCert, err := p.r.GetAuthCertificate(proxysslsecret)
 	if err != nil {
-		e := errors.Wrap(err, "error obtaining certificate")
+		e := fmt.Errorf("error obtaining certificate: %w", err)
 		return &Config{}, ing_errors.LocationDenied{Reason: e}
 	}
 	config.AuthSSLCert = *proxyCert