homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch v2.10 into v3.0

Browse source
This commit is contained in:
Fernandez Ludovic 2023-04-17 11:34:00 +02:00
commit 79c5f34156
40 changed files with 792 additions and 452 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/provider/kubernetes/ingress/client_mock_test.go
View file

@ -51,7 +51,7 @@ func newClientMock(serverVersion string, paths ...string) clientMock {
case *corev1.Endpoints:
c.endpoints = append(c.endpoints, o)
case *netv1beta1.Ingress:
ing, err := toNetworkingV1(o)
ing, err := convert[netv1.Ingress](o)
if err != nil {
panic(err)
}
@ -60,7 +60,7 @@ func newClientMock(serverVersion string, paths ...string) clientMock {
case *netv1.Ingress:
c.ingresses = append(c.ingresses, o)
case *netv1beta1.IngressClass:
ic, err := toNetworkingV1IngressClass(o)
ic, err := convert[netv1.IngressClass](o)
if err != nil {
panic(err)
}
@ -132,6 +132,6 @@ func (c clientMock) WatchAll(namespaces []string, stopCh <-chan struct{}) (<-cha
return c.watchChan, nil
}
func (c clientMock) UpdateIngressStatus(_ *netv1.Ingress, _ []corev1.LoadBalancerIngress) error {
func (c clientMock) UpdateIngressStatus(_ *netv1.Ingress, _ []netv1.IngressLoadBalancerIngress) error {
return c.apiIngressStatusError
}