Fix kubeclient v4.9.1 usage with group apis #927
Conversation
pmalek-sumo
requested review from
perk-sumo,
samjsong,
vsinghal13,
andrzej-stencel and
sumo-drosiek
| @@ -33,7 +33,7 @@ class EnhanceK8sMetadataFilter < Fluent::Plugin::Filter | |||
| # Need different clients to access different API groups/versions | |||
| # https://github.com/abonas/kubeclient/issues/208 | |||
| config_param :core_api_versions, :array, default: ['v1'] | |||
| config_param :api_groups, :array, default: ['apps/v1', 'extensions/v1beta1'] | |||
| config_param :api_groups, :hash, default: {'apps':'v1', 'extensions':'v1beta1'} | |||
fluent-plugin-enhance-k8s-metadata/lib/sumologic/kubernetes/connector.rb
Outdated
Show resolved
Hide resolved
fluent-plugin-enhance-k8s-metadata/lib/sumologic/kubernetes/connector.rb
Outdated
Show resolved
Hide resolved
fluent-plugin-enhance-k8s-metadata/test/resources/api_list_apps.json
Outdated
Show resolved
Hide resolved
fluent-plugin-enhance-k8s-metadata/test/resources/api_list_extensions.json
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
From kubeclient's side, this looks correct 👍
Just to clarify, passing foo/v1 in version was never documented nor tested in kubeclient. It just happened to work, sometimes.
But there is no question that it would be nice to make it work, nobody likes the current scheme. Tracked in ManageIQ/kubeclient#284, PRs welcome 😉
| if elems.empty? then return {} end | ||
|
|
||
| # only a version: create a non-group api | ||
| if elems.length < 2 |
There was a problem hiding this comment.
Since you're supporting here both 'v1' and 'foo/v2' formats, do you still need separate core_clients vs group_clients methods and separate config params / consts?
Your call of course, just wanted to point out that from kubeclient's perspective, aside from Client construction, there is no difference between "core" API and other API groups...
There was a problem hiding this comment.
Thanks @cben!
I gave it a shot.
|
Friday merge 🎉 |
Description
kubeclient's version
v4.9.1changed how group API's clients are created and broke ourfluent-plugin-enhance-k8s-metadatatests (more info in #871).To fix this problem we need to pass an almost full base URL (e.g.
apis/extensions) asurltoKubeclient::Client.new()and the only the part with the version asversion(e.g.v1beta1) not how it was used up until now withurl(base) being only theapis/and version being set to "full version" with part of base e.g.extensions/v1beta1.Discussion in kubeclient's repo for reference: ManageIQ/kubeclient#318 (comment)
Testing performed