github/troubleshoot
1
0
Fork 0
mirror of https://github.com/replicatedhq/troubleshoot.git synced 2026-02-14 18:29:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Docs say exclude, code says when

Browse Source
This commit is contained in:
Marc Campbell
2020-02-10 22:04:43 +00:00
parent c91a8ee60d
commit d1ab5a6991
5 changed files with 92 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
config/crds/troubleshoot.replicated.com_collectors.yaml
View File

@@ -66,19 +66,15 @@ spec:
properties:
collectorName:
type: string
when:
exclude:
type: boolean
required:
- when
type: object
clusterResources:
properties:
collectorName:
type: string
when:
exclude:
type: boolean
required:
- when
type: object
copy:
properties:
@@ -88,6 +84,8 @@ spec:
type: string
containerPath:
type: string
exclude:
type: boolean
name:
type: string
namespace:
@@ -96,13 +94,10 @@ spec:
items:
type: string
type: array
when:
type: boolean
required:
- containerPath
- namespace
- selector
- when
type: object
data:
properties:
@@ -110,13 +105,12 @@ spec:
type: string
data:
type: string
exclude:
type: boolean
name:
type: string
when:
type: boolean
required:
- data
- when
type: object
exec:
properties:
@@ -132,6 +126,8 @@ spec:
type: array
containerName:
type: string
exclude:
type: boolean
name:
type: string
namespace:
@@ -142,17 +138,16 @@ spec:
type: array
timeout:
type: string
when:
type: boolean
required:
- namespace
- selector
- when
type: object
http:
properties:
collectorName:
type: string
exclude:
type: boolean
get:
properties:
headers:
@@ -198,10 +193,6 @@ spec:
required:
- url
type: object
when:
type: boolean
required:
- when
type: object
logs:
properties:
@@ -211,6 +202,8 @@ spec:
items:
type: string
type: array
exclude:
type: boolean
limits:
properties:
maxAge:
@@ -227,11 +220,8 @@ spec:
items:
type: string
type: array
when:
type: boolean
required:
- selector
- when
type: object
run:
properties:
@@ -245,6 +235,8 @@ spec:
items:
type: string
type: array
exclude:
type: boolean
image:
type: string
imagePullPolicy:
@@ -255,17 +247,16 @@ spec:
type: string
timeout:
type: string
when:
type: boolean
required:
- image
- namespace
- when
type: object
secret:
properties:
collectorName:
type: string
exclude:
type: boolean
includeValue:
type: boolean
key:
@@ -274,11 +265,8 @@ spec:
type: string
namespace:
type: string
when:
type: boolean
required:
- name
- when
type: object
type: object
type: array

44
config/crds/troubleshoot.replicated.com_preflights.yaml
View File

@@ -600,19 +600,15 @@ spec:
properties:
collectorName:
type: string
when:
exclude:
type: boolean
required:
- when
type: object
clusterResources:
properties:
collectorName:
type: string
when:
exclude:
type: boolean
required:
- when
type: object
copy:
properties:
@@ -622,6 +618,8 @@ spec:
type: string
containerPath:
type: string
exclude:
type: boolean
name:
type: string
namespace:
@@ -630,13 +628,10 @@ spec:
items:
type: string
type: array
when:
type: boolean
required:
- containerPath
- namespace
- selector
- when
type: object
data:
properties:
@@ -644,13 +639,12 @@ spec:
type: string
data:
type: string
exclude:
type: boolean
name:
type: string
when:
type: boolean
required:
- data
- when
type: object
exec:
properties:
@@ -666,6 +660,8 @@ spec:
type: array
containerName:
type: string
exclude:
type: boolean
name:
type: string
namespace:
@@ -676,17 +672,16 @@ spec:
type: array
timeout:
type: string
when:
type: boolean
required:
- namespace
- selector
- when
type: object
http:
properties:
collectorName:
type: string
exclude:
type: boolean
get:
properties:
headers:
@@ -732,10 +727,6 @@ spec:
required:
- url
type: object
when:
type: boolean
required:
- when
type: object
logs:
properties:
@@ -745,6 +736,8 @@ spec:
items:
type: string
type: array
exclude:
type: boolean
limits:
properties:
maxAge:
@@ -761,11 +754,8 @@ spec:
items:
type: string
type: array
when:
type: boolean
required:
- selector
- when
type: object
run:
properties:
@@ -779,6 +769,8 @@ spec:
items:
type: string
type: array
exclude:
type: boolean
image:
type: string
imagePullPolicy:
@@ -789,17 +781,16 @@ spec:
type: string
timeout:
type: string
when:
type: boolean
required:
- image
- namespace
- when
type: object
secret:
properties:
collectorName:
type: string
exclude:
type: boolean
includeValue:
type: boolean
key:
@@ -808,11 +799,8 @@ spec:
type: string
namespace:
type: string
when:
type: boolean
required:
- name
- when
type: object
type: object
type: array

