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

Performance and efficiency improvements in daemon/server mode #1154

Merged
merged 13 commits into from
Sep 15, 2023
Merged

Performance and efficiency improvements in daemon/server mode #1154

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fff8519
k8sclient: make InClusterK8sClient() call GetK8sClient()
dcbw Sep 8, 2023
752f28c
k8sclient: bump QPS to 50
dcbw Sep 8, 2023
6b8d24c
server: make CmdAdd/Del/Check struct member functions
dcbw Sep 8, 2023
7c68481
vendor: add client-go and more apimachinery modules
dcbw Sep 8, 2023
1605ffc
daemon: remove unused done channel
dcbw Sep 8, 2023
cec1a53
server: simplify server start
dcbw Sep 8, 2023
50c0357
server: use a shared informer pod cache rather than direct apiserver …
dcbw Sep 8, 2023
4ade856
server/config: simplify ConfigManager creation
dcbw Sep 12, 2023
8539a47
server/config: consolidate ConfigManager start and fsnotify watching
dcbw Sep 13, 2023
c2add82
server/config: fix MonitorPluginConfiguration test
dcbw Sep 13, 2023
fb4f4aa
server/config: un-export some functions no longer used outside the mo…
dcbw Sep 13, 2023
b0df7dd
server/config: use filepath.Join()
dcbw Sep 13, 2023
d9c06e9
server: don't set CNI config readinessindicatorfile when using Config…
dcbw Sep 13, 2023
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
15 changes: 8 additions & 7 deletions pkg/k8sclient/k8sclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,13 +396,14 @@ func TryLoadPodDelegates(pod *v1.Pod, conf *types.NetConf, clientInfo *ClientInf
// InClusterK8sClient returns the `k8s.ClientInfo` struct to use to connect to
// the k8s API.
func InClusterK8sClient() (*ClientInfo, error) {
config, err := rest.InClusterConfig()
clientInfo, err := GetK8sClient("", nil)
if err != nil {
return nil, err
}

logging.Debugf("InClusterK8sClient: in cluster config: %+v", config)
return NewClientInfo(config)
if clientInfo == nil {
return nil, fmt.Errorf("failed to create in-cluster kube client")
}
return clientInfo, err
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@s1061123 just want to make sure this approach works with your incoming changes?

}

// GetK8sClient gets client info from kubeconfig
Expand Down Expand Up @@ -441,12 +442,12 @@ func GetK8sClient(kubeconfig string, kubeClient *ClientInfo) (*ClientInfo, error
// Set the config timeout to one minute.
config.Timeout = time.Minute

return NewClientInfo(config)
return newClientInfo(config)
}

// NewClientInfo returns a `ClientInfo` from a configuration created from an
// newClientInfo returns a `ClientInfo` from a configuration created from an
// existing kubeconfig file.
func NewClientInfo(config *rest.Config) (*ClientInfo, error) {
func newClientInfo(config *rest.Config) (*ClientInfo, error) {
client, err := kubernetes.NewForConfig(config)
if err != nil {
return nil, err
Expand Down