From 46555b15f2f598d24c3604874ff68a626b54801a Mon Sep 17 00:00:00 2001 From: Francesco Murdaca Date: Fri, 5 Feb 2021 20:06:20 +0100 Subject: [PATCH] Remove unusued spec.name Signed-off-by: Francesco Murdaca --- deploy/examples/dashboards/DashboardFromConfigMap.yaml | 1 - deploy/examples/dashboards/DashboardFromURL.yaml | 1 - deploy/examples/dashboards/DashboardWithCustomFolder.yaml | 1 - deploy/examples/dashboards/DashboardWithPlugins.yaml | 1 - deploy/examples/dashboards/KeycloakDashboard.yaml | 1 - deploy/examples/dashboards/SimpleDashboard.yaml | 1 - documentation/dashboards.md | 1 - pkg/apis/integreatly/v1alpha1/grafanadashboard_types.go | 1 - 8 files changed, 8 deletions(-) diff --git a/deploy/examples/dashboards/DashboardFromConfigMap.yaml b/deploy/examples/dashboards/DashboardFromConfigMap.yaml index deac8ad39..b0ba26546 100644 --- a/deploy/examples/dashboards/DashboardFromConfigMap.yaml +++ b/deploy/examples/dashboards/DashboardFromConfigMap.yaml @@ -5,7 +5,6 @@ metadata: labels: app: grafana spec: - name: grafana-dashboard-from-config-map.json configMapRef: name: simple-dashboard-from-cm key: foo diff --git a/deploy/examples/dashboards/DashboardFromURL.yaml b/deploy/examples/dashboards/DashboardFromURL.yaml index 1ac75e6f4..d627c8851 100644 --- a/deploy/examples/dashboards/DashboardFromURL.yaml +++ b/deploy/examples/dashboards/DashboardFromURL.yaml @@ -5,6 +5,5 @@ metadata: labels: app: grafana spec: - name: grafana-dashboard-from-url.json url: https://raw.githubusercontent.com/integr8ly/grafana-operator/master/deploy/examples/remote/grafana-dashboard.json json: \ No newline at end of file diff --git a/deploy/examples/dashboards/DashboardWithCustomFolder.yaml b/deploy/examples/dashboards/DashboardWithCustomFolder.yaml index b5dfa7c1c..09b051dca 100644 --- a/deploy/examples/dashboards/DashboardWithCustomFolder.yaml +++ b/deploy/examples/dashboards/DashboardWithCustomFolder.yaml @@ -5,7 +5,6 @@ metadata: labels: app: grafana spec: - name: dashboard-with-custom-folder.json customFolderName: "newCustomFolder" json: > { diff --git a/deploy/examples/dashboards/DashboardWithPlugins.yaml b/deploy/examples/dashboards/DashboardWithPlugins.yaml index d3bd43ae5..5b36dc248 100644 --- a/deploy/examples/dashboards/DashboardWithPlugins.yaml +++ b/deploy/examples/dashboards/DashboardWithPlugins.yaml @@ -5,7 +5,6 @@ metadata: labels: app: grafana spec: - name: dashboard-with-plugins.json json: > { "id": null, diff --git a/deploy/examples/dashboards/KeycloakDashboard.yaml b/deploy/examples/dashboards/KeycloakDashboard.yaml index 296a11012..3f3940948 100644 --- a/deploy/examples/dashboards/KeycloakDashboard.yaml +++ b/deploy/examples/dashboards/KeycloakDashboard.yaml @@ -5,7 +5,6 @@ metadata: labels: app: grafana spec: - name: keycloak-dashboard.json plugins: - name: grafana-piechart-panel version: 1.3.9 diff --git a/deploy/examples/dashboards/SimpleDashboard.yaml b/deploy/examples/dashboards/SimpleDashboard.yaml index 2189be040..9875b3d43 100644 --- a/deploy/examples/dashboards/SimpleDashboard.yaml +++ b/deploy/examples/dashboards/SimpleDashboard.yaml @@ -5,7 +5,6 @@ metadata: labels: app: grafana spec: - name: simple-dashboard.json json: > { "id": null, diff --git a/documentation/dashboards.md b/documentation/dashboards.md index 3bdea7051..3c42234e9 100644 --- a/documentation/dashboards.md +++ b/documentation/dashboards.md @@ -10,7 +10,6 @@ Dashboards are represented by the `GrafanaDashboard` custom resource. Examples c The following properties are accepted in the `spec`: -* *name*: The filename of the dashboard that gets mounted into a volume in the grafana instance. Not to be confused with `metadata.name`. * *json*: Raw json string with the dashboard contents. Check the [official documentation](https://grafana.com/docs/reference/dashboard/#dashboard-json). * *jsonnet*: Jsonnet source. The [Grafonnet](https://grafana.github.io/grafonnet-lib/) library is made available automatically and can be imported. * *url*: Url address to download a json or jsonnet string with the dashboard contents. diff --git a/pkg/apis/integreatly/v1alpha1/grafanadashboard_types.go b/pkg/apis/integreatly/v1alpha1/grafanadashboard_types.go index 75f8eb620..66d514b86 100644 --- a/pkg/apis/integreatly/v1alpha1/grafanadashboard_types.go +++ b/pkg/apis/integreatly/v1alpha1/grafanadashboard_types.go @@ -22,7 +22,6 @@ type GrafanaDashboardSpec struct { // Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file Json string `json:"json"` Jsonnet string `json:"jsonnet"` - Name string `json:"name"` Plugins PluginList `json:"plugins,omitempty"` Url string `json:"url,omitempty"` ConfigMapRef *corev1.ConfigMapKeySelector `json:"configMapRef,omitempty"`