3
pkg/apis/troubleshoot/v1beta1/collector_shared.go
View File

@@ -9,7 +9,8 @@ import (
type CollectorMeta struct {
CollectorName string `json:"collectorName,omitempty" yaml:"collectorName,omitempty"`
Exclude bool `json:"when,omitmempty" yaml:"when,omitempty"`
// +optional
Exclude bool `json:"exclude,omitmempty" yaml:"exclude,omitempty"`
}
type ClusterInfo struct {

73
schemas/collector-troubleshoot-v1beta1.json
View File

@@ -62,28 +62,22 @@
"properties": {
"clusterInfo": {
"type": "object",
"required": [
"when"
],
"properties": {
"collectorName": {
"type": "string"
},
"when": {
"exclude": {
"type": "boolean"
}
}
},
"clusterResources": {
"type": "object",
"required": [
"when"
],
"properties": {
"collectorName": {
"type": "string"
},
"when": {
"exclude": {
"type": "boolean"
}
}
@@ -93,8 +87,7 @@
"required": [
"containerPath",
"namespace",
"selector",
"when"
"selector"
],
"properties": {
"collectorName": {
@@ -106,6 +99,9 @@
"containerPath": {
"type": "string"
},
"exclude": {
"type": "boolean"
},
"name": {
"type": "string"
},
@@ -117,17 +113,13 @@
"items": {
"type": "string"
}
},
"when": {
"type": "boolean"
}
}
},
"data": {
"type": "object",
"required": [
"data",
"when"
"data"
],
"properties": {
"collectorName": {
@@ -136,11 +128,11 @@
"data": {
"type": "string"
},
"exclude": {
"type": "boolean"
},
"name": {
"type": "string"
},
"when": {
"type": "boolean"
}
}
},
@@ -148,8 +140,7 @@
"type": "object",
"required": [
"namespace",
"selector",
"when"
"selector"
],
"properties": {
"args": {
@@ -170,6 +161,9 @@
"containerName": {
"type": "string"
},
"exclude": {
"type": "boolean"
},
"name": {
"type": "string"
},
@@ -184,21 +178,18 @@
},
"timeout": {
"type": "string"
},
"when": {
"type": "boolean"
}
}
},
"http": {
"type": "object",
"required": [
"when"
],
"properties": {
"collectorName": {
"type": "string"
},
"exclude": {
"type": "boolean"
},
"get": {
"type": "object",
"required": [
@@ -267,17 +258,13 @@
"type": "string"
}
}
},
"when": {
"type": "boolean"
}
}
},
"logs": {
"type": "object",
"required": [
"selector",
"when"
"selector"
],
"properties": {
"collectorName": {
@@ -289,6 +276,9 @@
"type": "string"
}
},
"exclude": {
"type": "boolean"
},
"limits": {
"type": "object",
"properties": {
@@ -312,9 +302,6 @@
"items": {
"type": "string"
}
},
"when": {
"type": "boolean"
}
}
},
@@ -322,8 +309,7 @@
"type": "object",
"required": [
"image",
"namespace",
"when"
"namespace"
],
"properties": {
"args": {
@@ -341,6 +327,9 @@
"type": "string"
}
},
"exclude": {
"type": "boolean"
},
"image": {
"type": "string"
},
@@ -355,22 +344,21 @@
},
"timeout": {
"type": "string"
},
"when": {
"type": "boolean"
}
}
},
"secret": {
"type": "object",
"required": [
"name",
"when"
"name"
],
"properties": {
"collectorName": {
"type": "string"
},
"exclude": {
"type": "boolean"
},
"includeValue": {
"type": "boolean"
},
@@ -382,9 +370,6 @@
},
"namespace": {
"type": "string"
},
"when": {
"type": "boolean"
}
}
}

