mirrors/prometheus-operator
mirrors/prometheus-operator
1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-21 11:48:53 +00:00
Code Activity

Remove api flag from jsonnet files

Browse source
This commit is contained in:
Purandare, Aditya 2019-01-17 21:28:30 +05:30
parent 5a0b9f11c3
commit b2fd2d17a9
No known key found for this signature in database
GPG key ID: 483FE2FAF5FF9595
11 changed files with 8 additions and 420 deletions
Documentation
api.md
user-guides
getting-started.md
contrib/kube-prometheus
README.mdexample.jsonnet
jsonnet/kube-prometheus
kube-prometheus.libsonnet
prometheus
prometheus.libsonnet
manifests
prometheus-prometheus.yaml
example/prometheus-operator-crd
prometheus.crd.yaml
jsonnet/prometheus-operator
prometheus-crd.libsonnet
pkg
apis/monitoring/v1
openapi_generated.go
prometheus
statefulset.go

2
Documentation/api.md
View file

@ -280,7 +280,7 @@ PrometheusSpec is a specification of the desired behavior of the Prometheus clus
| evaluationInterval | Interval between consecutive evaluations. | string | false |
| rules | /--rules.*/ command-line arguments. | [Rules](#rules) | false |
| externalLabels | The labels to add to any time series or alerts when communicating with external systems (federation, remote storage, Alertmanager). | map[string]string | false |
| enableAdminAPI | Enable access to prometheus web admin API. Defaults to the value of `false`. WARNING: Enabling the admin APIs enables mutating endpoints, to delete data, shutdown Prometheus, and more. Enabling this should be done with care and the user is advised to add additional authentication authorization via a proxy to ensure only clients authorized to perform these actions can do so. For more information see https://prometheus.io/docs/prometheus/latest/querying/api/#tsdb-admin-apis | string | false |
| enableAdminAPI | Enable access to prometheus web admin API. Defaults to the value of `false`. WARNING: Enabling the admin APIs enables mutating endpoints, to delete data, shutdown Prometheus, and more. Enabling this should be done with care and the user is advised to add additional authentication authorization via a proxy to ensure only clients authorized to perform these actions can do so. For more information see https://prometheus.io/docs/prometheus/latest/querying/api/#tsdb-admin-apis | bool | false |
| externalUrl | The external URL the Prometheus instances will be available under. This is necessary to generate correct URLs. This is necessary if Prometheus is not served from root of a DNS name. | string | false |
| routePrefix | The route prefix Prometheus registers HTTP handlers for. This is useful, if using ExternalURL and a proxy is rewriting HTTP routes of a request, and the actual ExternalURL is still true, but the server serves requests under a different route prefix. For example for use with `kubectl proxy`. | string | false |
| query | QuerySpec defines the query command line flags when starting Prometheus. | *[QuerySpec](#queryspec) | false |

2
Documentation/user-guides/getting-started.md
View file

@ -295,7 +295,7 @@ spec:
resources:
requests:
memory: 400Mi
enableAdminAPI: true
enableAdminAPI: false
```
> If you have RBAC authorization activated, use the RBAC aware [Prometheus manifest][prometheus-manifest] instead.

1
contrib/kube-prometheus/README.md
View file

@ -281,7 +281,6 @@ These are the available fields with their respective default values:
names: 'k8s',
replicas: 2,
rules: {},
enableAdminAPI: 'false',
},
alertmanager+:: {

2
contrib/kube-prometheus/example.jsonnet
View file

@ -1,7 +1,7 @@
local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') + {
_config+:: {
namespace: 'monitoring',
}
},
};
{ ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) } +

3
contrib/kube-prometheus/jsonnet/kube-prometheus/kube-prometheus.libsonnet
View file

@ -82,8 +82,6 @@ local configMapList = k.core.v1.configMapList;
prometheusSelector: 'job="prometheus-k8s"',
prometheusOperatorSelector: 'job="prometheus-operator"',
enableAdminAPI: 'false',
jobs: {
Kubelet: $._config.kubeletSelector,
KubeScheduler: $._config.kubeSchedulerSelector,
@ -99,7 +97,6 @@ local configMapList = k.core.v1.configMapList;
prometheus+:: {
rules: $.prometheusRules + $.prometheusAlerts,
enableAdminAPI: $._config.enableAdminAPI,
},
grafana+:: {

1
contrib/kube-prometheus/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
View file

@ -18,7 +18,6 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
prometheus+:: {
name: 'k8s',
enableAdminAPI: 'false',
replicas: 2,
rules: {},
renderedRules: {},

1
contrib/kube-prometheus/manifests/prometheus-prometheus.yaml
View file

@ -12,7 +12,6 @@ spec:
namespace: monitoring
port: web
baseImage: quay.io/prometheus/prometheus
enableAdminAPI: false
nodeSelector:
beta.kubernetes.io/os: linux
replicas: 2

143
example/prometheus-operator-crd/prometheus.crd.yaml
View file

@ -42,7 +42,6 @@ spec:
type: boolean
required:
- key
type: object
additionalAlertRelabelConfigs:
description: SecretKeySelector selects a key of a Secret.
properties:
@ -58,7 +57,6 @@ spec:
type: boolean
required:
- key
type: object
additionalScrapeConfigs:
description: SecretKeySelector selects a key of a Secret.
properties:
@ -74,7 +72,6 @@ spec:
type: boolean
required:
- key
type: object
affinity:
description: Affinity is a group of affinity scheduling rules.
properties:
@ -137,7 +134,6 @@ spec:
required:
- key
- operator
type: object
type: array
matchFields:
description: A list of node selector requirements
@ -171,9 +167,7 @@ spec:
required:
- key
- operator
type: object
type: array
type: object
weight:
description: Weight associated with matching the corresponding
nodeSelectorTerm, in the range 1-100.
@ -182,7 +176,6 @@ spec:
required:
- weight
- preference
type: object
type: array
requiredDuringSchedulingIgnoredDuringExecution:
description: A node selector represents the union of the results
@ -231,7 +224,6 @@ spec:
required:
- key
- operator
type: object
type: array
matchFields:
description: A list of node selector requirements
@ -265,14 +257,10 @@ spec:
required:
- key
- operator
type: object
type: array
type: object
type: array
required:
- nodeSelectorTerms
type: object
type: object
podAffinity:
description: Pod affinity is a group of inter pod affinity scheduling
rules.
@ -339,7 +327,6 @@ spec:
required:
- key
- operator
type: object
type: array
matchLabels:
description: matchLabels is a map of {key,value}
@ -349,7 +336,6 @@ spec:
and the values array contains only "value".
The requirements are ANDed.
type: object
type: object
namespaces:
description: namespaces specifies which namespaces
the labelSelector applies to (matches against);
@ -368,7 +354,6 @@ spec:
type: string
required:
- topologyKey
type: object
weight:
description: weight associated with matching the corresponding
podAffinityTerm, in the range 1-100.
@ -377,7 +362,6 @@ spec:
required:
- weight
- podAffinityTerm
type: object
type: array
requiredDuringSchedulingIgnoredDuringExecution:
description: If the affinity requirements specified by this
@ -434,7 +418,6 @@ spec:
required:
- key
- operator
type: object
type: array
matchLabels:
description: matchLabels is a map of {key,value} pairs.
@ -443,7 +426,6 @@ spec:
is "key", the operator is "In", and the values array
contains only "value". The requirements are ANDed.
type: object
type: object
namespaces:
description: namespaces specifies which namespaces the
labelSelector applies to (matches against); null or
@ -462,9 +444,7 @@ spec:
type: string
required:
- topologyKey
type: object
type: array
type: object
podAntiAffinity:
description: Pod anti affinity is a group of inter pod anti affinity
scheduling rules.
@ -532,7 +512,6 @@ spec:
required:
- key
- operator
type: object
type: array
matchLabels:
description: matchLabels is a map of {key,value}
@ -542,7 +521,6 @@ spec:
and the values array contains only "value".
The requirements are ANDed.
type: object
type: object
namespaces:
description: namespaces specifies which namespaces
the labelSelector applies to (matches against);
@ -561,7 +539,6 @@ spec:
type: string
required:
- topologyKey
type: object
weight:
description: weight associated with matching the corresponding
podAffinityTerm, in the range 1-100.
@ -570,7 +547,6 @@ spec:
required:
- weight
- podAffinityTerm
type: object
type: array
requiredDuringSchedulingIgnoredDuringExecution:
description: If the anti-affinity requirements specified by
@ -627,7 +603,6 @@ spec:
required:
- key
- operator
type: object
type: array
matchLabels:
description: matchLabels is a map of {key,value} pairs.
@ -636,7 +611,6 @@ spec:
is "key", the operator is "In", and the values array
contains only "value". The requirements are ANDed.
type: object
type: object
namespaces:
description: namespaces specifies which namespaces the
labelSelector applies to (matches against); null or
@ -655,10 +629,7 @@ spec:
type: string
required:
- topologyKey
type: object
type: array
type: object
type: object
alerting:
description: AlertingSpec defines parameters for alerting configuration
of Prometheus servers.
@ -709,16 +680,13 @@ spec:
serverName:
description: Used to verify the hostname for the targets.
type: string
type: object
required:
- namespace
- name
- port
type: object
type: array
required:
- alertmanagers
type: object
apiserverConfig:
description: 'APIServerConfig defines a host and auth methods to access
apiserver. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#kubernetes_sd_config'
@ -743,7 +711,6 @@ spec:
type: boolean
required:
- key
type: object
username:
description: SecretKeySelector selects a key of a Secret.
properties:
@ -760,8 +727,6 @@ spec:
type: boolean
required:
- key
type: object
type: object
bearerToken:
description: Bearer token for accessing apiserver.
type: string
@ -790,10 +755,8 @@ spec:
serverName:
description: Used to verify the hostname for the targets.
type: string
type: object
required:
- host
type: object
baseImage:
description: Base image to use for a Prometheus deployment.
type: string
@ -875,7 +838,6 @@ spec:
type: boolean
required:
- key
type: object
fieldRef:
description: ObjectFieldSelector selects an APIVersioned
field of an object.
@ -890,7 +852,6 @@ spec:
type: string
required:
- fieldPath
type: object
resourceFieldRef:
description: ResourceFieldSelector represents container
resources (cpu, memory) and their output format
@ -905,7 +866,6 @@ spec:
type: string
required:
- resource
type: object
secretKeyRef:
description: SecretKeySelector selects a key of a Secret.
properties:
@ -922,11 +882,8 @@ spec:
type: boolean
required:
- key
type: object
type: object
required:
- name
type: object
type: array
envFrom:
description: List of sources to populate environment variables
@ -952,7 +909,6 @@ spec:
optional:
description: Specify whether the ConfigMap must be defined
type: boolean
type: object
prefix:
description: An optional identifier to prepend to each key
in the ConfigMap. Must be a C_IDENTIFIER.
@ -969,8 +925,6 @@ spec:
optional:
description: Specify whether the Secret must be defined
type: boolean
type: object
type: object
type: array
image:
description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images
@ -1010,7 +964,6 @@ spec:
items:
type: string
type: array
type: object
httpGet:
description: HTTPGetAction describes an action based on
HTTP Get requests.
@ -1036,7 +989,6 @@ spec:
required:
- name
- value
type: object
type: array
path:
description: Path to access on the HTTP server.
@ -1051,7 +1003,6 @@ spec:
type: string
required:
- port
type: object
tcpSocket:
description: TCPSocketAction describes an action based
on opening a socket
@ -1066,8 +1017,6 @@ spec:
- type: integer
required:
- port
type: object
type: object
preStop:
description: Handler defines a specific action that should
be taken
@ -1088,7 +1037,6 @@ spec:
items:
type: string
type: array
type: object
httpGet:
description: HTTPGetAction describes an action based on
HTTP Get requests.
@ -1114,7 +1062,6 @@ spec:
required:
- name
- value
type: object
type: array
path:
description: Path to access on the HTTP server.
@ -1129,7 +1076,6 @@ spec:
type: string
required:
- port
type: object
tcpSocket:
description: TCPSocketAction describes an action based
on opening a socket
@ -1144,9 +1090,6 @@ spec:
- type: integer
required:
- port
type: object
type: object
type: object
livenessProbe:
description: Probe describes a health check to be performed against
a container to determine whether it is alive or ready to receive
@ -1167,7 +1110,6 @@ spec:
items:
type: string
type: array
type: object
failureThreshold:
description: Minimum consecutive failures for the probe to
be considered failed after having succeeded. Defaults to
@ -1199,7 +1141,6 @@ spec:
required:
- name
- value
type: object
type: array
path:
description: Path to access on the HTTP server.
@ -1214,7 +1155,6 @@ spec:
type: string
required:
- port
type: object
initialDelaySeconds:
description: 'Number of seconds after the container has started
before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
@ -1245,14 +1185,12 @@ spec:
- type: integer
required:
- port
type: object
timeoutSeconds:
description: 'Number of seconds after which the probe times
out. Defaults to 1 second. Minimum value is 1. More info:
https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
format: int32
type: integer
type: object
name:
description: Name of the container specified as a DNS_LABEL. Each
container in a pod must have a unique name (DNS_LABEL). Cannot
@ -1297,7 +1235,6 @@ spec:
type: string
required:
- containerPort
type: object
type: array
readinessProbe:
description: Probe describes a health check to be performed against
@ -1319,7 +1256,6 @@ spec:
items:
type: string
type: array
type: object
failureThreshold:
description: Minimum consecutive failures for the probe to
be considered failed after having succeeded. Defaults to
@ -1351,7 +1287,6 @@ spec:
required:
- name
- value
type: object
type: array
path:
description: Path to access on the HTTP server.
@ -1366,7 +1301,6 @@ spec:
type: string
required:
- port
type: object
initialDelaySeconds:
description: 'Number of seconds after the container has started
before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
@ -1397,14 +1331,12 @@ spec:
- type: integer
required:
- port
type: object
timeoutSeconds:
description: 'Number of seconds after which the probe times
out. Defaults to 1 second. Minimum value is 1. More info:
https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
format: int32
type: integer
type: object
resources:
description: ResourceRequirements describes the compute resource
requirements.
@ -1419,7 +1351,6 @@ spec:
it defaults to Limits if that is explicitly specified, otherwise
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
type: object
securityContext:
description: SecurityContext holds security configuration that
will be applied to a container. Some fields are present in both
@ -1448,7 +1379,6 @@ spec:
items:
type: string
type: array
type: object
privileged:
description: Run container in privileged mode. Processes in
privileged containers are essentially equivalent to root
@ -1510,8 +1440,6 @@ spec:
description: User is a SELinux user label that applies
to the container.
type: string
type: object
type: object
stdin:
description: Whether this container should allocate a buffer for
stdin in the container runtime. If this is not set, reads from
@ -1570,7 +1498,6 @@ spec:
required:
- name
- devicePath
type: object
type: array
volumeMounts:
description: Pod volumes to mount into the container's filesystem.
@ -1603,7 +1530,6 @@ spec:
required:
- name
- mountPath
type: object
type: array
workingDir:
description: Container's working directory. If not specified,
@ -1612,7 +1538,6 @@ spec:
type: string
required:
- name
type: object
type: array
enableAdminAPI:
description: 'Enable access to prometheus web admin API. Defaults to
@ -1621,7 +1546,7 @@ spec:
this should be done with care and the user is advised to add additional
authentication authorization via a proxy to ensure only clients authorized
to perform these actions can do so. For more information see https://prometheus.io/docs/prometheus/latest/querying/api/#tsdb-admin-apis'
type: string
type: boolean
evaluationInterval:
description: Interval between consecutive evaluations.
type: string
@ -1651,7 +1576,6 @@ spec:
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
type: string
type: object
type: array
listenLocal:
description: ListenLocal makes the Prometheus server listen on loopback,
@ -1742,7 +1666,6 @@ spec:
type: string
required:
- name
type: object
type: array
result:
description: Status is a return value for calls that don't return
@ -1795,7 +1718,6 @@ spec:
the cause of the error. If this value is empty
there is no information available.
type: string
type: object
type: array
group:
description: The group attribute of the resource associated
@ -1825,7 +1747,6 @@ spec:
single resource which can be described). More info:
http://kubernetes.io/docs/user-guide/identifiers#uids'
type: string
type: object
kind:
description: 'Kind is a string value representing the REST
resource this object represents. Servers may infer this
@ -1867,7 +1788,6 @@ spec:
description: selfLink is a URL representing this object.
Populated by the system. Read-only.
type: string
type: object
reason:
description: A machine-readable description of why this
operation is in the "Failure" status. If this value is
@ -1878,10 +1798,8 @@ spec:
description: 'Status of the operation. One of: "Success"
or "Failure". More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status'
type: string
type: object
required:
- pending
type: object
labels:
description: 'Map of string keys and values that can be used to
organize and categorize (scope and select) objects. May match
@ -1940,7 +1858,6 @@ spec:
- kind
- name
- uid
type: object
type: array
resourceVersion:
description: |-
@ -1958,7 +1875,6 @@ spec:
Populated by the system. Read-only. More info: http://kubernetes.io/docs/user-guide/identifiers#uids
type: string
type: object
priorityClassName:
description: Priority class assigned to the Pods
type: string
@ -1977,7 +1893,6 @@ spec:
timeout:
description: Maximum time a query may take before being aborted.
type: string
type: object
remoteRead:
description: If specified, the remote_read spec. This is an experimental
feature, it may change in any upcoming release in a breaking way.
@ -2005,7 +1920,6 @@ spec:
type: boolean
required:
- key
type: object
username:
description: SecretKeySelector selects a key of a Secret.
properties:
@ -2022,8 +1936,6 @@ spec:
type: boolean
required:
- key
type: object
type: object
bearerToken:
description: bearer token for remote read.
type: string
@ -2062,13 +1974,11 @@ spec:
serverName:
description: Used to verify the hostname for the targets.
type: string
type: object
url:
description: The URL of the endpoint to send samples to.
type: string
required:
- url
type: object
type: array
remoteWrite:
description: If specified, the remote_write spec. This is an experimental
@ -2097,7 +2007,6 @@ spec:
type: boolean
required:
- key
type: object
username:
description: SecretKeySelector selects a key of a Secret.
properties:
@ -2114,8 +2023,6 @@ spec:
type: boolean
required:
- key
type: object
type: object
bearerToken:
description: File to read bearer token for remote write.
type: string
@ -2166,7 +2073,6 @@ spec:
amount of concurrency.
format: int32
type: integer
type: object
remoteTimeout:
description: Timeout for requests to the remote write endpoint.
type: string
@ -2188,7 +2094,6 @@ spec:
serverName:
description: Used to verify the hostname for the targets.
type: string
type: object
url:
description: The URL of the endpoint to send samples to.
type: string
@ -2235,11 +2140,9 @@ spec:
in a replace action. It is mandatory for replace actions.
Regex capture groups are available.
type: string
type: object
type: array
required:
- url
type: object
type: array
replicas:
description: Number of instances to deploy for a Prometheus deployment.
@ -2258,7 +2161,6 @@ spec:
to Limits if that is explicitly specified, otherwise to an implementation-defined
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
type: object
retention:
description: Time duration Prometheus shall retain data for. Default
is '24h', and must match the regular expression `[0-9]+(ms|s|m|h|d|w|y)`
@ -2305,7 +2207,6 @@ spec:
required:
- key
- operator
type: object
type: array
matchLabels:
description: matchLabels is a map of {key,value} pairs. A single
@ -2314,7 +2215,6 @@ spec:
"In", and the values array contains only "value". The requirements
are ANDed.
type: object
type: object
ruleSelector:
description: A label selector is a label query over a set of resources.
The result of matchLabels and matchExpressions are ANDed. An empty
@ -2349,7 +2249,6 @@ spec:
required:
- key
- operator
type: object
type: array
matchLabels:
description: matchLabels is a map of {key,value} pairs. A single
@ -2358,7 +2257,6 @@ spec:
"In", and the values array contains only "value". The requirements
are ANDed.
type: object
type: object
rules:
description: /--rules.*/ command-line arguments
properties:
@ -2378,8 +2276,6 @@ spec:
description: Minimum amount of time to wait before resending
an alert to Alertmanager.
type: string
type: object
type: object
scrapeInterval:
description: Interval between consecutive scrapes.
type: string
@ -2449,7 +2345,6 @@ spec:
description: User is a SELinux user label that applies to the
container.
type: string
type: object
supplementalGroups:
description: A list of groups applied to the first process run in
each container, in addition to the container's primary GID. If
@ -2474,9 +2369,7 @@ spec:
required:
- name
- value
type: object
type: array
type: object
serviceAccountName:
description: ServiceAccountName is the name of the ServiceAccount to
use to run the Prometheus Pods.
@ -2515,7 +2408,6 @@ spec:
required:
- key
- operator
type: object
type: array
matchLabels:
description: matchLabels is a map of {key,value} pairs. A single
@ -2524,7 +2416,6 @@ spec:
"In", and the values array contains only "value". The requirements
are ANDed.
type: object
type: object
serviceMonitorSelector:
description: A label selector is a label query over a set of resources.
The result of matchLabels and matchExpressions are ANDed. An empty
@ -2559,7 +2450,6 @@ spec:
required:
- key
- operator
type: object
type: array
matchLabels:
description: matchLabels is a map of {key,value} pairs. A single
@ -2568,7 +2458,6 @@ spec:
"In", and the values array contains only "value". The requirements
are ANDed.
type: object
type: object
sha:
description: SHA of Prometheus container image to be deployed. Defaults
to the value of `version`. Similar to a tag, but the SHA explicitly
@ -2591,7 +2480,6 @@ spec:
Must be an empty string (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
type: string
sizeLimit: {}
type: object
volumeClaimTemplate:
description: PersistentVolumeClaim is a user's request for and claim
to a persistent volume
@ -2689,7 +2577,6 @@ spec:
type: string
required:
- name
type: object
type: array
result:
description: Status is a return value for calls that
@ -2745,7 +2632,6 @@ spec:
of the cause of the error. If this value
is empty there is no information available.
type: string
type: object
type: array
group:
description: The group attribute of the resource
@ -2776,7 +2662,6 @@ spec:
is a single resource which can be described).
More info: http://kubernetes.io/docs/user-guide/identifiers#uids'
type: string
type: object
kind:
description: 'Kind is a string value representing
the REST resource this object represents. Servers
@ -2823,7 +2708,6 @@ spec:
description: selfLink is a URL representing
this object. Populated by the system. Read-only.
type: string
type: object
reason:
description: A machine-readable description of why
this operation is in the "Failure" status. If
@ -2835,10 +2719,8 @@ spec:
description: 'Status of the operation. One of: "Success"
or "Failure". More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status'
type: string
type: object
required:
- pending
type: object
labels:
description: 'Map of string keys and values that can be
used to organize and categorize (scope and select) objects.
@ -2901,7 +2783,6 @@ spec:
- kind
- name
- uid
type: object
type: array
resourceVersion:
description: |-
@ -2919,7 +2800,6 @@ spec:
Populated by the system. Read-only. More info: http://kubernetes.io/docs/user-guide/identifiers#uids
type: string
type: object
spec:
description: PersistentVolumeClaimSpec describes the common
attributes of storage devices and allows a Source for provider-specific
@ -2951,7 +2831,6 @@ spec:
required:
- kind
- name
type: object
resources:
description: ResourceRequirements describes the compute
resource requirements.
@ -2967,7 +2846,6 @@ spec:
explicitly specified, otherwise to an implementation-defined
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
type: object
selector:
description: A label selector is a label query over a set
of resources. The result of matchLabels and matchExpressions
@ -3004,7 +2882,6 @@ spec:
required:
- key
- operator
type: object
type: array
matchLabels:
description: matchLabels is a map of {key,value} pairs.
@ -3013,7 +2890,6 @@ spec:
is "key", the operator is "In", and the values array
contains only "value". The requirements are ANDed.
type: object
type: object
storageClassName:
description: 'Name of the StorageClass required by the claim.
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
@ -3028,7 +2904,6 @@ spec:
description: VolumeName is the binding reference to the
PersistentVolume backing this claim.
type: string
type: object
status:
description: PersistentVolumeClaimStatus is the current status
of a persistent volume claim.
@ -3083,14 +2958,10 @@ spec:
required:
- type
- status
type: object
type: array
phase:
description: Phase represents the current phase of PersistentVolumeClaim.
type: string
type: object
type: object
type: object
tag:
description: Tag of Prometheus container image to be deployed. Defaults
to the value of `version`. Version is ignored if Tag is set.
@ -3127,8 +2998,6 @@ spec:
type: boolean
required:
- key
type: object
type: object
image:
description: Image if specified has precedence over baseImage, tag
and sha combinations. Specifying the version is still necessary
@ -3151,7 +3020,6 @@ spec:
type: boolean
required:
- key
type: object
peers:
description: Peers is a DNS name for Thanos to discover peers through.
type: string
@ -3169,7 +3037,6 @@ spec:
it defaults to Limits if that is explicitly specified, otherwise
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
type: object
s3:
description: 'Deprecated: ThanosS3Spec should be configured with
an ObjectStorageConfig secret starting with Thanos v0.2.0. ThanosS3Spec
@ -3191,7 +3058,6 @@ spec:
type: boolean
required:
- key
type: object
bucket:
description: S3-Compatible API bucket name for stored blocks.
type: string
@ -3221,12 +3087,10 @@ spec:
type: boolean
required:
- key
type: object
signatureVersion2:
description: Whether to use S3 Signature Version 2; otherwise
Signature Version 4 will be used.
type: boolean
type: object
sha:
description: SHA of Thanos container image to be deployed. Defaults
to the value of `version`. Similar to a tag, but the SHA explicitly
@ -3241,7 +3105,6 @@ spec:
version:
description: Version describes the version of Thanos to use.
type: string
type: object
tolerations:
description: If specified, the pod's tolerations.
items:
@ -3280,12 +3143,10 @@ spec:
If the operator is Exists, the value should be empty, otherwise
just a regular string.
type: string
type: object
type: array
version:
description: Version of Prometheus to be deployed.
type: string
type: object
status:
description: 'PrometheusStatus is the most recent observed status of the
Prometheus cluster. Read-only. Not included when requesting from the apiserver,
@ -3321,6 +3182,4 @@ spec:
- updatedReplicas
- availableReplicas
- unavailableReplicas
type: object
type: object
version: v1

2
jsonnet/prometheus-operator/prometheus-crd.libsonnet
View file

File diff suppressed because one or more lines are too long

269
pkg/apis/monitoring/v1/openapi_generated.go
View file

File diff suppressed because it is too large Load diff

2
pkg/prometheus/statefulset.go
View file

@ -381,7 +381,7 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config, ruleConfigMapName
securityContext = p.Spec.SecurityContext
}
if p.Spec.EnableAdminAPI == "true" {
if p.Spec.EnableAdminAPI {
promArgs = append(promArgs, "-web.enable-admin-api")
}