MLE-15992: fixed networkPolicy test (#28)

* fixed networkPolicy test

* added rebase fixes

Author: barkhachoithani

api/v1alpha1/common_types.go

@@ -72,6 +72,7 @@ type NetworkPolicy struct {
 	PodSelector metav1.LabelSelector                    `json:"podSelector,omitempty"`
 	Ingress     []networkingv1.NetworkPolicyIngressRule `json:"ingress,omitempty"`
 	Egress      []networkingv1.NetworkPolicyEgressRule  `json:"egress,omitempty"`
+}
 
 type HAProxyConfig struct {
 	Enabled bool `json:"enabled,omitempty"`

internal/controller/marklogicgroup_controller_test.go

@@ -61,7 +61,7 @@ const resourceHugepageValue = int64(104857600)
 
 var svcName = Name + "-cluster"
 var typeNamespaceNameSvc = types.NamespacedName{Name: svcName, Namespace: Namespace}
-var netPolicyName = Name + "-network-policy"
+var netPolicyName = Name
 var typeNsNameNetPolicy = types.NamespacedName{Name: netPolicyName, Namespace: Namespace}
 
 const fluentBitImage = "fluent/fluent-bit:3.1.1"

pkg/k8sutil/handler.go

@@ -28,6 +28,9 @@ func (oc *OperatorContext) ReconsileHandler() (reconcile.Result, error) {
 
 	if oc.MarklogicGroup.Spec.NetworkPolicy.Enabled {
 		if result := oc.ReconcileNetworkPolicy(); result.Completed() {
+			return result.Output()
+		}
+	}
 
 	if oc.MarklogicGroup.Spec.HAProxyConfig.Enabled {
 		if result := oc.ReconcileHAProxy(); result.Completed() {