diff --git a/pkg/controller/logstorage/esmetrics/esmetrics_controller.go b/pkg/controller/logstorage/esmetrics/esmetrics_controller.go index 038fb2001a..cc4115f786 100644 --- a/pkg/controller/logstorage/esmetrics/esmetrics_controller.go +++ b/pkg/controller/logstorage/esmetrics/esmetrics_controller.go @@ -21,7 +21,6 @@ import ( v3 "github.com/tigera/api/pkg/apis/projectcalico/v3" "github.com/tigera/operator/pkg/render/common/networkpolicy" - "github.com/tigera/operator/pkg/render/logstorage/linseed" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes" @@ -122,7 +121,7 @@ func Add(mgr manager.Manager, opts options.AddOptions) error { go utils.WaitToAddTierWatch(networkpolicy.TigeraComponentTierName, c, k8sClient, log, r.tierWatchReady) go utils.WaitToAddNetworkPolicyWatches(c, k8sClient, log, []types.NamespacedName{ - {Name: linseed.PolicyName, Namespace: render.ElasticsearchNamespace}, + {Name: esmetrics.ElasticsearchMetricsPolicyName, Namespace: render.ElasticsearchNamespace}, }) return nil diff --git a/pkg/controller/logstorage/linseed/linseed_controller.go b/pkg/controller/logstorage/linseed/linseed_controller.go index 6def6a69c2..b614b980aa 100644 --- a/pkg/controller/logstorage/linseed/linseed_controller.go +++ b/pkg/controller/logstorage/linseed/linseed_controller.go @@ -178,7 +178,7 @@ func Add(mgr manager.Manager, opts options.AddOptions) error { go utils.WaitToAddTierWatch(networkpolicy.TigeraComponentTierName, c, k8sClient, log, r.tierWatchReady) go utils.WaitToAddNetworkPolicyWatches(c, k8sClient, log, []types.NamespacedName{ - {Name: linseed.PolicyName, Namespace: render.ElasticsearchNamespace}, + {Name: linseed.PolicyName, Namespace: helper.InstallNamespace()}, }) go utils.WaitToAddResourceWatch(c, k8sClient, log, r.dpiAPIReady, []client.Object{&v3.DeepPacketInspection{TypeMeta: metav1.TypeMeta{Kind: v3.KindDeepPacketInspection}}})