diff --git a/config/crds/mission-control.flanksource.com_incidentrules.yaml b/config/crds/mission-control.flanksource.com_incidentrules.yaml index 0008017b..dcc4ab08 100644 --- a/config/crds/mission-control.flanksource.com_incidentrules.yaml +++ b/config/crds/mission-control.flanksource.com_incidentrules.yaml @@ -99,16 +99,14 @@ spec: tag & labels. type: string statuses: - description: StringArray represents a one-dimensional array - of the PostgreSQL character types. + description: Statuses filter resources by the status items: type: string type: array tagSelector: type: string types: - description: StringArray represents a one-dimensional array - of the PostgreSQL character types. + description: Types filter resources by the type items: type: string type: array diff --git a/config/crds/mission-control.flanksource.com_playbooks.yaml b/config/crds/mission-control.flanksource.com_playbooks.yaml index de6ad25f..5817d0a4 100644 --- a/config/crds/mission-control.flanksource.com_playbooks.yaml +++ b/config/crds/mission-control.flanksource.com_playbooks.yaml @@ -1304,16 +1304,14 @@ spec: tag & labels. type: string statuses: - description: StringArray represents a one-dimensional array - of the PostgreSQL character types. + description: Statuses filter resources by the status items: type: string type: array tagSelector: type: string types: - description: StringArray represents a one-dimensional array - of the PostgreSQL character types. + description: Types filter resources by the type items: type: string type: array @@ -1362,16 +1360,14 @@ spec: tag & labels. type: string statuses: - description: StringArray represents a one-dimensional array - of the PostgreSQL character types. + description: Statuses filter resources by the status items: type: string type: array tagSelector: type: string types: - description: StringArray represents a one-dimensional array - of the PostgreSQL character types. + description: Types filter resources by the type items: type: string type: array @@ -1420,16 +1416,14 @@ spec: tag & labels. type: string statuses: - description: StringArray represents a one-dimensional array - of the PostgreSQL character types. + description: Statuses filter resources by the status items: type: string type: array tagSelector: type: string types: - description: StringArray represents a one-dimensional array - of the PostgreSQL character types. + description: Types filter resources by the type items: type: string type: array diff --git a/config/schemas/incident-rules.schema.json b/config/schemas/incident-rules.schema.json index 544a0a7e..98eb9196 100644 --- a/config/schemas/incident-rules.schema.json +++ b/config/schemas/incident-rules.schema.json @@ -470,12 +470,6 @@ "namespace": { "type": "string" }, - "types": { - "$ref": "#/$defs/Items" - }, - "statuses": { - "$ref": "#/$defs/Items" - }, "tagSelector": { "type": "string" }, @@ -484,6 +478,12 @@ }, "fieldSelector": { "type": "string" + }, + "types": { + "$ref": "#/$defs/Items" + }, + "statuses": { + "$ref": "#/$defs/Items" } }, "additionalProperties": false, diff --git a/config/schemas/playbook-spec.schema.json b/config/schemas/playbook-spec.schema.json index 6aa24b9c..e73bb275 100644 --- a/config/schemas/playbook-spec.schema.json +++ b/config/schemas/playbook-spec.schema.json @@ -943,12 +943,6 @@ "namespace": { "type": "string" }, - "types": { - "$ref": "#/$defs/Items" - }, - "statuses": { - "$ref": "#/$defs/Items" - }, "tagSelector": { "type": "string" }, @@ -957,6 +951,12 @@ }, "fieldSelector": { "type": "string" + }, + "types": { + "$ref": "#/$defs/Items" + }, + "statuses": { + "$ref": "#/$defs/Items" } }, "additionalProperties": false, diff --git a/config/schemas/playbook.schema.json b/config/schemas/playbook.schema.json index 2ec13a5c..69e93a88 100644 --- a/config/schemas/playbook.schema.json +++ b/config/schemas/playbook.schema.json @@ -1097,12 +1097,6 @@ "namespace": { "type": "string" }, - "types": { - "$ref": "#/$defs/Items" - }, - "statuses": { - "$ref": "#/$defs/Items" - }, "tagSelector": { "type": "string" }, @@ -1111,6 +1105,12 @@ }, "fieldSelector": { "type": "string" + }, + "types": { + "$ref": "#/$defs/Items" + }, + "statuses": { + "$ref": "#/$defs/Items" } }, "additionalProperties": false, diff --git a/go.mod b/go.mod index 911f1bdc..26adff87 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/containrrr/shoutrrr v0.8.0 github.com/fergusstrange/embedded-postgres v1.25.0 // indirect github.com/flanksource/commons v1.31.2 - github.com/flanksource/duty v1.0.758 + github.com/flanksource/duty v1.0.759 github.com/flanksource/gomplate/v3 v3.24.39 github.com/flanksource/kopper v1.0.10 github.com/gomarkdown/markdown v0.0.0-20240419095408-642f0ee99ae2 diff --git a/go.sum b/go.sum index f63db78c..df49412e 100644 --- a/go.sum +++ b/go.sum @@ -924,8 +924,8 @@ github.com/flanksource/artifacts v1.0.14 h1:Vv70bccsae0MwGaf/uSPp34J5V1/PyKfct9z github.com/flanksource/artifacts v1.0.14/go.mod h1:qHVCnQu5k50aWNJ5UhpcAKEl7pAzqUrFFKGSm147G70= github.com/flanksource/commons v1.31.2 h1:VBhmhmvk6PjhJYuaK8LL+7700E3zPCY03VV/K1BxH64= github.com/flanksource/commons v1.31.2/go.mod h1:X2txnbNGY6fKQuKLmc7x92FMYjB2MuaqNJOR6vEWDMs= -github.com/flanksource/duty v1.0.758 h1:SIvtsC390UNrPVdzmdcyJ4MwdD6b02N09tweXQzxjpk= -github.com/flanksource/duty v1.0.758/go.mod h1:sZY2NytdenrkqXoMD6Gn2C8xH6dm5HsqOeE0p74Z2VE= +github.com/flanksource/duty v1.0.759 h1:C/IuTlPgu6PDXA770zgXaOL2M3vJsCJpHWV6x11HkFw= +github.com/flanksource/duty v1.0.759/go.mod h1:sZY2NytdenrkqXoMD6Gn2C8xH6dm5HsqOeE0p74Z2VE= github.com/flanksource/gomplate/v3 v3.20.4/go.mod h1:27BNWhzzSjDed1z8YShO6W+z6G9oZXuxfNFGd/iGSdc= github.com/flanksource/gomplate/v3 v3.24.39 h1:O763lnNIcTELSMYeIO0dNDfcb3LoZvzU1fr62I4Yxqg= github.com/flanksource/gomplate/v3 v3.24.39/go.mod h1:0wY/+UPvd7CxmiTBNmzZdWIEOUZAsRkpGY1j5R711O8=