homelab/traefik
1
0
Fork 0
Code Activity

Upgrade IngressClass to use v1 over v1Beta on Kube 1.19+

Browse source
This commit is contained in:
Manuel Zapf 2021-05-17 16:50:09 +02:00 • committed by GitHub
parent 63ef0f1cee
commit e1e1fd640c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 135 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,7 @@ type clientMock struct {
services []*corev1.Service
secrets []*corev1.Secret
endpoints []*corev1.Endpoints
ingressClasses []*networkingv1beta1.IngressClass
ingressClasses []*networkingv1.IngressClass
serverVersion *version.Version
@ -60,6 +60,12 @@ func newClientMock(serverVersion string, paths ...string) clientMock {
case *networkingv1.Ingress:
c.ingresses = append(c.ingresses, o)
case *networkingv1beta1.IngressClass:
ic, err := toNetworkingV1IngressClass(o)
if err != nil {
panic(err)
}
c.ingressClasses = append(c.ingressClasses, ic)
case *networkingv1.IngressClass:
c.ingressClasses = append(c.ingressClasses, o)
default:
panic(fmt.Sprintf("Unknown runtime object %+v %T", o, o))
@ -118,7 +124,7 @@ func (c clientMock) GetSecret(namespace, name string) (*corev1.Secret, bool, err
return nil, false, nil
}
func (c clientMock) GetIngressClasses() ([]*networkingv1beta1.IngressClass, error) {
func (c clientMock) GetIngressClasses() ([]*networkingv1.IngressClass, error) {
return c.ingressClasses, nil
}