Merge pull request #5 from pb82/rename-match-namespace

rename namespace selector
grafana · Feb 5, 2019 · be29e01 · be29e01
2 parents 10f313b + ee92a2d
commit be29e01
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/deploy/crds/Grafana.yaml b/deploy/crds/Grafana.yaml
@@ -16,7 +16,7 @@ spec:
       properties:
         spec:
           properties:
-            monitoringNamespaceSelector:
+            dashboardNamespaceSelector:
               description: A label selector is a label query over a set of resources.
                 The result of matchLabels and matchExpressions are ANDed. An empty
                 label selector matches all objects. A null label selector matches

diff --git a/deploy/examples/Grafana.yaml b/deploy/examples/Grafana.yaml
@@ -4,6 +4,6 @@ metadata:
   name: example-grafana
 spec:
   prometheusUrl: "http://prometheus-application-monitoring:9090"
-  monitoringNamespaceSelector:
+  dashboardNamespaceSelector:
     matchLabels:
       monitoring-key: middleware
diff --git a/pkg/apis/integreatly/v1alpha1/grafana_types.go b/pkg/apis/integreatly/v1alpha1/grafana_types.go
@@ -11,8 +11,8 @@ import (
 type GrafanaSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file
-	PrometheusUrl               string                `json:"prometheusUrl"`
-	MonitoringNamespaceSelector *metav1.LabelSelector `json:"monitoringNamespaceSelector,omitempty"`
+	PrometheusUrl              string                `json:"prometheusUrl"`
+	DashboardNamespaceSelector *metav1.LabelSelector `json:"dashboardNamespaceSelector,omitempty"`
 }
 
 // GrafanaStatus defines the observed state of Grafana

diff --git a/pkg/apis/integreatly/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/integreatly/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/controller/grafana/grafana_controller.go b/pkg/controller/grafana/grafana_controller.go
@@ -127,7 +127,7 @@ func (r *ReconcileGrafana) Reconcile(request reconcile.Request) (reconcile.Resul
 }
 
 func (r *ReconcileGrafana) ReconcileNamespaces(cr *integreatly.Grafana) (reconcile.Result, error) {
-	namespaces, err := r.helper.getMonitoringNamespaces(cr.Spec.MonitoringNamespaceSelector)
+	namespaces, err := r.helper.getMonitoringNamespaces(cr.Spec.DashboardNamespaceSelector)
 	if err != nil {
 		log.Error(err, "Error listing namespaces")
 		return reconcile.Result{}, err