From d9f95a40478adb0e0e7d71a0be954f592055e9c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20S=C3=BC=C3=9F?= <dominik@suess.wtf>
Date: Tue, 30 Jul 2024 10:44:59 +0200
Subject: [PATCH] fix: remove required attribute from folder conditions

fixes: #1621
---
 api/v1beta1/grafanafolder_types.go                 |  2 +-
 .../grafana.integreatly.org_grafanafolders.yaml    |  2 --
 .../grafana.integreatly.org_grafanafolders.yaml    |  2 --
 deploy/kustomize/base/crds.yaml                    |  2 --
 docs/docs/api.md                                   | 14 +++++++-------
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/api/v1beta1/grafanafolder_types.go b/api/v1beta1/grafanafolder_types.go
index b366eb1ff..f836848db 100644
--- a/api/v1beta1/grafanafolder_types.go
+++ b/api/v1beta1/grafanafolder_types.go
@@ -72,7 +72,7 @@ type GrafanaFolderStatus struct {
 	NoMatchingInstances bool `json:"NoMatchingInstances,omitempty"`
 	// Last time the folder was resynced
 	LastResync metav1.Time        `json:"lastResync,omitempty"`
-	Conditions []metav1.Condition `json:"conditions"`
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 //+kubebuilder:object:root=true
diff --git a/config/crd/bases/grafana.integreatly.org_grafanafolders.yaml b/config/crd/bases/grafana.integreatly.org_grafanafolders.yaml
index b7187e36c..57534d7ee 100644
--- a/config/crd/bases/grafana.integreatly.org_grafanafolders.yaml
+++ b/config/crd/bases/grafana.integreatly.org_grafanafolders.yaml
@@ -212,8 +212,6 @@ spec:
                 description: Last time the folder was resynced
                 format: date-time
                 type: string
-            required:
-            - conditions
             type: object
         type: object
     served: true
diff --git a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanafolders.yaml b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanafolders.yaml
index b7187e36c..57534d7ee 100644
--- a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanafolders.yaml
+++ b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanafolders.yaml
@@ -212,8 +212,6 @@ spec:
                 description: Last time the folder was resynced
                 format: date-time
                 type: string
-            required:
-            - conditions
             type: object
         type: object
     served: true
diff --git a/deploy/kustomize/base/crds.yaml b/deploy/kustomize/base/crds.yaml
index 56a539112..0f460dba5 100644
--- a/deploy/kustomize/base/crds.yaml
+++ b/deploy/kustomize/base/crds.yaml
@@ -1441,8 +1441,6 @@ spec:
                 description: Last time the folder was resynced
                 format: date-time
                 type: string
-            required:
-            - conditions
             type: object
         type: object
     served: true
diff --git a/docs/docs/api.md b/docs/docs/api.md
index 5914d8aa6..92b4ede29 100644
--- a/docs/docs/api.md
+++ b/docs/docs/api.md
@@ -2735,19 +2735,19 @@ GrafanaFolderStatus defines the observed state of GrafanaFolder
         </tr>
     </thead>
     <tbody><tr>
-        <td><b><a href="#grafanafolderstatusconditionsindex">conditions</a></b></td>
-        <td>[]object</td>
-        <td>
-          <br/>
-        </td>
-        <td>true</td>
-      </tr><tr>
         <td><b>NoMatchingInstances</b></td>
         <td>boolean</td>
         <td>
           The folder instanceSelector can't find matching grafana instances<br/>
         </td>
         <td>false</td>
+      </tr><tr>
+        <td><b><a href="#grafanafolderstatusconditionsindex">conditions</a></b></td>
+        <td>[]object</td>
+        <td>
+          <br/>
+        </td>
+        <td>false</td>
       </tr><tr>
         <td><b>hash</b></td>
         <td>string</td>