73
schemas/preflight-troubleshoot-v1beta1.json
View File

@@ -888,28 +888,22 @@
"properties": {
"clusterInfo": {
"type": "object",
"required": [
"when"
],
"properties": {
"collectorName": {
"type": "string"
},
"when": {
"exclude": {
"type": "boolean"
}
}
},
"clusterResources": {
"type": "object",
"required": [
"when"
],
"properties": {
"collectorName": {
"type": "string"
},
"when": {
"exclude": {
"type": "boolean"
}
}
@@ -919,8 +913,7 @@
"required": [
"containerPath",
"namespace",
"selector",
"when"
"selector"
],
"properties": {
"collectorName": {
@@ -932,6 +925,9 @@
"containerPath": {
"type": "string"
},
"exclude": {
"type": "boolean"
},
"name": {
"type": "string"
},
@@ -943,17 +939,13 @@
"items": {
"type": "string"
}
},
"when": {
"type": "boolean"
}
}
},
"data": {
"type": "object",
"required": [
"data",
"when"
"data"
],
"properties": {
"collectorName": {
@@ -962,11 +954,11 @@
"data": {
"type": "string"
},
"exclude": {
"type": "boolean"
},
"name": {
"type": "string"
},
"when": {
"type": "boolean"
}
}
},
@@ -974,8 +966,7 @@
"type": "object",
"required": [
"namespace",
"selector",
"when"
"selector"
],
"properties": {
"args": {
@@ -996,6 +987,9 @@
"containerName": {
"type": "string"
},
"exclude": {
"type": "boolean"
},
"name": {
"type": "string"
},
@@ -1010,21 +1004,18 @@
},
"timeout": {
"type": "string"
},
"when": {
"type": "boolean"
}
}
},
"http": {
"type": "object",
"required": [
"when"
],
"properties": {
"collectorName": {
"type": "string"
},
"exclude": {
"type": "boolean"
},
"get": {
"type": "object",
"required": [
@@ -1093,17 +1084,13 @@
"type": "string"
}
}
},
"when": {
"type": "boolean"
}
}
},
"logs": {
"type": "object",
"required": [
"selector",
"when"
"selector"
],
"properties": {
"collectorName": {
@@ -1115,6 +1102,9 @@
"type": "string"
}
},
"exclude": {
"type": "boolean"
},
"limits": {
"type": "object",
"properties": {
@@ -1138,9 +1128,6 @@
"items": {
"type": "string"
}
},
"when": {
"type": "boolean"
}
}
},
@@ -1148,8 +1135,7 @@
"type": "object",
"required": [
"image",
"namespace",
"when"
"namespace"
],
"properties": {
"args": {
@@ -1167,6 +1153,9 @@
"type": "string"
}
},
"exclude": {
"type": "boolean"
},
"image": {
"type": "string"
},
@@ -1181,22 +1170,21 @@
},
"timeout": {
"type": "string"
},
"when": {
"type": "boolean"
}
}
},
"secret": {
"type": "object",
"required": [
"name",
"when"
"name"
],
"properties": {
"collectorName": {
"type": "string"
},
"exclude": {
"type": "boolean"
},
"includeValue": {
"type": "boolean"
},
@@ -1208,9 +1196,6 @@
},
"namespace": {
"type": "string"
},
"when": {
"type": "boolean"
}
}
}