Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove required attribute from folder conditions #1624

Merged
merged 1 commit into from
Jul 30, 2024
Merged

fix: remove required attribute from folder conditions #1624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/v1beta1/grafanafolder_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions config/crd/bases/grafana.integreatly.org_grafanafolders.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanafolders.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions deploy/kustomize/base/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions docs/docs/api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading