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

5
pkg/provider/kubernetes/ingress/kubernetes.go
View file

@ -24,7 +24,6 @@ import (
"github.com/traefik/traefik/v2/pkg/tls"
corev1 "k8s.io/api/core/v1"
networkingv1 "k8s.io/api/networking/v1"
networkingv1beta1 "k8s.io/api/networking/v1beta1"
"k8s.io/apimachinery/pkg/labels"
)
@ -191,7 +190,7 @@ func (p *Provider) loadConfigurationFromIngresses(ctx context.Context, client Cl
return conf
}
var ingressClasses []*networkingv1beta1.IngressClass
var ingressClasses []*networkingv1.IngressClass
if supportsIngressClass(serverVersion) {
ics, err := client.GetIngressClasses()
@ -378,7 +377,7 @@ func (p *Provider) updateIngressStatus(ing *networkingv1.Ingress, k8sClient Clie
return k8sClient.UpdateIngressStatus(ing, service.Status.LoadBalancer.Ingress)
}
func (p *Provider) shouldProcessIngress(ingress *networkingv1.Ingress, ingressClasses []*networkingv1beta1.IngressClass) bool {
func (p *Provider) shouldProcessIngress(ingress *networkingv1.Ingress, ingressClasses []*networkingv1.IngressClass) bool {
// configuration through the new kubernetes ingressClass
if ingress.Spec.IngressClassName != nil {
for _, ic := range ingressClasses {