homelab/traefik
1
0
Fork 0
Code Activity

Merge current v2.6 into master

Browse source
This commit is contained in:
Tom Moulard 2022-02-21 14:05:28 +01:00
commit 25725e9b2f
No known key found for this signature in database
GPG key ID: 521ABE0C1A0DEAF6
45 changed files with 155 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/provider/ecs/ecs.go
View file

@ -454,7 +454,7 @@ func (p *Provider) lookupTaskDefinitions(ctx context.Context, client *awsClient,
// chunkIDs ECS expects no more than 100 parameters be passed to a API call;
// thus, pack each string into an array capped at 100 elements.
func (p *Provider) chunkIDs(ids []*string) [][]*string {
var chuncked [][]*string
var chunked [][]*string
for i := 0; i < len(ids); i += 100 {
var sliceEnd int
if i+100 < len(ids) {
@ -462,7 +462,7 @@ func (p *Provider) chunkIDs(ids []*string) [][]*string {
} else {
sliceEnd = len(ids)
}
chuncked = append(chuncked, ids[i:sliceEnd])
chunked = append(chunked, ids[i:sliceEnd])
}
return chuncked
return chunked
}

2
pkg/provider/kubernetes/crd/client.go
View file

@ -31,7 +31,6 @@ const resyncPeriod = 10 * time.Minute
// The stores can then be accessed via the Get* functions.
type Client interface {
WatchAll(namespaces []string, stopCh <-chan struct{}) (<-chan interface{}, error)
GetIngressRoutes() []*v1alpha1.IngressRoute
GetIngressRouteTCPs() []*v1alpha1.IngressRouteTCP
GetIngressRouteUDPs() []*v1alpha1.IngressRouteUDP
@ -42,7 +41,6 @@ type Client interface {
GetTLSOptions() []*v1alpha1.TLSOption
GetServersTransports() []*v1alpha1.ServersTransport
GetTLSStores() []*v1alpha1.TLSStore
GetService(namespace, name string) (*corev1.Service, bool, error)
GetSecret(namespace, name string) (*corev1.Secret, bool, error)
GetEndpoints(namespace, name string) (*corev1.Endpoints, bool, error)

2
pkg/provider/kubernetes/crd/fixtures/tcp/with_different_services_ns.yml
View file

@ -27,5 +27,5 @@ spec:
weight: 4
# with unknown namespace
- name: whoamitcp
namespace: unknwonns
namespace: unknowns
port: 8080

2
pkg/provider/kubernetes/crd/fixtures/udp/with_different_services_ns.yml
View file

@ -26,5 +26,5 @@ spec:
weight: 4
# with unknown namespace
- name: whoamiudp
namespace: unknwonns
namespace: unknowns
port: 8080

2
pkg/provider/kubernetes/gateway/client.go
View file

@ -50,7 +50,6 @@ func (reh *resourceEventHandler) OnDelete(obj interface{}) {
// The stores can then be accessed via the Get* functions.
type Client interface {
WatchAll(namespaces []string, stopCh <-chan struct{}) (<-chan interface{}, error)
GetGatewayClasses() ([]*v1alpha2.GatewayClass, error)
UpdateGatewayStatus(gateway *v1alpha2.Gateway, gatewayStatus v1alpha2.GatewayStatus) error
UpdateGatewayClassStatus(gatewayClass *v1alpha2.GatewayClass, condition metav1.Condition) error
@ -58,7 +57,6 @@ type Client interface {
GetHTTPRoutes(namespaces []string) ([]*v1alpha2.HTTPRoute, error)
GetTCPRoutes(namespaces []string) ([]*v1alpha2.TCPRoute, error)
GetTLSRoutes(namespaces []string) ([]*v1alpha2.TLSRoute, error)
GetService(namespace, name string) (*corev1.Service, bool, error)
GetSecret(namespace, name string) (*corev1.Secret, bool, error)
GetEndpoints(namespace, name string) (*corev1.Endpoints, bool, error)

2
pkg/provider/kubernetes/gateway/fixtures/httproute/gatewayclass_with_unknown_controller.yml
View file

@ -4,7 +4,7 @@ apiVersion: gateway.networking.k8s.io/v1alpha2
metadata:
name: my-gateway-class
spec:
controllerName: unkown.io/gateway-controller
controllerName: unknown.io/gateway-controller
---
kind: Gateway

2
pkg/provider/kubernetes/gateway/fixtures/tcproute/gatewayclass_with_unknown_controller.yml
View file

@ -4,7 +4,7 @@ apiVersion: gateway.networking.k8s.io/v1alpha2
metadata:
name: my-gateway-class
spec:
controllerName: unkown.io/gateway-controller
controllerName: unknown.io/gateway-controller
---
kind: Gateway

2
pkg/provider/kubernetes/gateway/fixtures/tlsroute/gatewayclass_with_unknown_controller.yml
View file

@ -15,7 +15,7 @@ apiVersion: gateway.networking.k8s.io/v1alpha2
metadata:
name: my-gateway-class
spec:
controllerName: unkown.io/gateway-controller
controllerName: unknown.io/gateway-controller
---
kind: Gateway