Update kubemark to use EndpointSlices and proper user-agents

kubernetes · Nov 30, 2021 · 243f4fa · 243f4fa
1 parent aff056d
commit 243f4fa
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/cmd/kubemark/hollow-node.go b/cmd/kubemark/hollow-node.go
@@ -180,12 +180,13 @@ func run(cmd *cobra.Command, config *hollowNodeConfig) error {
 		return fmt.Errorf("Failed to create a ClientConfig, error: %w. Exiting", err)
 	}
 
-	client, err := clientset.NewForConfig(clientConfig)
-	if err != nil {
-		return fmt.Errorf("Failed to create a ClientSet, error: %w. Exiting", err)
-	}
-
 	if config.Morph == "kubelet" {
+		clientConfig.UserAgent = "hollow-kubelet"
+		client, err := clientset.NewForConfig(clientConfig)
+		if err != nil {
+			return fmt.Errorf("Failed to create a ClientSet, error: %w. Exiting", err)
+		}
+
 		f, c := kubemark.GetHollowKubeletConfig(config.createHollowKubeletOptions())
 
 		heartbeatClientConfig := *clientConfig
@@ -253,6 +254,8 @@ func run(cmd *cobra.Command, config *hollowNodeConfig) error {
 	}
 
 	if config.Morph == "proxy" {
+		clientConfig.UserAgent = "hollow-proxy"
+
 		client, err := clientset.NewForConfig(clientConfig)
 		if err != nil {
 			return fmt.Errorf("Failed to create API Server client, error: %w", err)

diff --git a/pkg/kubemark/hollow_proxy.go b/pkg/kubemark/hollow_proxy.go
@@ -118,16 +118,17 @@ func NewHollowProxyOrDie(
 	}
 	return &HollowProxy{
 		ProxyServer: &proxyapp.ProxyServer{
-			Client:           client,
-			EventClient:      eventClient,
-			IptInterface:     iptInterface,
-			Proxier:          proxier,
-			Broadcaster:      broadcaster,
-			Recorder:         recorder,
-			ProxyMode:        "fake",
-			NodeRef:          nodeRef,
-			OOMScoreAdj:      utilpointer.Int32Ptr(0),
-			ConfigSyncPeriod: 30 * time.Second,
+			Client:            client,
+			EventClient:       eventClient,
+			IptInterface:      iptInterface,
+			Proxier:           proxier,
+			Broadcaster:       broadcaster,
+			Recorder:          recorder,
+			ProxyMode:         "fake",
+			NodeRef:           nodeRef,
+			UseEndpointSlices: true,
+			OOMScoreAdj:       utilpointer.Int32Ptr(0),
+			ConfigSyncPeriod:  30 * time.Second,
 		},
 	}, nil
 }