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

Upgrade Client-go to 0.18.2

Browse source
This commit is contained in:
Daniel Tomcej 2020-05-14 09:36:06 -07:00 • committed by GitHub
parent 6b1158235e
commit 5f0b6fde92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 382 additions and 408 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pkg/provider/kubernetes/ingress/client.go
View file

@ -1,6 +1,7 @@
package ingress
import (
"context"
"errors"
"fmt"
"io/ioutil"
@ -21,7 +22,10 @@ import (
"k8s.io/client-go/tools/clientcmd"
)
const resyncPeriod = 10 * time.Minute
const (
resyncPeriod = 10 * time.Minute
defaultTimeout = 5 * time.Second
)
type resourceEventHandler struct {
ev chan<- interface{}
@ -229,7 +233,10 @@ func (c *clientWrapper) UpdateIngressStatus(src *networkingv1beta1.Ingress, ip,
ingCopy := ing.DeepCopy()
ingCopy.Status = networkingv1beta1.IngressStatus{LoadBalancer: corev1.LoadBalancerStatus{Ingress: []corev1.LoadBalancerIngress{{IP: ip, Hostname: hostname}}}}
_, err = c.clientset.NetworkingV1beta1().Ingresses(ingCopy.Namespace).UpdateStatus(ingCopy)
ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout)
defer cancel()
_, err = c.clientset.NetworkingV1beta1().Ingresses(ingCopy.Namespace).UpdateStatus(ctx, ingCopy, metav1.UpdateOptions{})
if err != nil {
return fmt.Errorf("failed to update ingress status %s/%s: %v", src.Namespace, src.Name, err)
}
@ -255,7 +262,10 @@ func (c *clientWrapper) updateIngressStatusOld(src *networkingv1beta1.Ingress, i
ingCopy := ing.DeepCopy()
ingCopy.Status = extensionsv1beta1.IngressStatus{LoadBalancer: corev1.LoadBalancerStatus{Ingress: []corev1.LoadBalancerIngress{{IP: ip, Hostname: hostname}}}}
_, err = c.clientset.ExtensionsV1beta1().Ingresses(ingCopy.Namespace).UpdateStatus(ingCopy)
ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout)
defer cancel()
_, err = c.clientset.ExtensionsV1beta1().Ingresses(ingCopy.Namespace).UpdateStatus(ctx, ingCopy, metav1.UpdateOptions{})
if err != nil {
return fmt.Errorf("failed to update ingress status %s/%s: %v", src.Namespace, src.Name, err)
}