DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ricardo Katz 2022-01-09 21:29:12 -03:00 • committed by GitHub
parent c917ffacd2
commit 38c73233f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 97 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

7
internal/file/structure.go
View file

@ -17,9 +17,8 @@ limitations under the License.
package file
import (
"fmt"
"os"
"github.com/pkg/errors"
)
const (
@ -50,13 +49,13 @@ func CreateRequiredDirectories() error {
if os.IsNotExist(err) {
err = os.MkdirAll(directory, ReadWriteByUser)
if err != nil {
return errors.Wrapf(err, "creating directory '%v'", directory)
return fmt.Errorf("creating directory %s: %w", directory, err)
}
continue
}
return errors.Wrapf(err, "checking directory %v", directory)
return fmt.Errorf("checking directory %s: %w", directory, err)
}
}

15
internal/ingress/annotations/auth/main.go
View file

@ -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),
}
}

4
internal/ingress/annotations/auth/main_test.go
View file

@ -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{

4
internal/ingress/annotations/authtls/main.go
View file

@ -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

3
internal/ingress/annotations/defaultbackend/main.go
View file

@ -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

5
internal/ingress/annotations/fastcgi/main.go
View file

@ -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),
}
}

4
internal/ingress/annotations/globalratelimit/main.go
View file

@ -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),
}
}

4
internal/ingress/annotations/globalratelimit/main_test.go
View file

@ -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\""),
},
},
}

5
internal/ingress/annotations/ipwhitelist/main.go
View file

@ -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),
}
}

4
internal/ingress/annotations/proxyssl/main.go
View file

@ -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

11
internal/ingress/controller/checker.go
View file

@ -24,7 +24,6 @@ import (
"strings"
"github.com/ncabatoff/process-exporter/proc"
"github.com/pkg/errors"
"k8s.io/ingress-nginx/internal/nginx"
)
@ -43,27 +42,27 @@ func (n *NGINXController) Check(_ *http.Request) error {
// check the nginx master process is running
fs, err := proc.NewFS("/proc", false)
if err != nil {
return errors.Wrap(err, "reading /proc directory")
return fmt.Errorf("reading /proc directory: %w", err)
}
f, err := os.ReadFile(nginx.PID)
if err != nil {
return errors.Wrapf(err, "reading %v", nginx.PID)
return fmt.Errorf("reading %v: %w", nginx.PID, err)
}
pid, err := strconv.Atoi(strings.TrimRight(string(f), "\r\n"))
if err != nil {
return errors.Wrapf(err, "reading NGINX PID from file %v", nginx.PID)
return fmt.Errorf("reading NGINX PID from file %v: %w", nginx.PID, err)
}
_, err = fs.Proc(pid)
if err != nil {
return errors.Wrapf(err, "checking for NGINX process with PID %v", pid)
return fmt.Errorf("checking for NGINX process with PID %v: %w", pid, err)
}
statusCode, _, err := nginx.NewGetStatusRequest("/is-dynamic-lb-initialized")
if err != nil {
return errors.Wrapf(err, "checking if the dynamic load balancer started")
return fmt.Errorf("checking if the dynamic load balancer started: %w", err)
}
if statusCode != 200 {

3
internal/ingress/controller/store/backend_ssl.go
View file

@ -22,7 +22,6 @@ import (
"k8s.io/klog/v2"
"github.com/pkg/errors"
apiv1 "k8s.io/api/core/v1"
networking "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -180,7 +179,7 @@ func (s *k8sStore) getPemCertificate(secretName string) (*ingress.SSLCert, error
if secretName == s.defaultSSLCertificate {
path, err := ssl.StoreSSLCertOnDisk(nsSecName, sslCert)
if err != nil {
return nil, errors.Wrap(err, "storing default SSL Certificate")
return nil, fmt.Errorf("storing default SSL Certificate: %w", err)
}
sslCert.PemFileName = path

4
internal/ingress/controller/template/template.go
View file

@ -36,8 +36,6 @@ import (
text_template "text/template"
"time"
"github.com/pkg/errors"
networkingv1 "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/klog/v2"
@ -81,7 +79,7 @@ type Template struct {
func NewTemplate(file string) (*Template, error) {
data, err := os.ReadFile(file)
if err != nil {
return nil, errors.Wrapf(err, "unexpected error reading template %v", file)
return nil, fmt.Errorf("unexpected error reading template %s: %w", file, err)
}
tmpl, err := text_template.New("nginx.tmpl").Funcs(funcMap).Parse(string(data))

7
internal/ingress/errors/errors.go
View file

@ -17,9 +17,8 @@ limitations under the License.
package errors
import (
"errors"
"fmt"
"github.com/pkg/errors"
)
var (
@ -50,7 +49,7 @@ func NewInvalidAnnotationContent(name string, val interface{}) error {
// NewLocationDenied returns a new LocationDenied error
func NewLocationDenied(reason string) error {
return LocationDenied{
Reason: errors.Errorf("Location denied, reason: %v", reason),
Reason: fmt.Errorf("Location denied, reason: %v", reason),
}
}
@ -109,5 +108,5 @@ func New(m string) error {
// Errorf formats according to a format specifier and returns the string
// as a value that satisfies error.
func Errorf(format string, args ...interface{}) error {
return errors.Errorf(format, args...)
return fmt.Errorf(format, args...)
}

3
internal/ingress/status/status.go
View file

@ -25,7 +25,6 @@ import (
"strings"
"time"
"github.com/pkg/errors"
"k8s.io/klog/v2"
pool "gopkg.in/go-playground/pool.v3"
@ -294,7 +293,7 @@ func runUpdate(ing *ingress.Ingress, status []apiv1.LoadBalancerIngress,
ingClient := client.NetworkingV1().Ingresses(ing.Namespace)
currIng, err := ingClient.Get(context.TODO(), ing.Name, metav1.GetOptions{})
if err != nil {
return nil, errors.Wrap(err, fmt.Sprintf("unexpected error searching Ingress %v/%v", ing.Namespace, ing.Name))
return nil, fmt.Errorf("unexpected error searching Ingress %s/%s: %w", ing.Namespace, ing.Name, err)
}
klog.InfoS("updating Ingress status", "namespace", currIng.Namespace, "ingress", currIng.Name, "currentValue", currIng.Status.LoadBalancer.Ingress, "newValue", status)