Skip to content

Commit a433baa

Browse files
feat: update schemas
1 parent 47c86a9 commit a433baa

26 files changed

+3882
-42
lines changed

fluxcd.controlplane.io/resourcesetinputprovider_v1.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
"description": "ExcludeBranch specifies the regular expression to filter the branches\nthat the input provider should exclude.",
4444
"type": "string"
4545
},
46+
"excludeEnvironment": {
47+
"description": "ExcludeEnvironment specifies the regular expression to filter the environments\nthat the input provider should exclude.",
48+
"type": "string"
49+
},
4650
"excludeTag": {
4751
"description": "ExcludeTag specifies the regular expression to filter the tags\nthat the input provider should exclude.",
4852
"type": "string"
@@ -51,6 +55,10 @@
5155
"description": "IncludeBranch specifies the regular expression to filter the branches\nthat the input provider should include.",
5256
"type": "string"
5357
},
58+
"includeEnvironment": {
59+
"description": "IncludeEnvironment specifies the regular expression to filter the environments\nthat the input provider should include.",
60+
"type": "string"
61+
},
5462
"includeTag": {
5563
"description": "IncludeTag specifies the regular expression to filter the tags\nthat the input provider should include.",
5664
"type": "string"
@@ -146,6 +154,7 @@
146154
"GitLabBranch",
147155
"GitLabTag",
148156
"GitLabMergeRequest",
157+
"GitLabEnvironment",
149158
"AzureDevOpsBranch",
150159
"AzureDevOpsTag",
151160
"AzureDevOpsPullRequest",

grafana.integreatly.org/grafana_v1beta1.json

Lines changed: 1780 additions & 1 deletion
Large diffs are not rendered by default.

grafana.integreatly.org/grafanaalertrulegroup_v1beta1.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@
113113
"type": "string"
114114
},
115115
"resyncPeriod": {
116-
"default": "10m0s",
117116
"description": "How often the resource is synced, defaults to 10m0s if not set",
118117
"pattern": "^([0-9]+(\\.[0-9]+)?(ns|us|\u00b5s|ms|s|m|h))+$",
119118
"type": "string"
@@ -184,8 +183,7 @@
184183
},
185184
"for": {
186185
"default": "0s",
187-
"format": "duration",
188-
"pattern": "^([0-9]+(\\.[0-9]+)?(ns|us|\u00b5s|ms|s|m|h))+$",
186+
"pattern": "^([0-9]+(\\.[0-9]+)?(s|m|h|d|w))+$",
189187
"type": "string"
190188
},
191189
"isPaused": {

grafana.integreatly.org/grafanacontactpoint_v1beta1.json

Lines changed: 139 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,19 @@
2121
"type": "boolean"
2222
},
2323
"disableResolveMessage": {
24+
"description": "Deprecated: define the receiver under .spec.receivers[]\nWill be removed in a later version",
2425
"type": "boolean"
2526
},
27+
"editable": {
28+
"description": "Whether to enable or disable editing of the contact point in Grafana UI",
29+
"type": "boolean",
30+
"x-kubernetes-validations": [
31+
{
32+
"message": "spec.editable is immutable",
33+
"rule": "self == oldSelf"
34+
}
35+
]
36+
},
2637
"instanceSelector": {
2738
"description": "Selects Grafana instances for import",
2839
"properties": {
@@ -77,27 +88,144 @@
7788
"additionalProperties": false
7889
},
7990
"name": {
80-
"type": "string"
91+
"description": "Receivers are grouped under the same ContactPoint using the Name\nDefaults to the name of the CR",
92+
"type": "string",
93+
"x-kubernetes-validations": [
94+
{
95+
"message": "spec.name is immutable",
96+
"rule": "self == oldSelf"
97+
}
98+
]
99+
},
100+
"receivers": {
101+
"description": "List of receivers that Grafana will fan out notifications to",
102+
"items": {
103+
"description": "Represents an integration to external services that receive Grafana notifications",
104+
"properties": {
105+
"disableResolveMessage": {
106+
"type": "boolean"
107+
},
108+
"settings": {
109+
"x-kubernetes-preserve-unknown-fields": true
110+
},
111+
"type": {
112+
"minLength": 1,
113+
"type": "string"
114+
},
115+
"uid": {
116+
"description": "Manually specify the UID the Contact Point is created with. Can be any string consisting of alphanumeric characters, - and _ with a maximum length of 40",
117+
"maxLength": 40,
118+
"pattern": "^[a-zA-Z0-9-_]+$",
119+
"type": "string"
120+
},
121+
"valuesFrom": {
122+
"items": {
123+
"properties": {
124+
"targetPath": {
125+
"type": "string"
126+
},
127+
"valueFrom": {
128+
"properties": {
129+
"configMapKeyRef": {
130+
"description": "Selects a key of a ConfigMap.",
131+
"properties": {
132+
"key": {
133+
"description": "The key to select.",
134+
"type": "string"
135+
},
136+
"name": {
137+
"default": "",
138+
"description": "Name of the referent.\nThis field is effectively required, but due to backwards compatibility is\nallowed to be empty. Instances of this type with an empty value here are\nalmost certainly wrong.\nMore info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
139+
"type": "string"
140+
},
141+
"optional": {
142+
"description": "Specify whether the ConfigMap or its key must be defined",
143+
"type": "boolean"
144+
}
145+
},
146+
"required": [
147+
"key"
148+
],
149+
"type": "object",
150+
"x-kubernetes-map-type": "atomic",
151+
"additionalProperties": false
152+
},
153+
"secretKeyRef": {
154+
"description": "Selects a key of a Secret.",
155+
"properties": {
156+
"key": {
157+
"description": "The key of the secret to select from. Must be a valid secret key.",
158+
"type": "string"
159+
},
160+
"name": {
161+
"default": "",
162+
"description": "Name of the referent.\nThis field is effectively required, but due to backwards compatibility is\nallowed to be empty. Instances of this type with an empty value here are\nalmost certainly wrong.\nMore info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
163+
"type": "string"
164+
},
165+
"optional": {
166+
"description": "Specify whether the Secret or its key must be defined",
167+
"type": "boolean"
168+
}
169+
},
170+
"required": [
171+
"key"
172+
],
173+
"type": "object",
174+
"x-kubernetes-map-type": "atomic",
175+
"additionalProperties": false
176+
}
177+
},
178+
"type": "object",
179+
"x-kubernetes-validations": [
180+
{
181+
"message": "Either configMapKeyRef or secretKeyRef must be set",
182+
"rule": "(has(self.configMapKeyRef) && !has(self.secretKeyRef)) || (!has(self.configMapKeyRef) && has(self.secretKeyRef))"
183+
}
184+
],
185+
"additionalProperties": false
186+
}
187+
},
188+
"required": [
189+
"targetPath",
190+
"valueFrom"
191+
],
192+
"type": "object",
193+
"additionalProperties": false
194+
},
195+
"maxItems": 99,
196+
"type": "array"
197+
}
198+
},
199+
"required": [
200+
"settings",
201+
"type"
202+
],
203+
"type": "object",
204+
"additionalProperties": false
205+
},
206+
"maxItems": 99,
207+
"type": "array"
81208
},
82209
"resyncPeriod": {
83-
"default": "10m0s",
84210
"description": "How often the resource is synced, defaults to 10m0s if not set",
85211
"pattern": "^([0-9]+(\\.[0-9]+)?(ns|us|\u00b5s|ms|s|m|h))+$",
86212
"type": "string"
87213
},
88214
"settings": {
215+
"description": "Deprecated: define the receiver under .spec.receivers[]\nWill be removed in a later version",
89216
"x-kubernetes-preserve-unknown-fields": true
90217
},
91218
"suspend": {
92219
"description": "Suspend pauses synchronizing attempts and tells the operator to ignore changes",
93220
"type": "boolean"
94221
},
95222
"type": {
223+
"description": "Deprecated: define the receiver under .spec.receivers[]\nWill be removed in a later version",
96224
"minLength": 1,
97225
"type": "string"
98226
},
99227
"uid": {
100-
"description": "Manually specify the UID the Contact Point is created with. Can be any string consisting of alphanumeric characters, - and _ with a maximum length of 40",
228+
"description": "Deprecated: define the receiver under .spec.receivers[]\nManually specify the UID the Contact Point is created with. Can be any string consisting of alphanumeric characters, - and _ with a maximum length of 40",
101229
"maxLength": 40,
102230
"pattern": "^[a-zA-Z0-9-_]+$",
103231
"type": "string",
@@ -109,6 +237,7 @@
109237
]
110238
},
111239
"valuesFrom": {
240+
"description": "Deprecated: define the receiver under .spec.receivers[]\nWill be removed in a later version",
112241
"items": {
113242
"properties": {
114243
"targetPath": {
@@ -187,16 +316,17 @@
187316
}
188317
},
189318
"required": [
190-
"instanceSelector",
191-
"name",
192-
"settings",
193-
"type"
319+
"instanceSelector"
194320
],
195321
"type": "object",
196322
"x-kubernetes-validations": [
197323
{
198-
"message": "spec.uid is immutable",
199-
"rule": "((!has(oldSelf.uid) && !has(self.uid)) || (has(oldSelf.uid) && has(self.uid)))"
324+
"message": "spec.name is immutable",
325+
"rule": "((!has(oldSelf.name) && !has(self.name)) || (has(oldSelf.name) && has(self.name)))"
326+
},
327+
{
328+
"message": "spec.editable is immutable",
329+
"rule": "((!has(oldSelf.editable) && !has(self.editable)) || (has(oldSelf.editable) && has(self.editable)))"
200330
},
201331
{
202332
"message": "disabling spec.allowCrossNamespaceImport requires a recreate to ensure desired state",

grafana.integreatly.org/grafanadashboard_v1beta1.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,6 @@
343343
"type": "array"
344344
},
345345
"resyncPeriod": {
346-
"default": "10m0s",
347346
"description": "How often the resource is synced, defaults to 10m0s if not set",
348347
"pattern": "^([0-9]+(\\.[0-9]+)?(ns|us|\u00b5s|ms|s|m|h))+$",
349348
"type": "string"

grafana.integreatly.org/grafanadatasource_v1beta1.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@
150150
"type": "array"
151151
},
152152
"resyncPeriod": {
153-
"default": "10m0s",
154153
"description": "How often the resource is synced, defaults to 10m0s if not set",
155154
"pattern": "^([0-9]+(\\.[0-9]+)?(ns|us|\u00b5s|ms|s|m|h))+$",
156155
"type": "string"

grafana.integreatly.org/grafanafolder_v1beta1.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
"type": "string"
8787
},
8888
"resyncPeriod": {
89-
"default": "10m0s",
9089
"description": "How often the resource is synced, defaults to 10m0s if not set",
9190
"pattern": "^([0-9]+(\\.[0-9]+)?(ns|us|\u00b5s|ms|s|m|h))+$",
9291
"type": "string"

grafana.integreatly.org/grafanalibrarypanel_v1beta1.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@
339339
"type": "array"
340340
},
341341
"resyncPeriod": {
342-
"default": "10m0s",
343342
"description": "How often the resource is synced, defaults to 10m0s if not set",
344343
"pattern": "^([0-9]+(\\.[0-9]+)?(ns|us|\u00b5s|ms|s|m|h))+$",
345344
"type": "string"

grafana.integreatly.org/grafanamutetiming_v1beta1.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
"type": "string"
9090
},
9191
"resyncPeriod": {
92-
"default": "10m0s",
9392
"description": "How often the resource is synced, defaults to 10m0s if not set",
9493
"pattern": "^([0-9]+(\\.[0-9]+)?(ns|us|\u00b5s|ms|s|m|h))+$",
9594
"type": "string"

grafana.integreatly.org/grafananotificationpolicy_v1beta1.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,19 @@
8484
"additionalProperties": false
8585
},
8686
"resyncPeriod": {
87-
"default": "10m0s",
8887
"description": "How often the resource is synced, defaults to 10m0s if not set",
8988
"pattern": "^([0-9]+(\\.[0-9]+)?(ns|us|\u00b5s|ms|s|m|h))+$",
9089
"type": "string"
9190
},
9291
"route": {
9392
"description": "Routes for alerts to match against",
9493
"properties": {
94+
"active_time_intervals": {
95+
"items": {
96+
"type": "string"
97+
},
98+
"type": "array"
99+
},
95100
"continue": {
96101
"description": "continue",
97102
"type": "boolean"

0 commit comments

Comments
 (0)