Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid calling k8s api for each resource kind on the cluster #1712

Merged
merged 7 commits into from
Jan 20, 2022
Merged

Avoid calling k8s api for each resource kind on the cluster #1712

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e8fbb16
Avoid calling k8s api for each resource kind on the cluster
rubenvp8510 Jan 19, 2022
888154f
Update autodetect tests
rubenvp8510 Jan 19, 2022
03385c5
Use map to filter groups
rubenvp8510 Jan 19, 2022
cbf882c
Merge branch 'master' into Issue-1684
rubenvp8510 Jan 19, 2022
1f84664
Simplify the group check
rubenvp8510 Jan 19, 2022
151ccc3
Increase coverage for autodetect
rubenvp8510 Jan 19, 2022
8d1170c
Merge branch 'master' into Issue-1684
rubenvp8510 Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion pkg/autodetect/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package autodetect

import (
"context"
"fmt"
"strings"
"sync"
"time"
Expand All @@ -21,6 +22,8 @@ import (
"github.com/jaegertracing/jaeger-operator/pkg/inject"
)

var listenedGroupsMap = map[string]bool{"logging.openshift.io": true, "kafka.strimzi.io": true, "route.openshift.io": true}

// Background represents a procedure that runs in the background, periodically auto-detecting features
type Background struct {
cl client.Client
Expand Down Expand Up @@ -109,8 +112,30 @@ func (b *Background) autoDetectCapabilities() {
b.cleanDeployments(ctx)
}

func (b *Background) isInListenedGroups(group metav1.APIGroup) bool {
return listenedGroupsMap[group.Name]
}

func (b *Background) availableAPIs(_ context.Context) ([]*metav1.APIResourceList, error) {
return b.dcl.ServerPreferredResources()
apiLists := []*metav1.APIResourceList{}
groupList, err := b.dcl.ServerGroups()
if err != nil {
return apiLists, err
}

var errors error

for _, sg := range groupList.Groups {
if b.isInListenedGroups(sg) {
groupAPIList, err := b.dcl.ServerResourcesForGroupVersion(sg.PreferredVersion.GroupVersion)
if err == nil {
apiLists = append(apiLists, groupAPIList)
} else {
errors = fmt.Errorf("%v; Error getting resources for server group %s: %v", errors, sg.Name, err)
}
}
}
return apiLists, errors
}

func (b *Background) detectPlatform(ctx context.Context, apiList []*metav1.APIResourceList) {
Expand Down
99 changes: 56 additions & 43 deletions pkg/autodetect/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func TestAutoDetectWithError(t *testing.T) {
assert.False(t, viper.IsSet("es-provision"))

// set the error
dcl.ServerGroupsFunc = func() (apiGroupList []*metav1.APIResourceList, err error) {
dcl.ServerResourcesForGroupVersionFunc = func(_ string) (apiGroupList *metav1.APIResourceList, err error) {
return nil, fmt.Errorf("faked error")
}

Expand All @@ -156,12 +156,14 @@ func TestAutoDetectOpenShift(t *testing.T) {
cl := fake.NewFakeClient()
b := WithClients(cl, dcl, cl)

dcl.ServerGroupsFunc = func() (apiGroupList []*metav1.APIResourceList, err error) {
return []*metav1.APIResourceList{
{
GroupVersion: "route.openshift.io/v1",
},
}, nil
dcl.ServerResourcesForGroupVersionFunc = func(_ string) (apiGroupList *metav1.APIResourceList, err error) {
return &metav1.APIResourceList{GroupVersion: "route.openshift.io/v1"}, nil
}

dcl.ServerGroupsFunc = func() (apiGroupList *metav1.APIGroupList, err error) {
return &metav1.APIGroupList{Groups: []metav1.APIGroup{{
Name: "route.openshift.io",
}}}, nil
}

// test
Expand All @@ -171,7 +173,7 @@ func TestAutoDetectOpenShift(t *testing.T) {
assert.Equal(t, v1.FlagPlatformOpenShift, viper.GetString("platform"))

// set the error
dcl.ServerGroupsFunc = func() (apiGroupList []*metav1.APIResourceList, err error) {
dcl.ServerResourcesForGroupVersionFunc = func(_ string) (apiGroupList *metav1.APIResourceList, err error) {
return nil, fmt.Errorf("faked error")
}

Expand Down Expand Up @@ -239,15 +241,20 @@ func TestAutoDetectEsProvisionWithEsOperator(t *testing.T) {
cl := fake.NewFakeClient()
b := WithClients(cl, dcl, cl)

dcl.ServerGroupsFunc = func() (apiGroupList *metav1.APIGroupList, err error) {
return &metav1.APIGroupList{Groups: []metav1.APIGroup{{
Name: "logging.openshift.io",
}}}, nil
}

t.Run("kind Elasticsearch", func(t *testing.T) {
dcl.ServerGroupsFunc = func() (apiGroupList []*metav1.APIResourceList, err error) {
return []*metav1.APIResourceList{
{
GroupVersion: "logging.openshift.io/v1",
APIResources: []metav1.APIResource{
{
Kind: "Elasticsearch",
},

dcl.ServerResourcesForGroupVersionFunc = func(_ string) (apiGroupList *metav1.APIResourceList, err error) {
return &metav1.APIResourceList{
GroupVersion: "logging.openshift.io/v1",
APIResources: []metav1.APIResource{
{
Kind: "Elasticsearch",
},
},
}, nil
Expand All @@ -257,14 +264,13 @@ func TestAutoDetectEsProvisionWithEsOperator(t *testing.T) {
})

t.Run("no kind Elasticsearch", func(t *testing.T) {
dcl.ServerGroupsFunc = func() (apiGroupList []*metav1.APIResourceList, err error) {
return []*metav1.APIResourceList{
{
GroupVersion: "logging.openshift.io/v1",
APIResources: []metav1.APIResource{
{
Kind: "Kibana",
},
dcl.ServerResourcesForGroupVersionFunc = func(_ string) (apiGroupList *metav1.APIResourceList, err error) {
return &metav1.APIResourceList{

GroupVersion: "logging.openshift.io/v1",
APIResources: []metav1.APIResource{
{
Kind: "Kibana",
},
},
}, nil
Expand Down Expand Up @@ -299,12 +305,14 @@ func TestAutoDetectKafkaProvisionWithKafkaOperator(t *testing.T) {
cl := fake.NewFakeClient()
b := WithClients(cl, dcl, cl)

dcl.ServerGroupsFunc = func() (apiGroupList []*metav1.APIResourceList, err error) {
return []*metav1.APIResourceList{
{
GroupVersion: "kafka.strimzi.io/v1",
},
}, nil
dcl.ServerGroupsFunc = func() (apiGroupList *metav1.APIGroupList, err error) {
return &metav1.APIGroupList{Groups: []metav1.APIGroup{{
Name: "kafka.strimzi.io",
}}}, nil
}

dcl.ServerResourcesForGroupVersionFunc = func(_ string) (apiGroupList *metav1.APIResourceList, err error) {
return &metav1.APIResourceList{GroupVersion: "kafka.strimzi.io/v1"}, nil
}

// test
Expand Down Expand Up @@ -370,13 +378,14 @@ func TestAutoDetectKafkaDefaultWithOperator(t *testing.T) {
dcl := &fakeDiscoveryClient{}
cl := fake.NewFakeClient()
b := WithClients(cl, dcl, cl)
dcl.ServerGroupsFunc = func() (apiGroupList *metav1.APIGroupList, err error) {
return &metav1.APIGroupList{Groups: []metav1.APIGroup{{
Name: "kafka.strimzi.io",
}}}, nil
}

dcl.ServerGroupsFunc = func() (apiGroupList []*metav1.APIResourceList, err error) {
return []*metav1.APIResourceList{
{
GroupVersion: "kafka.strimzi.io/v1",
},
}, nil
dcl.ServerResourcesForGroupVersionFunc = func(_ string) (apiGroupList *metav1.APIResourceList, err error) {
return &metav1.APIResourceList{GroupVersion: "kafka.strimzi.io/v1"}, nil
}

// test
Expand Down Expand Up @@ -588,26 +597,30 @@ func (f *fakeClient) Create(ctx context.Context, obj client.Object, opts ...clie

type fakeDiscoveryClient struct {
discovery.DiscoveryInterface
ServerGroupsFunc func() (apiGroupList []*metav1.APIResourceList, err error)
ServerGroupsFunc func() (apiGroupList *metav1.APIGroupList, err error)
ServerResourcesForGroupVersionFunc func(groupVersion string) (resources *metav1.APIResourceList, err error)
}

func (d *fakeDiscoveryClient) ServerGroups() (apiGroupList *metav1.APIGroupList, err error) {
return &metav1.APIGroupList{}, nil
if d.ServerGroupsFunc == nil {
return &metav1.APIGroupList{}, nil
}
return d.ServerGroupsFunc()
}

func (d *fakeDiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (resources *metav1.APIResourceList, err error) {
return &metav1.APIResourceList{}, nil
if d.ServerGroupsFunc == nil {
return &metav1.APIResourceList{}, nil
}
return d.ServerResourcesForGroupVersionFunc(groupVersion)
}

func (d *fakeDiscoveryClient) ServerResources() ([]*metav1.APIResourceList, error) {
return []*metav1.APIResourceList{}, nil
}

func (d *fakeDiscoveryClient) ServerPreferredResources() ([]*metav1.APIResourceList, error) {
if d.ServerGroupsFunc == nil {
return []*metav1.APIResourceList{}, nil
}
return d.ServerGroupsFunc()
return []*metav1.APIResourceList{}, nil
}

func (d *fakeDiscoveryClient) ServerPreferredNamespacedResources() ([]*metav1.APIResourceList, error) {
Expand Down