Skip to content

Commit

Permalink
[Backport release/2.11.x] fix: disable Kong(Cluster)Plugin Programmed…
Browse files Browse the repository at this point in the history
… status (#4585)

* fix: disable Kong(Cluster)Plugin Programmed status (#4584)

* fix(crds) disable KongPlugin programmed condition

Disable the Kong(Cluster)Plugin programmed condition. This caused a bug
in multi-class environments.

Add a TODO explaining the issue.

* chore(*) make generate

* chore(doc): add changelog entry for 2.11.1

---------

Co-authored-by: Patryk Małek <[email protected]>
(cherry picked from commit 2bafc2d)

* chore: trigger CI

---------

Co-authored-by: Travis Raines <[email protected]>
Co-authored-by: Patryk Małek <[email protected]>
  • Loading branch information
3 people authored Aug 29, 2023
1 parent db0ad91 commit 27b8343
Show file tree
Hide file tree
Showing 4 changed files with 176 additions and 219 deletions.
8 changes: 4 additions & 4 deletions hack/generators/controllers/networking/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ var inputControllersNeeded = &typesNeeded{
Plural: "kongplugins",
CacheType: "Plugin",
NeedsStatusPermissions: true,
ConfigStatusNotificationsEnabled: true,
ProgrammedConditionUpdatesEnabled: true,
ConfigStatusNotificationsEnabled: false, // TODO true after https://github.com/Kong/kubernetes-ingress-controller/issues/4578
ProgrammedConditionUpdatesEnabled: false, // TODO true after https://github.com/Kong/kubernetes-ingress-controller/issues/4578
AcceptsIngressClassNameAnnotation: false,
AcceptsIngressClassNameSpec: false,
NeedsUpdateReferences: true,
Expand All @@ -131,8 +131,8 @@ var inputControllersNeeded = &typesNeeded{
Plural: "kongclusterplugins",
CacheType: "ClusterPlugin",
NeedsStatusPermissions: true,
ConfigStatusNotificationsEnabled: true,
ProgrammedConditionUpdatesEnabled: true,
ConfigStatusNotificationsEnabled: false, // TODO true after https://github.com/Kong/kubernetes-ingress-controller/issues/4578
ProgrammedConditionUpdatesEnabled: false, // TODO true after https://github.com/Kong/kubernetes-ingress-controller/issues/4578
AcceptsIngressClassNameAnnotation: true,
AcceptsIngressClassNameSpec: false,
NeedsUpdateReferences: true,
Expand Down
50 changes: 0 additions & 50 deletions internal/controllers/configuration/zz_generated_controllers.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions internal/manager/controllerdef.go
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,8 @@ func setupControllers(
DataplaneClient: dataplaneClient,
CacheSyncTimeout: c.CacheSyncTimeout,
ReferenceIndexers: referenceIndexers,
StatusQueue: kubernetesStatusQueue,
// TODO https://github.com/Kong/kubernetes-ingress-controller/issues/4578
// StatusQueue: kubernetesStatusQueue,
},
},
{
Expand Down Expand Up @@ -313,7 +314,8 @@ func setupControllers(
DisableIngressClassLookups: !c.IngressClassNetV1Enabled,
CacheSyncTimeout: c.CacheSyncTimeout,
ReferenceIndexers: referenceIndexers,
StatusQueue: kubernetesStatusQueue,
// TODO https://github.com/Kong/kubernetes-ingress-controller/issues/4578
// StatusQueue: kubernetesStatusQueue,
},
},
// ---------------------------------------------------------------------------
Expand Down
Loading

0 comments on commit 27b8343

Please sign in to comment.