rename

Author: pb82

deploy/crds/ApplicationMonitoring.yaml

@@ -16,9 +16,9 @@ spec:
       required: ["spec"]
       properties:
         spec:
-          required: ["namespaceSelector"]
+          required: ["labelSelector"]
           properties:
-            namespaceSelector:
+            labelSelector:
               type: string
               minimum: 1
-              description: The namespaces that the grafana and prometheus operators will watch
+              description: The selector used by the Prometheus and Grafana Operators to discover resources

deploy/examples/ApplicationMonitoring.yaml

@@ -3,4 +3,4 @@ kind: ApplicationMonitoring
 metadata:
   name: example-applicationmonitoring
 spec:
-  namespaceSelector: "middleware"
+  labelSelector: "middleware"

pkg/apis/applicationmonitoring/v1alpha1/applicationmonitoring_types.go

@@ -11,7 +11,7 @@ import (
 type ApplicationMonitoringSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file
-	NamespaceSelector string `json:"namespaceSelector"`
+	LabelSelector string `json:"labelSelector"`
 }
 
 // ApplicationMonitoringStatus defines the observed state of ApplicationMonitoring

pkg/controller/applicationmonitoring/templateHelper.go

@@ -82,7 +82,7 @@ func newTemplateHelper(cr *applicationmonitoring.ApplicationMonitoring, extraPar
 		AlertManagerRouteName:          AlertManagerRouteName,
 		GrafanaServiceMonitorName:      GrafanaServiceMonitorName,
 		PrometheusServiceMonitorName:   PrometheusServiceMonitorName,
-		MonitoringKey:                  cr.Spec.NamespaceSelector,
+		MonitoringKey:                  cr.Spec.LabelSelector,
 		ExtraParams:                    extraParams,
 	}