Skip to content

Commit

Permalink
Merge branch 'main' into envoy-1.17.1
Browse files Browse the repository at this point in the history
  • Loading branch information
skriss authored Feb 26, 2021
2 parents b2d6bcc + 1436335 commit 04752ba
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
8 changes: 4 additions & 4 deletions cmd/contour/ingressstatus.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,16 @@ func (isw *loadBalancerStatusWriter) Start(stop <-chan struct{}) error {
if err := isw.clients.Cache().List(context.Background(), &ingressList); err != nil {
isw.log.WithError(err).WithField("kind", "Ingress").Error("failed to list objects")
} else {
for _, i := range ingressList.Items {
u.OnAdd(i)
for i := range ingressList.Items {
u.OnAdd(&ingressList.Items[i])
}
}

if err := isw.clients.Cache().List(context.Background(), &proxyList); err != nil {
isw.log.WithError(err).WithField("kind", "HTTPProxy").Error("failed to list objects")
} else {
for _, i := range proxyList.Items {
u.OnAdd(i)
for i := range proxyList.Items {
u.OnAdd(&proxyList.Items[i])
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions internal/k8s/statusaddress.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ func (s *StatusAddressUpdater) OnAdd(obj interface{}) {
gvr = contour_api_v1.SchemeGroupVersion.WithResource("httpproxies")
kind = "httpproxy"
default:
s.Logger.
Debug("unsupported type received")
s.Logger.Debugf("unsupported type %T received", o)
return
}

Expand Down

0 comments on commit 04752ba

Please sign in to comment.