From d6f13521af3e89ed9f0408781953adfaeb537378 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Fri, 2 Sep 2022 17:30:01 +0800 Subject: [PATCH 1/3] fix: type assertion failed (#1314) --- pkg/providers/apisix/apisix_consumer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/providers/apisix/apisix_consumer.go b/pkg/providers/apisix/apisix_consumer.go index b2f94a19a0..95b31bf821 100644 --- a/pkg/providers/apisix/apisix_consumer.go +++ b/pkg/providers/apisix/apisix_consumer.go @@ -215,7 +215,7 @@ func (c *apisixConsumerController) handleSyncErr(obj interface{}, err error) { if k8serrors.IsNotFound(err) && event.Type != types.EventDelete { log.Infow("sync ApisixConsumer but not found, ignore", zap.String("event_type", event.Type.String()), - zap.String("ApisixConsumer", event.Object.(string)), + zap.Any("ApisixConsumer", event.Object.(kube.ApisixConsumerEvent)), ) c.workqueue.Forget(event) return From 848a78f494cf42b42858e1a42a3b89f1f2ae158b Mon Sep 17 00:00:00 2001 From: xiangtianyu Date: Fri, 2 Sep 2022 18:54:51 +0800 Subject: [PATCH 2/3] fix: ingress class not effect in resource sync logic (#1311) Co-authored-by: Sarasa Kisaragi Co-authored-by: Xin Rong <1324266492@qq.com> --- pkg/providers/ingress/ingress.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/providers/ingress/ingress.go b/pkg/providers/ingress/ingress.go index 689dd0b416..50381fb161 100644 --- a/pkg/providers/ingress/ingress.go +++ b/pkg/providers/ingress/ingress.go @@ -429,6 +429,12 @@ func (c *ingressController) ResourceSync() { continue } ing := kube.MustNewIngress(obj) + if !c.isIngressEffective(ing) { + return + } + log.Debugw("ingress add event arrived", + zap.Any("object", obj), + ) c.workqueue.Add(&types.Event{ Type: types.EventAdd, Object: kube.IngressEvent{ From 866d40f60eb5909ae9a4fb910f79f21bcd3ca7dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Sep 2022 10:43:21 +0800 Subject: [PATCH 3/3] chore(deps): bump github.com/onsi/ginkgo/v2 in /test/e2e (#1318) Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.1.4 to 2.1.6. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v2.1.4...v2.1.6) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- test/e2e/go.mod | 2 +- test/e2e/go.sum | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/go.mod b/test/e2e/go.mod index 0e535df8a5..34ae88a364 100644 --- a/test/e2e/go.mod +++ b/test/e2e/go.mod @@ -9,7 +9,7 @@ require ( github.com/gavv/httpexpect/v2 v2.3.1 github.com/gorilla/websocket v1.5.0 github.com/gruntwork-io/terratest v0.40.20 - github.com/onsi/ginkgo/v2 v2.1.4 + github.com/onsi/ginkgo/v2 v2.1.6 github.com/stretchr/testify v1.8.0 k8s.io/api v0.24.4 k8s.io/apimachinery v0.24.4 diff --git a/test/e2e/go.sum b/test/e2e/go.sum index 434467857c..ee709dd744 100644 --- a/test/e2e/go.sum +++ b/test/e2e/go.sum @@ -381,13 +381,13 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= -github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= +github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU= +github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= +github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q= github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw= github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=