fix healthz issues

Author: paulyufan2

cns/healthserver/healthz.go

@@ -5,11 +5,14 @@ import (
 
 	"github.com/Azure/azure-container-networking/crd/nodenetworkconfig/api/v1alpha"
 	"github.com/pkg/errors"
+	meta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/client-go/rest"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	apiutil "sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 )
 
@@ -21,6 +24,7 @@ func init() {
 
 type Config struct {
 	PingAPIServer bool
+	Mapper        meta.RESTMapper
 }
 
 // NewHealthzHandlerWithChecks will return a [http.Handler] for CNS's /healthz endpoint.
@@ -30,12 +34,26 @@ type Config struct {
 func NewHealthzHandlerWithChecks(cfg *Config) (http.Handler, error) {
 	checks := make(map[string]healthz.Checker)
 	if cfg.PingAPIServer {
-		cfg, err := ctrl.GetConfig()
+		restCfg, err := ctrl.GetConfig()
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to get kubeconfig")
 		}
-		cli, err := client.New(cfg, client.Options{
+		// Use the provided (test) RESTMapper when present; otherwise fall back to
+		// a dynamic, discovery-based mapper for production.
+		mapper := cfg.Mapper
+		if mapper == nil {
+			httpClient, err := rest.HTTPClientFor(restCfg)
+			if err != nil {
+				return nil, errors.Wrap(err, "build http client for REST mapper")
+			}
+			mapper, err = apiutil.NewDynamicRESTMapper(restCfg, httpClient)
+			if err != nil {
+				return nil, errors.Wrap(err, "build rest mapper")
+			}
+		}
+		cli, err := client.New(restCfg, client.Options{
 			Scheme: scheme,
+			Mapper: mapper,
 		})
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to build client")

cns/healthserver/healthz_test.go

@@ -8,6 +8,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+  meta "k8s.io/apimachinery/pkg/api/meta"
+  "k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 const nncCRD = `{
@@ -158,6 +160,13 @@ const nncResult = `{
   }
 }`
 
+func staticNNCMapper() meta.RESTMapper {
+    gv := schema.GroupVersion{Group: "acn.azure.com", Version: "v1alpha"}
+    m := meta.NewDefaultRESTMapper([]schema.GroupVersion{gv})
+    m.Add(schema.GroupVersionKind{Group: gv.Group, Version: gv.Version, Kind: "NodeNetworkConfig"}, meta.RESTScopeNamespace)
+    return m
+}
+
 func TestNewHealthzHandlerWithChecks(t *testing.T) {
 	tests := []struct {
 		name            string
@@ -169,6 +178,7 @@ func TestNewHealthzHandlerWithChecks(t *testing.T) {
 			name: "list NNC gives 200 should indicate healthy",
 			config: &Config{
 				PingAPIServer: true,
+        Mapper:        staticNNCMapper(),
 			},
 			apiStatusCode:   http.StatusOK,
 			expectedHealthy: true,
@@ -177,6 +187,7 @@ func TestNewHealthzHandlerWithChecks(t *testing.T) {
 			name: "unauthorized (401) from apiserver should be unhealthy",
 			config: &Config{
 				PingAPIServer: true,
+        Mapper:        staticNNCMapper(),
 			},
 			apiStatusCode:   http.StatusUnauthorized,
 			expectedHealthy: false,
@@ -185,6 +196,7 @@ func TestNewHealthzHandlerWithChecks(t *testing.T) {
 			name: "channel nodesubnet should not call apiserver so it doesn't matter if the status code is a 401",
 			config: &Config{
 				PingAPIServer: false,
+        Mapper:        staticNNCMapper(),
 			},
 			apiStatusCode:   http.StatusUnauthorized,
 			expectedHealthy: true,