diff --git a/config/deploy/crd.yaml b/config/deploy/crd.yaml index 5b6696163..8442b746a 100644 --- a/config/deploy/crd.yaml +++ b/config/deploy/crd.yaml @@ -1,4 +1,3 @@ ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -154,6 +153,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -307,6 +316,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -345,6 +364,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -443,6 +472,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -474,6 +513,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -544,6 +593,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -653,6 +712,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -684,6 +753,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -814,6 +893,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -895,6 +984,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -997,6 +1096,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -1028,6 +1137,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -1189,6 +1308,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -1220,6 +1349,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -1392,6 +1531,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -1579,6 +1728,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -1610,6 +1769,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -1704,6 +1873,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -1735,6 +1914,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -1822,6 +2011,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -1944,6 +2143,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2041,6 +2250,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2074,6 +2293,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2185,6 +2414,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2248,6 +2487,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2353,6 +2602,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2389,6 +2648,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2422,6 +2691,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2458,6 +2737,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2499,6 +2788,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2530,6 +2829,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2570,6 +2879,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2601,6 +2920,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2642,6 +2971,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2693,6 +3032,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2805,6 +3154,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2846,6 +3205,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2877,6 +3246,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -2949,6 +3328,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -3050,6 +3439,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -3084,6 +3483,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -3126,6 +3535,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -3160,6 +3579,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -3244,6 +3673,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -3352,6 +3791,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -3383,6 +3832,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -3498,6 +3957,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -3532,6 +4001,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -3629,6 +4108,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -3713,6 +4202,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -3829,6 +4328,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -4188,6 +4697,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -4229,6 +4748,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -4313,6 +4842,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -4350,6 +4889,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -4444,6 +4993,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -4508,6 +5067,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -4602,6 +5171,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -4666,6 +5245,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -4866,6 +5455,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -4930,6 +5529,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -5124,6 +5733,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -5188,6 +5807,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -5285,6 +5914,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -5347,6 +5986,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -5436,6 +6085,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -5473,6 +6132,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -5515,6 +6184,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -5604,6 +6283,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -5639,6 +6328,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -5685,6 +6384,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -5770,6 +6479,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -5801,6 +6520,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: @@ -5974,6 +6703,16 @@ spec: required: - key type: object + helmRef: + properties: + key: + description: Key is a JSONPath expression used to fetch the key from the merged JSON. + type: string + name: + type: string + required: + - key + type: object secretKeyRef: properties: key: diff --git a/config/schemas/canary.schema.json b/config/schemas/canary.schema.json index d7be3244f..547bdce3d 100644 --- a/config/schemas/canary.schema.json +++ b/config/schemas/canary.schema.json @@ -1434,6 +1434,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -1897,6 +1900,21 @@ "name" ] }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "ICMPCheck": { "properties": { "description": { diff --git a/config/schemas/component.schema.json b/config/schemas/component.schema.json index 8d2667485..9bd36a40c 100644 --- a/config/schemas/component.schema.json +++ b/config/schemas/component.schema.json @@ -1610,6 +1610,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -2106,6 +2109,21 @@ "name" ] }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "ICMPCheck": { "properties": { "description": { diff --git a/config/schemas/health_alertmanager.schema.json b/config/schemas/health_alertmanager.schema.json index 40952d025..ce847d28c 100644 --- a/config/schemas/health_alertmanager.schema.json +++ b/config/schemas/health_alertmanager.schema.json @@ -141,6 +141,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -151,6 +154,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_awsconfig.schema.json b/config/schemas/health_awsconfig.schema.json index 4b86792d9..0c4343991 100644 --- a/config/schemas/health_awsconfig.schema.json +++ b/config/schemas/health_awsconfig.schema.json @@ -114,6 +114,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -124,6 +127,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_awsconfigrule.schema.json b/config/schemas/health_awsconfigrule.schema.json index dfa9128b8..f4d9eda4a 100644 --- a/config/schemas/health_awsconfigrule.schema.json +++ b/config/schemas/health_awsconfigrule.schema.json @@ -125,6 +125,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -135,6 +138,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_azuredevops.schema.json b/config/schemas/health_azuredevops.schema.json index fd51f2b35..b14cc35a3 100644 --- a/config/schemas/health_azuredevops.schema.json +++ b/config/schemas/health_azuredevops.schema.json @@ -119,6 +119,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -129,6 +132,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_cloudwatch.schema.json b/config/schemas/health_cloudwatch.schema.json index ff2d343bc..23dfdd017 100644 --- a/config/schemas/health_cloudwatch.schema.json +++ b/config/schemas/health_cloudwatch.schema.json @@ -122,6 +122,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -132,6 +135,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_containerdPull.schema.json b/config/schemas/health_containerdPull.schema.json index 889e96a20..e991478f7 100644 --- a/config/schemas/health_containerdPull.schema.json +++ b/config/schemas/health_containerdPull.schema.json @@ -96,6 +96,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -106,6 +109,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_databasebackupcheck.schema.json b/config/schemas/health_databasebackupcheck.schema.json index 0311430c4..03819cf8b 100644 --- a/config/schemas/health_databasebackupcheck.schema.json +++ b/config/schemas/health_databasebackupcheck.schema.json @@ -86,6 +86,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -130,6 +133,21 @@ "instance" ] }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_dockerPull.schema.json b/config/schemas/health_dockerPull.schema.json index 572acc011..ee29326a4 100644 --- a/config/schemas/health_dockerPull.schema.json +++ b/config/schemas/health_dockerPull.schema.json @@ -96,6 +96,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -106,6 +109,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_dockerPush.schema.json b/config/schemas/health_dockerPush.schema.json index 8f235438f..fc09df178 100644 --- a/config/schemas/health_dockerPush.schema.json +++ b/config/schemas/health_dockerPush.schema.json @@ -90,6 +90,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -100,6 +103,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_dynatrace.schema.json b/config/schemas/health_dynatrace.schema.json index bec945724..713f8b716 100644 --- a/config/schemas/health_dynatrace.schema.json +++ b/config/schemas/health_dynatrace.schema.json @@ -92,6 +92,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -102,6 +105,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_ec2.schema.json b/config/schemas/health_ec2.schema.json index 132ca7110..dc53528a4 100644 --- a/config/schemas/health_ec2.schema.json +++ b/config/schemas/health_ec2.schema.json @@ -122,6 +122,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -132,6 +135,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_elasticsearch.schema.json b/config/schemas/health_elasticsearch.schema.json index fab736412..57c91041b 100644 --- a/config/schemas/health_elasticsearch.schema.json +++ b/config/schemas/health_elasticsearch.schema.json @@ -101,6 +101,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -111,6 +114,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_exec.schema.json b/config/schemas/health_exec.schema.json index 044abf822..c795af4dd 100644 --- a/config/schemas/health_exec.schema.json +++ b/config/schemas/health_exec.schema.json @@ -101,6 +101,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -229,6 +232,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_folder.schema.json b/config/schemas/health_folder.schema.json index f4978bf47..5919622da 100644 --- a/config/schemas/health_folder.schema.json +++ b/config/schemas/health_folder.schema.json @@ -71,6 +71,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -205,6 +208,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_github.schema.json b/config/schemas/health_github.schema.json index 0990fc011..81bf738bd 100644 --- a/config/schemas/health_github.schema.json +++ b/config/schemas/health_github.schema.json @@ -38,6 +38,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -100,6 +103,21 @@ "query" ] }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_helm.schema.json b/config/schemas/health_helm.schema.json index 44f04c6f6..efea8f7e2 100644 --- a/config/schemas/health_helm.schema.json +++ b/config/schemas/health_helm.schema.json @@ -50,6 +50,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -105,6 +108,21 @@ "name" ] }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_http.schema.json b/config/schemas/health_http.schema.json index be5a3d7ce..28505e5cd 100644 --- a/config/schemas/health_http.schema.json +++ b/config/schemas/health_http.schema.json @@ -38,6 +38,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -153,6 +156,21 @@ "name" ] }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "JSONCheck": { "properties": { "path": { diff --git a/config/schemas/health_jmeter.schema.json b/config/schemas/health_jmeter.schema.json index 26dbacff4..7a326c0c5 100644 --- a/config/schemas/health_jmeter.schema.json +++ b/config/schemas/health_jmeter.schema.json @@ -38,6 +38,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -48,6 +51,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "JmeterCheck": { "properties": { "description": { diff --git a/config/schemas/health_ldap.schema.json b/config/schemas/health_ldap.schema.json index d441acc72..7cdbab552 100644 --- a/config/schemas/health_ldap.schema.json +++ b/config/schemas/health_ldap.schema.json @@ -38,6 +38,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -48,6 +51,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "LDAPCheck": { "properties": { "description": { diff --git a/config/schemas/health_mongodb.schema.json b/config/schemas/health_mongodb.schema.json index 8d4c5c1fc..57b4fae02 100644 --- a/config/schemas/health_mongodb.schema.json +++ b/config/schemas/health_mongodb.schema.json @@ -38,6 +38,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -48,6 +51,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_mssql.schema.json b/config/schemas/health_mssql.schema.json index 7867f580e..2dea6fa65 100644 --- a/config/schemas/health_mssql.schema.json +++ b/config/schemas/health_mssql.schema.json @@ -38,6 +38,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -48,6 +51,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_mysql.schema.json b/config/schemas/health_mysql.schema.json index b14635df7..d5b830b8d 100644 --- a/config/schemas/health_mysql.schema.json +++ b/config/schemas/health_mysql.schema.json @@ -38,6 +38,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -48,6 +51,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_opensearch.schema.json b/config/schemas/health_opensearch.schema.json index 656affaa3..c92b01495 100644 --- a/config/schemas/health_opensearch.schema.json +++ b/config/schemas/health_opensearch.schema.json @@ -38,6 +38,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -48,6 +51,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_postgres.schema.json b/config/schemas/health_postgres.schema.json index 42e21f6e7..d12944118 100644 --- a/config/schemas/health_postgres.schema.json +++ b/config/schemas/health_postgres.schema.json @@ -38,6 +38,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -48,6 +51,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_prometheus.schema.json b/config/schemas/health_prometheus.schema.json index 3ae607f12..e488539de 100644 --- a/config/schemas/health_prometheus.schema.json +++ b/config/schemas/health_prometheus.schema.json @@ -38,6 +38,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -48,6 +51,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_redis.schema.json b/config/schemas/health_redis.schema.json index 719a4697e..8310fef33 100644 --- a/config/schemas/health_redis.schema.json +++ b/config/schemas/health_redis.schema.json @@ -38,6 +38,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -48,6 +51,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_restic.schema.json b/config/schemas/health_restic.schema.json index aa0ccaaaf..12990d737 100644 --- a/config/schemas/health_restic.schema.json +++ b/config/schemas/health_restic.schema.json @@ -38,6 +38,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -48,6 +51,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_s3.schema.json b/config/schemas/health_s3.schema.json index e912569dc..96232322c 100644 --- a/config/schemas/health_s3.schema.json +++ b/config/schemas/health_s3.schema.json @@ -38,6 +38,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -48,6 +51,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/health_webhook.schema.json b/config/schemas/health_webhook.schema.json index f47f3376d..5f4f73d2d 100644 --- a/config/schemas/health_webhook.schema.json +++ b/config/schemas/health_webhook.schema.json @@ -38,6 +38,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -48,6 +51,21 @@ "additionalProperties": false, "type": "object" }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "Labels": { "patternProperties": { ".*": { diff --git a/config/schemas/topology.schema.json b/config/schemas/topology.schema.json index e2ebcf441..255ab572c 100644 --- a/config/schemas/topology.schema.json +++ b/config/schemas/topology.schema.json @@ -1580,6 +1580,9 @@ "serviceAccount": { "type": "string" }, + "helmRef": { + "$ref": "#/$defs/HelmRefKeySelector" + }, "configMapKeyRef": { "$ref": "#/$defs/ConfigMapKeySelector" }, @@ -2076,6 +2079,21 @@ "name" ] }, + "HelmRefKeySelector": { + "properties": { + "name": { + "type": "string" + }, + "key": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "key" + ] + }, "ICMPCheck": { "properties": { "description": { diff --git a/hack/generate-schemas/.gitignore b/hack/generate-schemas/.gitignore new file mode 100644 index 000000000..6db33941e --- /dev/null +++ b/hack/generate-schemas/.gitignore @@ -0,0 +1,2 @@ +go.mod +go.sum diff --git a/hack/generate-schemas/go.mod b/hack/generate-schemas/go.mod index f68f57863..34381f066 100644 --- a/hack/generate-schemas/go.mod +++ b/hack/generate-schemas/go.mod @@ -31,6 +31,7 @@ require ( github.com/AlekSi/pointer v1.2.0 // indirect github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver/v3 v3.2.1 // indirect + github.com/RaveNoX/go-jsonmerge v1.0.0 // indirect github.com/TomOnTime/utfutil v0.0.0-20230223141146-125e65197b36 // indirect github.com/agext/levenshtein v1.2.3 // indirect github.com/antlr4-go/antlr/v4 v4.13.0 // indirect @@ -42,7 +43,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/evanphx/json-patch v5.7.0+incompatible // indirect - github.com/flanksource/duty v1.0.236 // indirect + github.com/flanksource/duty v1.0.245 // indirect github.com/flanksource/is-healthy v0.0.0-20231003215854-76c51e3a3ff7 // indirect github.com/flanksource/kommons v0.31.4 // indirect github.com/ghodss/yaml v1.0.0 // indirect diff --git a/hack/generate-schemas/go.sum b/hack/generate-schemas/go.sum index a6d480bf3..01af2f12d 100644 --- a/hack/generate-schemas/go.sum +++ b/hack/generate-schemas/go.sum @@ -621,6 +621,9 @@ github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb0 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk= +github.com/RaveNoX/go-jsonmerge v1.0.0 h1:2e0nqnadoGUP8rAvcA0hkQelZreVO5X3BHomT2XMrAk= +github.com/RaveNoX/go-jsonmerge v1.0.0/go.mod h1:qYM/NA77LhO4h51JJM7Z+xBU3ovqrNIACZe+SkSNVFo= github.com/TomOnTime/utfutil v0.0.0-20230223141146-125e65197b36 h1:vfVc5pSCq58ljNpXXwUcLnHATYi/x+YUdqFc9uBhLbM= github.com/TomOnTime/utfutil v0.0.0-20230223141146-125e65197b36/go.mod h1:MwE/QxFCN65F0hKGWFHUh2U2o1p2tMPNR1zHkX6vEh8= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= @@ -649,6 +652,7 @@ github.com/aws/aws-sdk-go v1.48.15 h1:Gad2C4pLzuZDd5CA0Rvkfko6qUDDTOYru145gkO7w/ github.com/aws/aws-sdk-go v1.48.15/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= +github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b h1:6+ZFm0flnudZzdSE0JxlhR2hKnGPcNB35BjQf4RYQDY= @@ -711,8 +715,8 @@ github.com/evanphx/json-patch v5.7.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/flanksource/commons v1.19.2 h1:6JAnKzBBk5iUROrR79dm7Bzbg9beAiFTehkTeZyI2/g= github.com/flanksource/commons v1.19.2/go.mod h1:k+3B7McXUOS+TirYFR9h0pPk6mHNG3dqVUEY9gKI3/U= -github.com/flanksource/duty v1.0.236 h1:7+X0T9JFgM9U1cnd63jVLuxhpWsmQKpd+KQxWeuC8fI= -github.com/flanksource/duty v1.0.236/go.mod h1:6JdeVPo9aKq/nowsP60CTHQxe+oUPu6maMbusIApB8o= +github.com/flanksource/duty v1.0.245 h1:tfyrbQ//WFxni6lFQKuYNbPgoPvzKOU/0fBh0pXCp2g= +github.com/flanksource/duty v1.0.245/go.mod h1:nhvoArC48DByxrRvvcCKwRfbAfn9wUbo4YWietT9t7I= github.com/flanksource/gomplate/v3 v3.20.4/go.mod h1:27BNWhzzSjDed1z8YShO6W+z6G9oZXuxfNFGd/iGSdc= github.com/flanksource/gomplate/v3 v3.20.26 h1:85lUzlKgZjb1uIkzoa4zN03OcdOnFPG+oWxshZTYqz4= github.com/flanksource/gomplate/v3 v3.20.26/go.mod h1:GKmptFMdr2LbOuqwQZrmo9a/UygyZ0pbXffks8MuYhE= @@ -976,6 +980,7 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= @@ -1105,6 +1110,7 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk= +github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA= github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= @@ -1118,6 +1124,7 @@ github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs= github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= diff --git a/pkg/db/check_statuses.go b/pkg/db/check_statuses.go index 186adcfc9..1d6c54a5d 100644 --- a/pkg/db/check_statuses.go +++ b/pkg/db/check_statuses.go @@ -16,6 +16,7 @@ var RefreshCheckStatusSummary = job.Job{ Name: "RefreshCheckStatusSummary", Singleton: true, Timeout: 1 * time.Minute, + Schedule: "@every 1m", JobHistory: true, Fn: func(ctx job.JobRuntime) error { ctx.History.ResourceType = CheckStatuses @@ -26,6 +27,7 @@ var RefreshCheckStatusSummary = job.Job{ var RefreshCheckStatusSummaryAged = job.Job{ Name: "RefreshCheckStatusSummaryAged", Timeout: 60 * time.Minute, + Schedule: "@every 1h", Singleton: true, JobHistory: true, Fn: func(ctx job.JobRuntime) error {