support specifying existing volume in grafana dataStorage (#810)

* support specifying existing volume in grafana dataStorage
grafana · Aug 28, 2022 · b7f9dc5 · b7f9dc5
1 parent 9520d85
commit b7f9dc5
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 0 deletions.
diff --git a/api/integreatly/v1alpha1/grafana_types.go b/api/integreatly/v1alpha1/grafana_types.go
@@ -92,6 +92,7 @@ type GrafanaDataStorage struct {
 	AccessModes []v1.PersistentVolumeAccessMode `json:"accessModes,omitempty"`
 	Size        resource.Quantity               `json:"size,omitempty"`
 	Class       string                          `json:"class,omitempty"`
+	VolumeName  string                          `json:"volumeName,omitempty"`
 }
 
 type GrafanaServiceAccount struct {

diff --git a/config/crd/bases/integreatly.org_grafanas.yaml b/config/crd/bases/integreatly.org_grafanas.yaml
@@ -2125,6 +2125,8 @@ spec:
                     - type: string
                     pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                     x-kubernetes-int-or-string: true
+                  volumeName:
+                    type: string
                 type: object
               deployment:
                 description: GrafanaDeployment provides a means to configure the deployment

diff --git a/controllers/model/grafanaDataPvc.go b/controllers/model/grafanaDataPvc.go
@@ -32,6 +32,14 @@ func getStorageClass(cr *v1alpha1.Grafana) *string {
 	return &cr.Spec.DataStorage.Class
 }
 
+func getVolumeName(cr *v1alpha1.Grafana) string {
+	if cr.Spec.DataStorage == nil {
+		return ""
+	}
+
+	return cr.Spec.DataStorage.VolumeName
+}
+
 func getPVCSpec(cr *v1alpha1.Grafana) corev1.PersistentVolumeClaimSpec {
 	return corev1.PersistentVolumeClaimSpec{
 		AccessModes: cr.Spec.DataStorage.AccessModes,
@@ -41,6 +49,7 @@ func getPVCSpec(cr *v1alpha1.Grafana) corev1.PersistentVolumeClaimSpec {
 			},
 		},
 		StorageClassName: getStorageClass(cr),
+		VolumeName:       getVolumeName(cr),
 	}
 }
 

diff --git a/deploy/examples/persistentvolume/Grafana-existingVolume.yaml b/deploy/examples/persistentvolume/Grafana-existingVolume.yaml
@@ -0,0 +1,31 @@
+apiVersion: integreatly.org/v1alpha1
+kind: Grafana
+metadata:
+  name: example-grafana
+spec:
+  ingress:
+    enabled: True
+    pathType: Prefix
+    path: "/"
+  dataStorage:
+    accessModes:
+    - ReadWriteMany
+    size: 10Gi
+    volumeName: "grafanads"
+    class: "azurefile-csi"
+  config:
+    log:
+      mode: "console"
+      level: "warn"
+    security:
+      admin_user: "root"
+      admin_password: "secret"
+    auth:
+      disable_login_form: False
+      disable_signout_menu: True
+    auth.anonymous:
+      enabled: True
+  dashboardLabelSelector:
+    - matchExpressions:
+        - {key: app, operator: In, values: [grafana]}
+
diff --git a/deploy/manifests/latest/crds.yaml b/deploy/manifests/latest/crds.yaml
@@ -2791,6 +2791,8 @@ spec:
                     - type: string
                     pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                     x-kubernetes-int-or-string: true
+                  volumeName:
+                    type: string
                 type: object
               deployment:
                 description: GrafanaDeployment provides a means to configure the deployment

diff --git a/documentation/api.md b/documentation/api.md
@@ -7532,6 +7532,13 @@ GrafanaDataStorage provides a means to configure the grafana data storage
           <br/>
         </td>
         <td>false</td>
+      </tr><tr>
+        <td><b>volumeName</b></td>
+        <td>string</td>
+        <td>
+          <br/>
+        </td>
+        <td>false</td>
       </tr></tbody>
 </table>