rename namespace to operator-namespace

giantswarm · Dec 16, 2024 · 1d520dc · 1d520dc
1 parent 8df047c
commit 1d520dc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/helm/observability-operator/templates/deployment.yaml b/helm/observability-operator/templates/deployment.yaml
@@ -39,7 +39,7 @@ spec:
         - --monitoring-sharding-scale-up-series-count={{ $.Values.monitoring.sharding.scaleUpSeriesCount }}
         - --monitoring-sharding-scale-down-percentage={{ $.Values.monitoring.sharding.scaleDownPercentage }}
         - --monitoring-wal-truncate-frequency={{ $.Values.monitoring.wal.truncateFrequency }}
-        - --namespace={{ include "resource.default.namespace" . }}
+        - --operator-namespace={{ include "resource.default.namespace" . }}
         {{- if .Values.monitoring.prometheusVersion }}
         - --prometheus-version={{ $.Values.monitoring.prometheusVersion }}
         {{- end }}

diff --git a/internal/controller/alertmanager_controller.go b/internal/controller/alertmanager_controller.go
@@ -36,7 +36,7 @@ func SetupAlertmanagerReconciler(mgr ctrl.Manager, conf config.Config) error {
 	}
 
 	// Filter only the Alertmanager secret created by the observability-operator Helm chart
-	secretPredicate := predicates.NewAlertmanagerSecretPredicate(conf.Monitoring.AlertmanagerSecretName, conf.Namespace)
+	secretPredicate := predicates.NewAlertmanagerSecretPredicate(conf.Monitoring.AlertmanagerSecretName, conf.OperatorNamespace)
 
 	// Filter only the Mimir Alertmanager pod
 	podPredicate := predicates.NewAlertmanagerPodPredicate()
@@ -59,7 +59,7 @@ func podEventHandler(conf config.Config) handler.EventHandler {
 			{
 				NamespacedName: types.NamespacedName{
 					Name:      conf.Monitoring.AlertmanagerSecretName,
-					Namespace: conf.Namespace,
+					Namespace: conf.OperatorNamespace,
 				},
 			},
 		}

diff --git a/main.go b/main.go
@@ -74,7 +74,7 @@ func main() {
 		"If set the metrics endpoint is served securely")
 	flag.BoolVar(&conf.EnableHTTP2, "enable-http2", false,
 		"If set, HTTP/2 will be enabled for the metrics and webhook servers")
-	flag.StringVar(&conf.Namespace, "namespace", "",
+	flag.StringVar(&conf.OperatorNamespace, "operator-namespace", "",
 		"The namespace where the observability-operator is running.")
 
 	// Management cluster configuration flags.

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -11,7 +11,7 @@ type Config struct {
 	ProbeAddr            string
 	SecureMetrics        bool
 	EnableHTTP2          bool
-	Namespace            string
+	OperatorNamespace    string
 
 	ManagementCluster common.ManagementCluster