mirrors/kube-prometheus
1
0
Fork 0
mirror of https://github.com/prometheus-operator/kube-prometheus.git synced 2025-10-29 07:01:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #428 from pgier/prometheus-operator-v0.37.0

Browse Source 
update prometheus-operator to v0.37.0
This commit is contained in:
Frederic Branczyk 2020-03-03 19:44:45 +01:00 committed by GitHub
commit b6ad6644d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 852 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jsonnet/kube-prometheus/jsonnetfile.json
View File

@ -38,7 +38,7 @@
"subdir": "jsonnet/prometheus-operator" "subdir": "jsonnet/prometheus-operator"
} }
}, },
"version": "release-0.36" "version": "release-0.37"
}, },
{ {
"name": "etcd-mixin", "name": "etcd-mixin",

4
jsonnetfile.lock.json
View File

@ -127,8 +127,8 @@
"subdir": "jsonnet/prometheus-operator" "subdir": "jsonnet/prometheus-operator"
} }
}, },
"version": "89f35ef22db0dc24c523bf8be473bcbcf9ac81f6", "version": "59bdf55453ba08b4ed7c271cb3c6627058945ed5",
"sum": "KCO153lAOWmWfoj3rQGhLB+8UmyvQ2Bghu/ewDqVum4=" "sum": "qwMbUQkdPhAn9Sl4OVLgzmNOuOTnRLUmvv14I0unsa8="
}, },
{ {
"name": "promgrafonnet", "name": "promgrafonnet",

4
manifests/prometheus-operator-serviceMonitor.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.36.0 app.kubernetes.io/version: v0.37.0
name: prometheus-operator name: prometheus-operator
namespace: monitoring namespace: monitoring
spec: spec:
@ -15,4 +15,4 @@ spec:
matchLabels: matchLabels:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.36.0 app.kubernetes.io/version: v0.37.0

46
manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
View File

@ -719,7 +719,7 @@ spec:
description: 'Selects a field of the pod: supports metadata.name, description: 'Selects a field of the pod: supports metadata.name,
metadata.namespace, metadata.labels, metadata.annotations, metadata.namespace, metadata.labels, metadata.annotations,
spec.nodeName, spec.serviceAccountName, status.hostIP, spec.nodeName, spec.serviceAccountName, status.hostIP,
status.podIP.' status.podIP, status.podIPs.'
properties: properties:
apiVersion: apiVersion:
description: Version of the schema the FieldPath description: Version of the schema the FieldPath
@ -1440,9 +1440,8 @@ spec:
in image metadata if unspecified. May also be set in in image metadata if unspecified. May also be set in
PodSecurityContext. If set in both SecurityContext and PodSecurityContext. If set in both SecurityContext and
PodSecurityContext, the value specified in SecurityContext PodSecurityContext, the value specified in SecurityContext
takes precedence. This field is alpha-level and it is takes precedence. This field is beta-level and may be
only honored by servers that enable the WindowsRunAsUserName disabled with the WindowsRunAsUserName feature flag.
feature flag.
type: string type: string
type: object type: object
type: object type: object
@ -1661,7 +1660,7 @@ spec:
to SubPath but environment variable references $(VAR_NAME) to SubPath but environment variable references $(VAR_NAME)
are expanded using the container's environment. Defaults are expanded using the container's environment. Defaults
to "" (volume's root). SubPathExpr and SubPath are mutually to "" (volume's root). SubPathExpr and SubPath are mutually
exclusive. This field is beta in 1.15. exclusive.
type: string type: string
required: required:
- mountPath - mountPath
@ -1787,7 +1786,7 @@ spec:
description: 'Selects a field of the pod: supports metadata.name, description: 'Selects a field of the pod: supports metadata.name,
metadata.namespace, metadata.labels, metadata.annotations, metadata.namespace, metadata.labels, metadata.annotations,
spec.nodeName, spec.serviceAccountName, status.hostIP, spec.nodeName, spec.serviceAccountName, status.hostIP,
status.podIP.' status.podIP, status.podIPs.'
properties: properties:
apiVersion: apiVersion:
description: Version of the schema the FieldPath description: Version of the schema the FieldPath
@ -2508,9 +2507,8 @@ spec:
in image metadata if unspecified. May also be set in in image metadata if unspecified. May also be set in
PodSecurityContext. If set in both SecurityContext and PodSecurityContext. If set in both SecurityContext and
PodSecurityContext, the value specified in SecurityContext PodSecurityContext, the value specified in SecurityContext
takes precedence. This field is alpha-level and it is takes precedence. This field is beta-level and may be
only honored by servers that enable the WindowsRunAsUserName disabled with the WindowsRunAsUserName feature flag.
feature flag.
type: string type: string
type: object type: object
type: object type: object
@ -2729,7 +2727,7 @@ spec:
to SubPath but environment variable references $(VAR_NAME) to SubPath but environment variable references $(VAR_NAME)
are expanded using the container's environment. Defaults are expanded using the container's environment. Defaults
to "" (volume's root). SubPathExpr and SubPath are mutually to "" (volume's root). SubPathExpr and SubPath are mutually
exclusive. This field is beta in 1.15. exclusive.
type: string type: string
required: required:
- mountPath - mountPath
@ -2766,9 +2764,25 @@ spec:
are not goint to be performed, except for delete actions. are not goint to be performed, except for delete actions.
type: boolean type: boolean
podMetadata: podMetadata:
description: 'Standard object’s metadata. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#metadata description: PodMetadata configures Labels and Annotations which are
Metadata Labels and Annotations gets propagated to the prometheus propagated to the alertmanager pods.
pods.' properties:
annotations:
additionalProperties:
type: string
description: 'Annotations is an unstructured key value map stored
with a resource that may be set by external tools to store and
retrieve arbitrary metadata. They are not queryable and should
be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations'
type: object
labels:
additionalProperties:
type: string
description: 'Map of string keys and values that can be used to
organize and categorize (scope and select) objects. May match
selectors of replication controllers and services. More info:
http://kubernetes.io/docs/user-guide/labels'
type: object
type: object type: object
portName: portName:
description: Port name used for the pods and governing service. This description: Port name used for the pods and governing service. This
@ -2933,8 +2947,8 @@ spec:
metadata if unspecified. May also be set in PodSecurityContext. metadata if unspecified. May also be set in PodSecurityContext.
If set in both SecurityContext and PodSecurityContext, the If set in both SecurityContext and PodSecurityContext, the
value specified in SecurityContext takes precedence. This value specified in SecurityContext takes precedence. This
field is alpha-level and it is only honored by servers that field is beta-level and may be disabled with the WindowsRunAsUserName
enable the WindowsRunAsUserName feature flag. feature flag.
type: string type: string
type: object type: object
type: object type: object
@ -3250,7 +3264,7 @@ spec:
volume should be mounted. Behaves similarly to SubPath but environment volume should be mounted. Behaves similarly to SubPath but environment
variable references $(VAR_NAME) are expanded using the container's variable references $(VAR_NAME) are expanded using the container's
environment. Defaults to "" (volume's root). SubPathExpr and environment. Defaults to "" (volume's root). SubPathExpr and
SubPath are mutually exclusive. This field is beta in 1.15. SubPath are mutually exclusive.
type: string type: string
required: required:
- mountPath - mountPath

44
manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
View File

@ -1163,7 +1163,7 @@ spec:
description: 'Selects a field of the pod: supports metadata.name, description: 'Selects a field of the pod: supports metadata.name,
metadata.namespace, metadata.labels, metadata.annotations, metadata.namespace, metadata.labels, metadata.annotations,
spec.nodeName, spec.serviceAccountName, status.hostIP, spec.nodeName, spec.serviceAccountName, status.hostIP,
status.podIP.' status.podIP, status.podIPs.'
properties: properties:
apiVersion: apiVersion:
description: Version of the schema the FieldPath description: Version of the schema the FieldPath
@ -1884,9 +1884,8 @@ spec:
in image metadata if unspecified. May also be set in in image metadata if unspecified. May also be set in
PodSecurityContext. If set in both SecurityContext and PodSecurityContext. If set in both SecurityContext and
PodSecurityContext, the value specified in SecurityContext PodSecurityContext, the value specified in SecurityContext
takes precedence. This field is alpha-level and it is takes precedence. This field is beta-level and may be
only honored by servers that enable the WindowsRunAsUserName disabled with the WindowsRunAsUserName feature flag.
feature flag.
type: string type: string
type: object type: object
type: object type: object
@ -2105,7 +2104,7 @@ spec:
to SubPath but environment variable references $(VAR_NAME) to SubPath but environment variable references $(VAR_NAME)
are expanded using the container's environment. Defaults are expanded using the container's environment. Defaults
to "" (volume's root). SubPathExpr and SubPath are mutually to "" (volume's root). SubPathExpr and SubPath are mutually
exclusive. This field is beta in 1.15. exclusive.
type: string type: string
required: required:
- mountPath - mountPath
@ -2262,7 +2261,7 @@ spec:
description: 'Selects a field of the pod: supports metadata.name, description: 'Selects a field of the pod: supports metadata.name,
metadata.namespace, metadata.labels, metadata.annotations, metadata.namespace, metadata.labels, metadata.annotations,
spec.nodeName, spec.serviceAccountName, status.hostIP, spec.nodeName, spec.serviceAccountName, status.hostIP,
status.podIP.' status.podIP, status.podIPs.'
properties: properties:
apiVersion: apiVersion:
description: Version of the schema the FieldPath description: Version of the schema the FieldPath
@ -2983,9 +2982,8 @@ spec:
in image metadata if unspecified. May also be set in in image metadata if unspecified. May also be set in
PodSecurityContext. If set in both SecurityContext and PodSecurityContext. If set in both SecurityContext and
PodSecurityContext, the value specified in SecurityContext PodSecurityContext, the value specified in SecurityContext
takes precedence. This field is alpha-level and it is takes precedence. This field is beta-level and may be
only honored by servers that enable the WindowsRunAsUserName disabled with the WindowsRunAsUserName feature flag.
feature flag.
type: string type: string
type: object type: object
type: object type: object
@ -3204,7 +3202,7 @@ spec:
to SubPath but environment variable references $(VAR_NAME) to SubPath but environment variable references $(VAR_NAME)
are expanded using the container's environment. Defaults are expanded using the container's environment. Defaults
to "" (volume's root). SubPathExpr and SubPath are mutually to "" (volume's root). SubPathExpr and SubPath are mutually
exclusive. This field is beta in 1.15. exclusive.
type: string type: string
required: required:
- mountPath - mountPath
@ -3249,9 +3247,25 @@ spec:
for deletion will be performed on the underlying objects. for deletion will be performed on the underlying objects.
type: boolean type: boolean
podMetadata: podMetadata:
description: 'Standard object’s metadata. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#metadata description: PodMetadata configures Labels and Annotations which are
Metadata Labels and Annotations gets propagated to the prometheus propagated to the prometheus pods.
pods.' properties:
annotations:
additionalProperties:
type: string
description: 'Annotations is an unstructured key value map stored
with a resource that may be set by external tools to store and
retrieve arbitrary metadata. They are not queryable and should
be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations'
type: object
labels:
additionalProperties:
type: string
description: 'Map of string keys and values that can be used to
organize and categorize (scope and select) objects. May match
selectors of replication controllers and services. More info:
http://kubernetes.io/docs/user-guide/labels'
type: object
type: object type: object
podMonitorNamespaceSelector: podMonitorNamespaceSelector:
description: Namespaces to be selected for PodMonitor discovery. If description: Namespaces to be selected for PodMonitor discovery. If
@ -4133,8 +4147,8 @@ spec:
metadata if unspecified. May also be set in PodSecurityContext. metadata if unspecified. May also be set in PodSecurityContext.
If set in both SecurityContext and PodSecurityContext, the If set in both SecurityContext and PodSecurityContext, the
value specified in SecurityContext takes precedence. This value specified in SecurityContext takes precedence. This
field is alpha-level and it is only honored by servers that field is beta-level and may be disabled with the WindowsRunAsUserName
enable the WindowsRunAsUserName feature flag. feature flag.
type: string type: string
type: object type: object
type: object type: object

795
manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml
View File

@ -33,6 +33,578 @@ spec:
description: 'Specification of the desired behavior of the ThanosRuler cluster. description: 'Specification of the desired behavior of the ThanosRuler cluster.
More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status'
properties: properties:
affinity:
description: If specified, the pod's scheduling constraints.
properties:
nodeAffinity:
description: Describes node affinity scheduling rules for the pod.
properties:
preferredDuringSchedulingIgnoredDuringExecution:
description: The scheduler will prefer to schedule pods to nodes
that satisfy the affinity expressions specified by this field,
but it may choose a node that violates one or more of the
expressions. The node that is most preferred is the one with
the greatest sum of weights, i.e. for each node that meets
all of the scheduling requirements (resource request, requiredDuringScheduling
affinity expressions, etc.), compute a sum by iterating through
the elements of this field and adding "weight" to the sum
if the node matches the corresponding matchExpressions; the
node(s) with the highest sum are the most preferred.
items:
description: An empty preferred scheduling term matches all
objects with implicit weight 0 (i.e. it's a no-op). A null
preferred scheduling term matches no objects (i.e. is also
a no-op).
properties:
preference:
description: A node selector term, associated with the
corresponding weight.
properties:
matchExpressions:
description: A list of node selector requirements
by node's labels.
items:
description: A node selector requirement is a selector
that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: The label key that the selector
applies to.
type: string
operator:
description: Represents a key's relationship
to a set of values. Valid operators are In,
NotIn, Exists, DoesNotExist. Gt, and Lt.
type: string
values:
description: An array of string values. If the
operator is In or NotIn, the values array
must be non-empty. If the operator is Exists
or DoesNotExist, the values array must be
empty. If the operator is Gt or Lt, the values
array must have a single element, which will
be interpreted as an integer. This array is
replaced during a strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchFields:
description: A list of node selector requirements
by node's fields.
items:
description: A node selector requirement is a selector
that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: The label key that the selector
applies to.
type: string
operator:
description: Represents a key's relationship
to a set of values. Valid operators are In,
NotIn, Exists, DoesNotExist. Gt, and Lt.
type: string
values:
description: An array of string values. If the
operator is In or NotIn, the values array
must be non-empty. If the operator is Exists
or DoesNotExist, the values array must be
empty. If the operator is Gt or Lt, the values
array must have a single element, which will
be interpreted as an integer. This array is
replaced during a strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
type: object
weight:
description: Weight associated with matching the corresponding
nodeSelectorTerm, in the range 1-100.
format: int32
type: integer
required:
- preference
- weight
type: object
type: array
requiredDuringSchedulingIgnoredDuringExecution:
description: If the affinity requirements specified by this
field are not met at scheduling time, the pod will not be
scheduled onto the node. If the affinity requirements specified
by this field cease to be met at some point during pod execution
(e.g. due to an update), the system may or may not try to
eventually evict the pod from its node.
properties:
nodeSelectorTerms:
description: Required. A list of node selector terms. The
terms are ORed.
items:
description: A null or empty node selector term matches
no objects. The requirements of them are ANDed. The
TopologySelectorTerm type implements a subset of the
NodeSelectorTerm.
properties:
matchExpressions:
description: A list of node selector requirements
by node's labels.
items:
description: A node selector requirement is a selector
that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: The label key that the selector
applies to.
type: string
operator:
description: Represents a key's relationship
to a set of values. Valid operators are In,
NotIn, Exists, DoesNotExist. Gt, and Lt.
type: string
values:
description: An array of string values. If the
operator is In or NotIn, the values array
must be non-empty. If the operator is Exists
or DoesNotExist, the values array must be
empty. If the operator is Gt or Lt, the values
array must have a single element, which will
be interpreted as an integer. This array is
replaced during a strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchFields:
description: A list of node selector requirements
by node's fields.
items:
description: A node selector requirement is a selector
that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: The label key that the selector
applies to.
type: string
operator:
description: Represents a key's relationship
to a set of values. Valid operators are In,
NotIn, Exists, DoesNotExist. Gt, and Lt.
type: string
values:
description: An array of string values. If the
operator is In or NotIn, the values array
must be non-empty. If the operator is Exists
or DoesNotExist, the values array must be
empty. If the operator is Gt or Lt, the values
array must have a single element, which will
be interpreted as an integer. This array is
replaced during a strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
type: object
type: array
required:
- nodeSelectorTerms
type: object
type: object
podAffinity:
description: Describes pod affinity scheduling rules (e.g. co-locate
this pod in the same node, zone, etc. as some other pod(s)).
properties:
preferredDuringSchedulingIgnoredDuringExecution:
description: The scheduler will prefer to schedule pods to nodes
that satisfy the affinity expressions specified by this field,
but it may choose a node that violates one or more of the
expressions. The node that is most preferred is the one with
the greatest sum of weights, i.e. for each node that meets
all of the scheduling requirements (resource request, requiredDuringScheduling
affinity expressions, etc.), compute a sum by iterating through
the elements of this field and adding "weight" to the sum
if the node has pods which matches the corresponding podAffinityTerm;
the node(s) with the highest sum are the most preferred.
items:
description: The weights of all of the matched WeightedPodAffinityTerm
fields are added per-node to find the most preferred node(s)
properties:
podAffinityTerm:
description: Required. A pod affinity term, associated
with the corresponding weight.
properties:
labelSelector:
description: A label query over a set of resources,
in this case pods.
properties:
matchExpressions:
description: matchExpressions is a list of label
selector requirements. The requirements are
ANDed.
items:
description: A label selector requirement is
a selector that contains values, a key, and
an operator that relates the key and values.
properties:
key:
description: key is the label key that the
selector applies to.
type: string
operator:
description: operator represents a key's
relationship to a set of values. Valid
operators are In, NotIn, Exists and DoesNotExist.
type: string
values:
description: values is an array of string
values. If the operator is In or NotIn,
the values array must be non-empty. If
the operator is Exists or DoesNotExist,
the values array must be empty. This array
is replaced during a strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value}
pairs. A single {key,value} in the matchLabels
map is equivalent to an element of matchExpressions,
whose key field 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 empty list means "this pod's namespace"
items:
type: string
type: array
topologyKey:
description: This pod should be co-located (affinity)
or not co-located (anti-affinity) with the pods
matching the labelSelector in the specified namespaces,
where co-located is defined as running on a node
whose value of the label with key topologyKey matches
that of any node on which any of the selected pods
is running. Empty topologyKey is not allowed.
type: string
required:
- topologyKey
type: object
weight:
description: weight associated with matching the corresponding
podAffinityTerm, in the range 1-100.
format: int32
type: integer
required:
- podAffinityTerm
- weight
type: object
type: array
requiredDuringSchedulingIgnoredDuringExecution:
description: If the affinity requirements specified by this
field are not met at scheduling time, the pod will not be
scheduled onto the node. If the affinity requirements specified
by this field cease to be met at some point during pod execution
(e.g. due to a pod label update), the system may or may not
try to eventually evict the pod from its node. When there
are multiple elements, the lists of nodes corresponding to
each podAffinityTerm are intersected, i.e. all terms must
be satisfied.
items:
description: Defines a set of pods (namely those matching
the labelSelector relative to the given namespace(s)) that
this pod should be co-located (affinity) or not co-located
(anti-affinity) with, where co-located is defined as running
on a node whose value of the label with key <topologyKey>
matches that of any node on which a pod of the set of pods
is running
properties:
labelSelector:
description: A label query over a set of resources, in
this case pods.
properties:
matchExpressions:
description: matchExpressions is a list of label selector
requirements. The requirements are ANDed.
items:
description: A label selector requirement is a selector
that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: key is the label key that the selector
applies to.
type: string
operator:
description: operator represents a key's relationship
to a set of values. Valid operators are In,
NotIn, Exists and DoesNotExist.
type: string
values:
description: values is an array of string values.
If the operator is In or NotIn, the values
array must be non-empty. If the operator is
Exists or DoesNotExist, the values array must
be empty. This array is replaced during a
strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value} pairs.
A single {key,value} in the matchLabels map is equivalent
to an element of matchExpressions, whose key field
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
empty list means "this pod's namespace"
items:
type: string
type: array
topologyKey:
description: This pod should be co-located (affinity)
or not co-located (anti-affinity) with the pods matching
the labelSelector in the specified namespaces, where
co-located is defined as running on a node whose value
of the label with key topologyKey matches that of any
node on which any of the selected pods is running. Empty
topologyKey is not allowed.
type: string
required:
- topologyKey
type: object
type: array
type: object
podAntiAffinity:
description: Describes pod anti-affinity scheduling rules (e.g.
avoid putting this pod in the same node, zone, etc. as some other
pod(s)).
properties:
preferredDuringSchedulingIgnoredDuringExecution:
description: The scheduler will prefer to schedule pods to nodes
that satisfy the anti-affinity expressions specified by this
field, but it may choose a node that violates one or more
of the expressions. The node that is most preferred is the
one with the greatest sum of weights, i.e. for each node that
meets all of the scheduling requirements (resource request,
requiredDuringScheduling anti-affinity expressions, etc.),
compute a sum by iterating through the elements of this field
and adding "weight" to the sum if the node has pods which
matches the corresponding podAffinityTerm; the node(s) with
the highest sum are the most preferred.
items:
description: The weights of all of the matched WeightedPodAffinityTerm
fields are added per-node to find the most preferred node(s)
properties:
podAffinityTerm:
description: Required. A pod affinity term, associated
with the corresponding weight.
properties:
labelSelector:
description: A label query over a set of resources,
in this case pods.
properties:
matchExpressions:
description: matchExpressions is a list of label
selector requirements. The requirements are
ANDed.
items:
description: A label selector requirement is
a selector that contains values, a key, and
an operator that relates the key and values.
properties:
key:
description: key is the label key that the
selector applies to.
type: string
operator:
description: operator represents a key's
relationship to a set of values. Valid
operators are In, NotIn, Exists and DoesNotExist.
type: string
values:
description: values is an array of string
values. If the operator is In or NotIn,
the values array must be non-empty. If
the operator is Exists or DoesNotExist,
the values array must be empty. This array
is replaced during a strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value}
pairs. A single {key,value} in the matchLabels
map is equivalent to an element of matchExpressions,
whose key field 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 empty list means "this pod's namespace"
items:
type: string
type: array
topologyKey:
description: This pod should be co-located (affinity)
or not co-located (anti-affinity) with the pods
matching the labelSelector in the specified namespaces,
where co-located is defined as running on a node
whose value of the label with key topologyKey matches
that of any node on which any of the selected pods
is running. Empty topologyKey is not allowed.
type: string
required:
- topologyKey
type: object
weight:
description: weight associated with matching the corresponding
podAffinityTerm, in the range 1-100.
format: int32
type: integer
required:
- podAffinityTerm
- weight
type: object
type: array
requiredDuringSchedulingIgnoredDuringExecution:
description: If the anti-affinity requirements specified by
this field are not met at scheduling time, the pod will not
be scheduled onto the node. If the anti-affinity requirements
specified by this field cease to be met at some point during
pod execution (e.g. due to a pod label update), the system
may or may not try to eventually evict the pod from its node.
When there are multiple elements, the lists of nodes corresponding
to each podAffinityTerm are intersected, i.e. all terms must
be satisfied.
items:
description: Defines a set of pods (namely those matching
the labelSelector relative to the given namespace(s)) that
this pod should be co-located (affinity) or not co-located
(anti-affinity) with, where co-located is defined as running
on a node whose value of the label with key <topologyKey>
matches that of any node on which a pod of the set of pods
is running
properties:
labelSelector:
description: A label query over a set of resources, in
this case pods.
properties:
matchExpressions:
description: matchExpressions is a list of label selector
requirements. The requirements are ANDed.
items:
description: A label selector requirement is a selector
that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: key is the label key that the selector
applies to.
type: string
operator:
description: operator represents a key's relationship
to a set of values. Valid operators are In,
NotIn, Exists and DoesNotExist.
type: string
values:
description: values is an array of string values.
If the operator is In or NotIn, the values
array must be non-empty. If the operator is
Exists or DoesNotExist, the values array must
be empty. This array is replaced during a
strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value} pairs.
A single {key,value} in the matchLabels map is equivalent
to an element of matchExpressions, whose key field
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
empty list means "this pod's namespace"
items:
type: string
type: array
topologyKey:
description: This pod should be co-located (affinity)
or not co-located (anti-affinity) with the pods matching
the labelSelector in the specified namespaces, where
co-located is defined as running on a node whose value
of the label with key topologyKey matches that of any
node on which any of the selected pods is running. Empty
topologyKey is not allowed.
type: string
required:
- topologyKey
type: object
type: array
type: object
type: object
alertDropLabels: alertDropLabels:
description: AlertDropLabels configure the label names which should description: AlertDropLabels configure the label names which should
be dropped in ThanosRuler alerts. If `labels` field is not provided, be dropped in ThanosRuler alerts. If `labels` field is not provided,
@ -150,7 +722,7 @@ spec:
description: 'Selects a field of the pod: supports metadata.name, description: 'Selects a field of the pod: supports metadata.name,
metadata.namespace, metadata.labels, metadata.annotations, metadata.namespace, metadata.labels, metadata.annotations,
spec.nodeName, spec.serviceAccountName, status.hostIP, spec.nodeName, spec.serviceAccountName, status.hostIP,
status.podIP.' status.podIP, status.podIPs.'
properties: properties:
apiVersion: apiVersion:
description: Version of the schema the FieldPath description: Version of the schema the FieldPath
@ -871,9 +1443,8 @@ spec:
in image metadata if unspecified. May also be set in in image metadata if unspecified. May also be set in
PodSecurityContext. If set in both SecurityContext and PodSecurityContext. If set in both SecurityContext and
PodSecurityContext, the value specified in SecurityContext PodSecurityContext, the value specified in SecurityContext
takes precedence. This field is alpha-level and it is takes precedence. This field is beta-level and may be
only honored by servers that enable the WindowsRunAsUserName disabled with the WindowsRunAsUserName feature flag.
feature flag.
type: string type: string
type: object type: object
type: object type: object
@ -1092,7 +1663,7 @@ spec:
to SubPath but environment variable references $(VAR_NAME) to SubPath but environment variable references $(VAR_NAME)
are expanded using the container's environment. Defaults are expanded using the container's environment. Defaults
to "" (volume's root). SubPathExpr and SubPath are mutually to "" (volume's root). SubPathExpr and SubPath are mutually
exclusive. This field is beta in 1.15. exclusive.
type: string type: string
required: required:
- mountPath - mountPath
@ -1116,6 +1687,11 @@ spec:
evaluationInterval: evaluationInterval:
description: Interval between consecutive evaluations. description: Interval between consecutive evaluations.
type: string type: string
externalPrefix:
description: The external URL the Thanos Ruler instances will be available
under. This is necessary to generate correct URLs. This is necessary
if Thanos Ruler is not served from root of a DNS name.
type: string
image: image:
description: Thanos container image URL. description: Thanos container image URL.
type: string type: string
@ -1217,7 +1793,7 @@ spec:
description: 'Selects a field of the pod: supports metadata.name, description: 'Selects a field of the pod: supports metadata.name,
metadata.namespace, metadata.labels, metadata.annotations, metadata.namespace, metadata.labels, metadata.annotations,
spec.nodeName, spec.serviceAccountName, status.hostIP, spec.nodeName, spec.serviceAccountName, status.hostIP,
status.podIP.' status.podIP, status.podIPs.'
properties: properties:
apiVersion: apiVersion:
description: Version of the schema the FieldPath description: Version of the schema the FieldPath
@ -1938,9 +2514,8 @@ spec:
in image metadata if unspecified. May also be set in in image metadata if unspecified. May also be set in
PodSecurityContext. If set in both SecurityContext and PodSecurityContext. If set in both SecurityContext and
PodSecurityContext, the value specified in SecurityContext PodSecurityContext, the value specified in SecurityContext
takes precedence. This field is alpha-level and it is takes precedence. This field is beta-level and may be
only honored by servers that enable the WindowsRunAsUserName disabled with the WindowsRunAsUserName feature flag.
feature flag.
type: string type: string
type: object type: object
type: object type: object
@ -2159,7 +2734,7 @@ spec:
to SubPath but environment variable references $(VAR_NAME) to SubPath but environment variable references $(VAR_NAME)
are expanded using the container's environment. Defaults are expanded using the container's environment. Defaults
to "" (volume's root). SubPathExpr and SubPath are mutually to "" (volume's root). SubPathExpr and SubPath are mutually
exclusive. This field is beta in 1.15. exclusive.
type: string type: string
required: required:
- mountPath - mountPath
@ -2192,6 +2767,11 @@ spec:
logLevel: logLevel:
description: Log level for ThanosRuler to be configured with. description: Log level for ThanosRuler to be configured with.
type: string type: string
nodeSelector:
additionalProperties:
type: string
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig: objectStorageConfig:
description: ObjectStorageConfig configures object storage in Thanos. description: ObjectStorageConfig configures object storage in Thanos.
properties: properties:
@ -2214,14 +2794,33 @@ spec:
for deletion will be performed on the underlying objects. for deletion will be performed on the underlying objects.
type: boolean type: boolean
podMetadata: podMetadata:
description: 'Standard object’s metadata. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#metadata description: PodMetadata contains Labels and Annotations gets propagated
Metadata Labels and Annotations gets propagated to the prometheus to the thanos ruler pods.
pods.' properties:
annotations:
additionalProperties:
type: string
description: 'Annotations is an unstructured key value map stored
with a resource that may be set by external tools to store and
retrieve arbitrary metadata. They are not queryable and should
be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations'
type: object
labels:
additionalProperties:
type: string
description: 'Map of string keys and values that can be used to
organize and categorize (scope and select) objects. May match
selectors of replication controllers and services. More info:
http://kubernetes.io/docs/user-guide/labels'
type: object
type: object type: object
portName: portName:
description: Port name used for the pods and governing service. This description: Port name used for the pods and governing service. This
defaults to web defaults to web
type: string type: string
priorityClassName:
description: Priority class assigned to the Pods
type: string
queryEndpoints: queryEndpoints:
description: QueryEndpoints defines Thanos querier endpoints from which description: QueryEndpoints defines Thanos querier endpoints from which
to query metrics. Maps to the --query flag of thanos ruler. to query metrics. Maps to the --query flag of thanos ruler.
@ -2233,8 +2832,8 @@ spec:
format: int32 format: int32
type: integer type: integer
resources: resources:
description: Resources defines the resource requirements for the Thanos description: Resources defines the resource requirements for single
sidecar. If not provided, no requests/limits will be set Pods. If not provided, no requests/limits will be set
properties: properties:
limits: limits:
additionalProperties: additionalProperties:
@ -2256,6 +2855,10 @@ spec:
is '24h', and must match the regular expression `[0-9]+(ms|s|m|h|d|w|y)` is '24h', and must match the regular expression `[0-9]+(ms|s|m|h|d|w|y)`
(milliseconds seconds minutes hours days weeks years). (milliseconds seconds minutes hours days weeks years).
type: string type: string
routePrefix:
description: The route prefix ThanosRuler registers HTTP handlers for.
This allows thanos UI to be served on a sub-path.
type: string
ruleNamespaceSelector: ruleNamespaceSelector:
description: Namespaces to be selected for Rules discovery. If unspecified, description: Namespaces to be selected for Rules discovery. If unspecified,
only the same namespace as the ThanosRuler object is in is used. only the same namespace as the ThanosRuler object is in is used.
@ -2344,6 +2947,128 @@ spec:
are ANDed. are ANDed.
type: object type: object
type: object type: object
securityContext:
description: SecurityContext holds pod-level security attributes and
common container settings. This defaults to the default PodSecurityContext.
properties:
fsGroup:
description: "A special supplemental group that applies to all containers
in a pod. Some volume types allow the Kubelet to change the ownership
of that volume to be owned by the pod: \n 1. The owning GID will
be the FSGroup 2. The setgid bit is set (new files created in
the volume will be owned by FSGroup) 3. The permission bits are
OR'd with rw-rw---- \n If unset, the Kubelet will not modify the
ownership and permissions of any volume."
format: int64
type: integer
runAsGroup:
description: The GID to run the entrypoint of the container process.
Uses runtime default if unset. May also be set in SecurityContext. If
set in both SecurityContext and PodSecurityContext, the value
specified in SecurityContext takes precedence for that container.
format: int64
type: integer
runAsNonRoot:
description: Indicates that the container must run as a non-root
user. If true, the Kubelet will validate the image at runtime
to ensure that it does not run as UID 0 (root) and fail to start
the container if it does. If unset or false, no such validation
will be performed. May also be set in SecurityContext. If set
in both SecurityContext and PodSecurityContext, the value specified
in SecurityContext takes precedence.
type: boolean
runAsUser:
description: The UID to run the entrypoint of the container process.
Defaults to user specified in image metadata if unspecified. May
also be set in SecurityContext. If set in both SecurityContext
and PodSecurityContext, the value specified in SecurityContext
takes precedence for that container.
format: int64
type: integer
seLinuxOptions:
description: The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux
context for each container. May also be set in SecurityContext. If
set in both SecurityContext and PodSecurityContext, the value
specified in SecurityContext takes precedence for that container.
properties:
level:
description: Level is SELinux level label that applies to the
container.
type: string
role:
description: Role is a SELinux role label that applies to the
container.
type: string
type:
description: Type is a SELinux type label that applies to the
container.
type: string
user:
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
unspecified, no groups will be added to any container.
items:
format: int64
type: integer
type: array
sysctls:
description: Sysctls hold a list of namespaced sysctls used for
the pod. Pods with unsupported sysctls (by the container runtime)
might fail to launch.
items:
description: Sysctl defines a kernel parameter to be set
properties:
name:
description: Name of a property to set
type: string
value:
description: Value of a property to set
type: string
required:
- name
- value
type: object
type: array
windowsOptions:
description: The Windows specific settings applied to all containers.
If unspecified, the options within a container's SecurityContext
will be used. If set in both SecurityContext and PodSecurityContext,
the value specified in SecurityContext takes precedence.
properties:
gmsaCredentialSpec:
description: GMSACredentialSpec is where the GMSA admission
webhook (https://github.com/kubernetes-sigs/windows-gmsa)
inlines the contents of the GMSA credential spec named by
the GMSACredentialSpecName field. This field is alpha-level
and is only honored by servers that enable the WindowsGMSA
feature flag.
type: string
gmsaCredentialSpecName:
description: GMSACredentialSpecName is the name of the GMSA
credential spec to use. This field is alpha-level and is only
honored by servers that enable the WindowsGMSA feature flag.
type: string
runAsUserName:
description: The UserName in Windows to run the entrypoint of
the container process. Defaults to the user specified in image
metadata if unspecified. May also be set in PodSecurityContext.
If set in both SecurityContext and PodSecurityContext, the
value specified in SecurityContext takes precedence. This
field is beta-level and may be disabled with the WindowsRunAsUserName
feature flag.
type: string
type: object
type: object
serviceAccountName:
description: ServiceAccountName is the name of the ServiceAccount to
use to run the Thanos Ruler Pods.
type: string
storage: storage:
description: Storage spec to specify how storage shall be used. description: Storage spec to specify how storage shall be used.
properties: properties:
@ -2564,6 +3289,46 @@ spec:
type: object type: object
type: object type: object
type: object type: object
tolerations:
description: If specified, the pod's tolerations.
items:
description: The pod this Toleration is attached to tolerates any
taint that matches the triple <key,value,effect> using the matching
operator <operator>.
properties:
effect:
description: Effect indicates the taint effect to match. Empty
means match all taint effects. When specified, allowed values
are NoSchedule, PreferNoSchedule and NoExecute.
type: string
key:
description: Key is the taint key that the toleration applies
to. Empty means match all taint keys. If the key is empty, operator
must be Exists; this combination means to match all values and
all keys.
type: string
operator:
description: Operator represents a key's relationship to the value.
Valid operators are Exists and Equal. Defaults to Equal. Exists
is equivalent to wildcard for value, so that a pod can tolerate
all taints of a particular category.
type: string
tolerationSeconds:
description: TolerationSeconds represents the period of time the
toleration (which must be of effect NoExecute, otherwise this
field is ignored) tolerates the taint. By default, it is not
set, which means tolerate the taint forever (do not evict).
Zero and negative values will be treated as 0 (evict immediately)
by the system.
format: int64
type: integer
value:
description: Value is the taint value the toleration matches to.
If the operator is Exists, the value should be empty, otherwise
just a regular string.
type: string
type: object
type: array
tracingConfig: tracingConfig:
description: TracingConfig configures tracing in Thanos. This is an description: TracingConfig configures tracing in Thanos. This is an
experimental feature, it may change in any upcoming release in a breaking experimental feature, it may change in any upcoming release in a breaking

2
manifests/setup/prometheus-operator-clusterRole.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.36.0 app.kubernetes.io/version: v0.37.0
name: prometheus-operator name: prometheus-operator
rules: rules:
- apiGroups: - apiGroups:

2
manifests/setup/prometheus-operator-clusterRoleBinding.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.36.0 app.kubernetes.io/version: v0.37.0
name: prometheus-operator name: prometheus-operator
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io

8
manifests/setup/prometheus-operator-deployment.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.36.0 app.kubernetes.io/version: v0.37.0
name: prometheus-operator name: prometheus-operator
namespace: monitoring namespace: monitoring
spec: spec:
@ -18,15 +18,15 @@ spec:
labels: labels:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.36.0 app.kubernetes.io/version: v0.37.0
spec: spec:
containers: containers:
- args: - args:
- --kubelet-service=kube-system/kubelet - --kubelet-service=kube-system/kubelet
- --logtostderr=true - --logtostderr=true
- --config-reloader-image=jimmidyson/configmap-reload:v0.3.0 - --config-reloader-image=jimmidyson/configmap-reload:v0.3.0
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.36.0 - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.37.0
image: quay.io/coreos/prometheus-operator:v0.36.0 image: quay.io/coreos/prometheus-operator:v0.37.0
name: prometheus-operator name: prometheus-operator
ports: ports:
- containerPort: 8080 - containerPort: 8080

2
manifests/setup/prometheus-operator-service.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.36.0 app.kubernetes.io/version: v0.37.0
name: prometheus-operator name: prometheus-operator
namespace: monitoring namespace: monitoring
spec: spec:

2
manifests/setup/prometheus-operator-serviceAccount.yaml
View File

@ -4,6 +4,6 @@ metadata:
labels: labels:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.36.0 app.kubernetes.io/version: v0.37.0
name: prometheus-operator name: prometheus-operator
namespace: monitoring namespace: monitoring