easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1561 from brancz/fix-generated-crds

Browse Source 
*: Fix CRD generation
This commit is contained in:
Frederic Branczyk
2018-07-04 16:37:20 +02:00
committed by GitHub
parent 938fe3745c 9c26600e0a
commit 17477a1107
4 changed files with 72 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
View File

@@ -11,7 +11,6 @@ spec:
scope: Namespaced scope: Namespaced
validation: validation:
openAPIV3Schema: openAPIV3Schema:
description: Alertmanager describes an Alertmanager cluster.
properties: properties:
apiVersion: apiVersion:
description: 'APIVersion defines the versioned schema of this representation description: 'APIVersion defines the versioned schema of this representation
@@ -815,7 +814,10 @@ spec:
path: path:
description: Path to access on the HTTP server. description: Path to access on the HTTP server.
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
scheme: scheme:
description: Scheme to use for connecting to the host. description: Scheme to use for connecting to the host.
Defaults to HTTP. Defaults to HTTP.
@@ -830,7 +832,10 @@ spec:
description: 'Optional: Host name to connect to, defaults description: 'Optional: Host name to connect to, defaults
to the pod IP.' to the pod IP.'
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
required: required:
- port - port
preStop: preStop:
@@ -882,7 +887,10 @@ spec:
path: path:
description: Path to access on the HTTP server. description: Path to access on the HTTP server.
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
scheme: scheme:
description: Scheme to use for connecting to the host. description: Scheme to use for connecting to the host.
Defaults to HTTP. Defaults to HTTP.
@@ -897,7 +905,10 @@ spec:
description: 'Optional: Host name to connect to, defaults description: 'Optional: Host name to connect to, defaults
to the pod IP.' to the pod IP.'
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
required: required:
- port - port
livenessProbe: livenessProbe:
@@ -955,7 +966,10 @@ spec:
path: path:
description: Path to access on the HTTP server. description: Path to access on the HTTP server.
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
scheme: scheme:
description: Scheme to use for connecting to the host. description: Scheme to use for connecting to the host.
Defaults to HTTP. Defaults to HTTP.
@@ -986,7 +1000,10 @@ spec:
description: 'Optional: Host name to connect to, defaults description: 'Optional: Host name to connect to, defaults
to the pod IP.' to the pod IP.'
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
required: required:
- port - port
timeoutSeconds: timeoutSeconds:
@@ -1095,7 +1112,10 @@ spec:
path: path:
description: Path to access on the HTTP server. description: Path to access on the HTTP server.
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
scheme: scheme:
description: Scheme to use for connecting to the host. description: Scheme to use for connecting to the host.
Defaults to HTTP. Defaults to HTTP.
@@ -1126,7 +1146,10 @@ spec:
description: 'Optional: Host name to connect to, defaults description: 'Optional: Host name to connect to, defaults
to the pod IP.' to the pod IP.'
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
required: required:
- port - port
timeoutSeconds: timeoutSeconds:
@@ -2379,12 +2402,4 @@ spec:
- updatedReplicas - updatedReplicas
- availableReplicas - availableReplicas
- unavailableReplicas - unavailableReplicas
required:
- spec
version: v1 version: v1
status:
acceptedNames:
kind: ""
plural: ""
conditions: null
storedVersions: null

54
manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml
View File

