Merge pull request #1624 from grafana/fix/omitempty-status-on-folder

fix: remove required attribute from folder conditions
grafana · Jul 30, 2024 · 4801274 · 4801274
2 parents c3ffb02 + d9f95a4
commit 4801274
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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>