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

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