@@ -11,7 +11,6 @@ spec:
scope: Namespaced scope: Namespaced
validation: validation:
openAPIV3Schema: openAPIV3Schema:
description: Prometheus defines a Prometheus deployment.
properties: properties:
apiVersion: apiVersion:
description: 'APIVersion defines the versioned schema of this representation description: 'APIVersion defines the versioned schema of this representation
@@ -640,7 +639,10 @@ spec:
pathPrefix: pathPrefix:
description: Prefix for the HTTP path alerts are pushed to. description: Prefix for the HTTP path alerts are pushed to.
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
scheme: scheme:
description: Scheme to use when firing alerts. description: Scheme to use when firing alerts.
type: string type: string
@@ -898,7 +900,10 @@ spec:
path: path:
description: Path to access on the HTTP server. description: Path to access on the HTTP server.
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
scheme: scheme:
description: Scheme to use for connecting to the host. description: Scheme to use for connecting to the host.
Defaults to HTTP. Defaults to HTTP.
@@ -913,7 +918,10 @@ spec:
description: 'Optional: Host name to connect to, defaults description: 'Optional: Host name to connect to, defaults
to the pod IP.' to the pod IP.'
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
required: required:
- port - port
preStop: preStop:
@@ -965,7 +973,10 @@ spec:
path: path:
description: Path to access on the HTTP server. description: Path to access on the HTTP server.
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
scheme: scheme:
description: Scheme to use for connecting to the host. description: Scheme to use for connecting to the host.
Defaults to HTTP. Defaults to HTTP.
@@ -980,7 +991,10 @@ spec:
description: 'Optional: Host name to connect to, defaults description: 'Optional: Host name to connect to, defaults
to the pod IP.' to the pod IP.'
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
required: required:
- port - port
livenessProbe: livenessProbe:
@@ -1038,7 +1052,10 @@ spec:
path: path:
description: Path to access on the HTTP server. description: Path to access on the HTTP server.
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
scheme: scheme:
description: Scheme to use for connecting to the host. description: Scheme to use for connecting to the host.
Defaults to HTTP. Defaults to HTTP.
@@ -1069,7 +1086,10 @@ spec:
description: 'Optional: Host name to connect to, defaults description: 'Optional: Host name to connect to, defaults
to the pod IP.' to the pod IP.'
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
required: required:
- port - port
timeoutSeconds: timeoutSeconds:
@@ -1178,7 +1198,10 @@ spec:
path: path:
description: Path to access on the HTTP server. description: Path to access on the HTTP server.
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
scheme: scheme:
description: Scheme to use for connecting to the host. description: Scheme to use for connecting to the host.
Defaults to HTTP. Defaults to HTTP.
@@ -1209,7 +1232,10 @@ spec:
description: 'Optional: Host name to connect to, defaults description: 'Optional: Host name to connect to, defaults
to the pod IP.' to the pod IP.'
type: string type: string
port: {} port:
anyOf:
- type: string
- type: integer
required: required:
- port - port
timeoutSeconds: timeoutSeconds:
@@ -2961,12 +2987,4 @@ spec:
- updatedReplicas - updatedReplicas
- availableReplicas - availableReplicas
- unavailableReplicas - unavailableReplicas
required:
- spec
version: v1 version: v1
status:
acceptedNames:
kind: ""
plural: ""
conditions: null
storedVersions: null

9
manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
View File

@@ -11,7 +11,6 @@ spec:
scope: Namespaced scope: Namespaced
validation: validation:
openAPIV3Schema: openAPIV3Schema:
description: PrometheusRule defines alerting rules for a Prometheus instance
properties: properties:
apiVersion: apiVersion:
description: 'APIVersion defines the versioned schema of this representation description: 'APIVersion defines the versioned schema of this representation
@@ -337,12 +336,4 @@ spec:
- name - name
- rules - rules
type: array type: array
required:
- spec
version: v1 version: v1
status:
acceptedNames:
kind: ""
plural: ""
conditions: null
storedVersions: null

14
manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
View File

@@ -11,7 +11,6 @@ spec:
scope: Namespaced scope: Namespaced
validation: validation:
openAPIV3Schema: openAPIV3Schema:
description: ServiceMonitor defines monitoring for a set of services.
properties: properties:
apiVersion: apiVersion:
description: 'APIVersion defines the versioned schema of this representation description: 'APIVersion defines the versioned schema of this representation
@@ -143,7 +142,10 @@ spec:
scrapeTimeout: scrapeTimeout:
description: Timeout after which the scrape is ended description: Timeout after which the scrape is ended
type: string type: string
targetPort: {} targetPort:
anyOf:
- type: string
- type: integer
tlsConfig: tlsConfig:
description: TLSConfig specifies TLS configuration parameters. description: TLSConfig specifies TLS configuration parameters.
properties: properties:
@@ -230,12 +232,4 @@ spec:
required: required:
- endpoints - endpoints
- selector - selector
required:
- spec
version: v1 version: v1
status:
acceptedNames:
kind: ""
plural: ""
conditions: null
storedVersions: null