controller: get manifests from deployer

Instead of having copy of the manifest in nrop code base, we'll get them from the deployer.

In the future we'll refactor nrop to own the manifest but this is outside the scope of this work.

Signed-off-by: Talor Itzhak <[email protected]>

Author: Tal-or

pkg/metrics/manifests/manifests.go

@@ -22,7 +22,6 @@ import (
 	"path/filepath"
 
 	corev1 "k8s.io/api/core/v1"
-	networkingv1 "k8s.io/api/networking/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
 )
@@ -47,22 +46,6 @@ func Service(namespace string) (*corev1.Service, error) {
 	return service, nil
 }
 
-func NetworkPolicy(namespace string) (*networkingv1.NetworkPolicy, error) {
-	obj, err := loadObject(filepath.Join("yaml", "networkpolicy.yaml"))
-	if err != nil {
-		return nil, err
-	}
-
-	np, ok := obj.(*networkingv1.NetworkPolicy)
-	if !ok {
-		return nil, fmt.Errorf("unexpected type, got %t", obj)
-	}
-	if namespace != "" {
-		np.Namespace = namespace
-	}
-	return np, nil
-}
-
 func deserializeObjectFromData(data []byte) (runtime.Object, error) {
 	decode := scheme.Codecs.UniversalDeserializer().Decode
 	obj, _, err := decode(data, nil, nil)

pkg/metrics/manifests/monitor/monitor.go

@@ -18,29 +18,25 @@ package sched
 
 import (
 	corev1 "k8s.io/api/core/v1"
-	networkingv1 "k8s.io/api/networking/v1"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/openshift-kni/numaresources-operator/pkg/metrics/manifests"
 )
 
 type Manifests struct {
-	Service       *corev1.Service
-	NetworkPolicy *networkingv1.NetworkPolicy
+	Service *corev1.Service
 }
 
 func (mf Manifests) ToObjects() []client.Object {
 	return []client.Object{
 		mf.Service,
-		mf.NetworkPolicy,
 	}
 }
 
 func (mf Manifests) Clone() Manifests {
 	return Manifests{
-		Service:       mf.Service.DeepCopy(),
-		NetworkPolicy: mf.NetworkPolicy.DeepCopy(),
+		Service: mf.Service.DeepCopy(),
 	}
 }
 
@@ -52,11 +48,5 @@ func GetManifests(namespace string) (Manifests, error) {
 	if err != nil {
 		return mf, err
 	}
-
-	mf.NetworkPolicy, err = manifests.NetworkPolicy(namespace)
-	if err != nil {
-		return mf, err
-	}
-
 	return mf, nil
 }

pkg/metrics/manifests/yaml/networkpolicy.yaml

@@ -88,17 +88,19 @@ func (mf Manifests) securityContextOptions(legacyMode bool) k8swgrteupdate.Secur
 
 type Errors struct {
 	Core struct {
-		SCC                error
-		SCCv2              error
-		ServiceAccount     error
-		Role               error
-		RoleBinding        error
-		ClusterRole        error
-		ClusterRoleBinding error
+		SCC                        error
+		SCCv2                      error
+		ServiceAccount             error
+		Role                       error
+		RoleBinding                error
+		ClusterRole                error
+		ClusterRoleBinding         error
+		MetricsServerNetworkPolicy error
+		APIServerNetworkPolicy     error
+		DefaultNetworkPolicy       error
 	}
 	Metrics struct {
-		Service       error
-		NetworkPolicy error
+		Service error
 	}
 }
 
@@ -204,6 +206,20 @@ func (em *ExistingManifests) State(mf Manifests) []objectstate.ObjectState {
 			Compare:  compare.Object,
 			Merge:    merge.ObjectForUpdate,
 		},
+		{
+			Existing: em.existing.Core.APIServerNetworkPolicy,
+			Error:    em.errs.Core.APIServerNetworkPolicy,
+			Desired:  mf.Core.APIServerNetworkPolicy.DeepCopy(),
+			Compare:  compare.Object,
+			Merge:    merge.ObjectForUpdate,
+		},
+		{
+			Existing: em.existing.Core.MetricsServerNetworkPolicy,
+			Error:    em.errs.Core.MetricsServerNetworkPolicy,
+			Desired:  mf.Core.MetricsServerNetworkPolicy.DeepCopy(),
+			Compare:  compare.Object,
+			Merge:    merge.ObjectForUpdate,
+		},
 	}
 
 	if mf.Core.SecurityContextConstraint != nil {
@@ -240,15 +256,6 @@ func (em *ExistingManifests) State(mf Manifests) []objectstate.ObjectState {
 		Compare:  compare.Object,
 		Merge:    merge.ServiceForUpdate,
 	})
-
-	ret = append(ret, objectstate.ObjectState{
-		Existing: em.existing.Metrics.NetworkPolicy,
-		Error:    em.errs.Metrics.NetworkPolicy,
-		Desired:  mf.Metrics.NetworkPolicy.DeepCopy(),
-		Compare:  compare.Object,
-		Merge:    merge.MetadataForUpdate,
-	})
-
 	return ret
 }
 
@@ -339,10 +346,17 @@ func FromClient(ctx context.Context, cli client.Client, plat platform.Platform,
 	}
 
 	networkPolicy := &networkingv1.NetworkPolicy{}
-	if ok := getObject(ctx, cli, keyFor(mf.Metrics.NetworkPolicy), networkPolicy, &ret.errs.Metrics.NetworkPolicy); ok {
-		ret.existing.Metrics.NetworkPolicy = networkPolicy
+	if ok := getObject(ctx, cli, keyFor(mf.Core.MetricsServerNetworkPolicy), networkPolicy, &ret.errs.Core.MetricsServerNetworkPolicy); ok {
+		ret.existing.Core.MetricsServerNetworkPolicy = networkPolicy
+	}
+	networkPolicy = &networkingv1.NetworkPolicy{}
+	if ok := getObject(ctx, cli, keyFor(mf.Core.APIServerNetworkPolicy), networkPolicy, &ret.errs.Core.APIServerNetworkPolicy); ok {
+		ret.existing.Core.APIServerNetworkPolicy = networkPolicy
+	}
+	networkPolicy = &networkingv1.NetworkPolicy{}
+	if ok := getObject(ctx, cli, keyFor(mf.Core.DefaultNetworkPolicy), networkPolicy, &ret.errs.Core.DefaultNetworkPolicy); ok {
+		ret.existing.Core.DefaultNetworkPolicy = networkPolicy
 	}
-
 	return &ret
 }