Skip to content

Commit 64f1e07

Browse files
committed
[bot] [main] Automated dependencies update
1 parent c52adcf commit 64f1e07

File tree

16 files changed

+505
-63
lines changed

16 files changed

+505
-63
lines changed

jsonnetfile.lock.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
"subdir": "operations/observability/mixins"
4040
}
4141
},
42-
"version": "9dfafc0966403a59885b0467b79b7880628b4915",
43-
"sum": "bu/LBqGbbP6MlqI89kdKjL0IFd5St2Z/jcS5R1e+mYU=",
42+
"version": "f54482b8c30b449ee5144ad408ca3289d440948e",
43+
"sum": "Z3EYrIXnwIWvG+tCdXxT+VAuSL4MDYOurQyiXvLuSsE=",
4444
"name": "gitpod"
4545
},
4646
{
@@ -100,7 +100,7 @@
100100
"subdir": "jsonnet/kube-state-metrics"
101101
}
102102
},
103-
"version": "cf66346e990d6d580aa4b2c6c5092c5271656c00",
103+
"version": "734389481ab1a47422f07e80ef93b4359cadbaed",
104104
"sum": "evJ+PXRzuM1tezCG5WzpAn4Lk3YJfMvDFcs+45fsscU="
105105
},
106106
{
@@ -110,7 +110,7 @@
110110
"subdir": "jsonnet/kube-state-metrics-mixin"
111111
}
112112
},
113-
"version": "cf66346e990d6d580aa4b2c6c5092c5271656c00",
113+
"version": "734389481ab1a47422f07e80ef93b4359cadbaed",
114114
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
115115
},
116116
{
@@ -120,7 +120,7 @@
120120
"subdir": "jsonnet/kube-prometheus"
121121
}
122122
},
123-
"version": "6190853c1cadd6499e2e2ed75b971264aae18b61",
123+
"version": "e08a1ec75a973535781e84b9a1eae6c41ab17f8d",
124124
"sum": "KYMcy+IXGGjXFvUxLEwoUzKJqxKAdDbibsy+KNlJL6g="
125125
},
126126
{
@@ -130,7 +130,7 @@
130130
"subdir": "jsonnet/mixin"
131131
}
132132
},
133-
"version": "17dce6489dae0707d4fc21e3459b555e8d1ee9f5",
133+
"version": "16225365d06bc91f55b8bae58d466123a60bc7a6",
134134
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
135135
"name": "prometheus-operator-mixin"
136136
},
@@ -141,8 +141,8 @@
141141
"subdir": "jsonnet/prometheus-operator"
142142
}
143143
},
144-
"version": "17dce6489dae0707d4fc21e3459b555e8d1ee9f5",
145-
"sum": "hV3FK2ekNFLUlKnj5chRp8WKKxZemfbwynYWK5RkY1E="
144+
"version": "16225365d06bc91f55b8bae58d466123a60bc7a6",
145+
"sum": "hlBEN+TbVeGSjfVUs0+OCXJ8DLItryaZ5MQ6hW65pvg="
146146
},
147147
{
148148
"source": {
@@ -162,7 +162,7 @@
162162
"subdir": "docs/node-mixin"
163163
}
164164
},
165-
"version": "46748fd229e249c0d7a9198a98e6f9450d437478",
165+
"version": "4ad86b349b7ffdbc30087c00a12def3254fd850b",
166166
"sum": "tappaHscNBSJCA6ypSWt7DDhohIOkxNjcLFRb3WKpu4="
167167
},
168168
{
@@ -172,7 +172,7 @@
172172
"subdir": "documentation/prometheus-mixin"
173173
}
174174
},
175-
"version": "bef6556ca566b47be52088466f36c1eaab4a2e45",
175+
"version": "15fa34936b6f1febe896ecee0f49889a56347762",
176176
"sum": "crD6rsagAMJFnVRw4pO63z3LLYfz4QFIiMR14zjjIfY=",
177177
"name": "prometheus"
178178
},
@@ -193,7 +193,7 @@
193193
"subdir": "mixin"
194194
}
195195
},
196-
"version": "739c876533b46b034b9706abf6ae39d472107e9e",
196+
"version": "891e6f2243b16e4134bb67c8831cfb11ae2807df",
197197
"sum": "oksO55VdKbsLAVA3vl7b1woE9TLmfvH7sz5+1A7iOBE=",
198198
"name": "thanos-mixin"
199199
},

monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,7 +1262,7 @@ spec:
12621262
description: Name of the container specified as a DNS_LABEL. Each container in a pod must have a unique name (DNS_LABEL). Cannot be updated.
12631263
type: string
12641264
ports:
1265-
description: List of ports to expose from the container. Exposing a port here gives the system additional information about the network connections a container uses, but is primarily informational. Not specifying a port here DOES NOT prevent that port from being exposed. Any port which is listening on the default "0.0.0.0" address inside a container will be accessible from the network. Cannot be updated.
1265+
description: List of ports to expose from the container. Not specifying a port here DOES NOT prevent that port from being exposed. Any port which is listening on the default "0.0.0.0" address inside a container will be accessible from the network. Modifying this array with strategic merge patch may corrupt the data. For more information See https://github.com/kubernetes/kubernetes/issues/108255. Cannot be updated.
12661266
items:
12671267
description: ContainerPort represents a network port in a single container.
12681268
properties:
@@ -2089,7 +2089,7 @@ spec:
20892089
description: Name of the container specified as a DNS_LABEL. Each container in a pod must have a unique name (DNS_LABEL). Cannot be updated.
20902090
type: string
20912091
ports:
2092-
description: List of ports to expose from the container. Exposing a port here gives the system additional information about the network connections a container uses, but is primarily informational. Not specifying a port here DOES NOT prevent that port from being exposed. Any port which is listening on the default "0.0.0.0" address inside a container will be accessible from the network. Cannot be updated.
2092+
description: List of ports to expose from the container. Not specifying a port here DOES NOT prevent that port from being exposed. Any port which is listening on the default "0.0.0.0" address inside a container will be accessible from the network. Modifying this array with strategic merge patch may corrupt the data. For more information See https://github.com/kubernetes/kubernetes/issues/108255. Cannot be updated.
20932093
items:
20942094
description: ContainerPort represents a network port in a single container.
20952095
properties:
@@ -3080,16 +3080,28 @@ spec:
30803080
type: object
30813081
type: object
30823082
x-kubernetes-map-type: atomic
3083+
matchLabelKeys:
3084+
description: MatchLabelKeys is a set of pod label keys to select the pods over which spreading will be calculated. The keys are used to lookup values from the incoming pod labels, those key-value labels are ANDed with labelSelector to select the group of existing pods over which spreading will be calculated for the incoming pod. Keys that don't exist in the incoming pod labels will be ignored. A null or empty list means only match against labelSelector.
3085+
items:
3086+
type: string
3087+
type: array
3088+
x-kubernetes-list-type: atomic
30833089
maxSkew:
30843090
description: 'MaxSkew describes the degree to which pods may be unevenly distributed. When `whenUnsatisfiable=DoNotSchedule`, it is the maximum permitted difference between the number of matching pods in the target topology and the global minimum. The global minimum is the minimum number of matching pods in an eligible domain or zero if the number of eligible domains is less than MinDomains. For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 2/2/1: In this case, the global minimum is 1. | zone1 | zone2 | zone3 | | P P | P P | P | - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 2/2/2; scheduling it onto zone1(zone2) would make the ActualSkew(3-1) on zone1(zone2) violate MaxSkew(1). - if MaxSkew is 2, incoming pod can be scheduled onto any zone. When `whenUnsatisfiable=ScheduleAnyway`, it is used to give higher precedence to topologies that satisfy it. It''s a required field. Default value is 1 and 0 is not allowed.'
30853091
format: int32
30863092
type: integer
30873093
minDomains:
3088-
description: "MinDomains indicates a minimum number of eligible domains. When the number of eligible domains with matching topology keys is less than minDomains, Pod Topology Spread treats \"global minimum\" as 0, and then the calculation of Skew is performed. And when the number of eligible domains with matching topology keys equals or greater than minDomains, this value has no effect on scheduling. As a result, when the number of eligible domains is less than minDomains, scheduler won't schedule more than maxSkew Pods to those domains. If value is nil, the constraint behaves as if MinDomains is equal to 1. Valid values are integers greater than 0. When value is not nil, WhenUnsatisfiable must be DoNotSchedule. \n For example, in a 3-zone cluster, MaxSkew is set to 2, MinDomains is set to 5 and pods with the same labelSelector spread as 2/2/2: | zone1 | zone2 | zone3 | | P P | P P | P P | The number of domains is less than 5(MinDomains), so \"global minimum\" is treated as 0. In this situation, new pod with the same labelSelector cannot be scheduled, because computed skew will be 3(3 - 0) if new Pod is scheduled to any of the three zones, it will violate MaxSkew. \n This is an alpha field and requires enabling MinDomainsInPodTopologySpread feature gate."
3094+
description: "MinDomains indicates a minimum number of eligible domains. When the number of eligible domains with matching topology keys is less than minDomains, Pod Topology Spread treats \"global minimum\" as 0, and then the calculation of Skew is performed. And when the number of eligible domains with matching topology keys equals or greater than minDomains, this value has no effect on scheduling. As a result, when the number of eligible domains is less than minDomains, scheduler won't schedule more than maxSkew Pods to those domains. If value is nil, the constraint behaves as if MinDomains is equal to 1. Valid values are integers greater than 0. When value is not nil, WhenUnsatisfiable must be DoNotSchedule. \n For example, in a 3-zone cluster, MaxSkew is set to 2, MinDomains is set to 5 and pods with the same labelSelector spread as 2/2/2: | zone1 | zone2 | zone3 | | P P | P P | P P | The number of domains is less than 5(MinDomains), so \"global minimum\" is treated as 0. In this situation, new pod with the same labelSelector cannot be scheduled, because computed skew will be 3(3 - 0) if new Pod is scheduled to any of the three zones, it will violate MaxSkew. \n This is a beta field and requires the MinDomainsInPodTopologySpread feature gate to be enabled (enabled by default)."
30893095
format: int32
30903096
type: integer
3097+
nodeAffinityPolicy:
3098+
description: "NodeAffinityPolicy indicates how we will treat Pod's nodeAffinity/nodeSelector when calculating pod topology spread skew. Options are: - Honor: only nodes matching nodeAffinity/nodeSelector are included in the calculations. - Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations. \n If this value is nil, the behavior is equivalent to the Honor policy. This is a alpha-level feature enabled by the NodeInclusionPolicyInPodTopologySpread feature flag."
3099+
type: string
3100+
nodeTaintsPolicy:
3101+
description: "NodeTaintsPolicy indicates how we will treat node taints when calculating pod topology spread skew. Options are: - Honor: nodes without taints, along with tainted nodes for which the incoming pod has a toleration, are included. - Ignore: node taints are ignored. All nodes are included. \n If this value is nil, the behavior is equivalent to the Ignore policy. This is a alpha-level feature enabled by the NodeInclusionPolicyInPodTopologySpread feature flag."
3102+
type: string
30913103
topologyKey:
3092-
description: TopologyKey is the key of node labels. Nodes that have a label with this key and identical values are considered to be in the same topology. We consider each <key, value> as a "bucket", and try to put balanced number of pods into each bucket. We define a domain as a particular instance of a topology. Also, we define an eligible domain as a domain whose nodes match the node selector. e.g. If TopologyKey is "kubernetes.io/hostname", each Node is a domain of that topology. And, if TopologyKey is "topology.kubernetes.io/zone", each zone is a domain of that topology. It's a required field.
3104+
description: TopologyKey is the key of node labels. Nodes that have a label with this key and identical values are considered to be in the same topology. We consider each <key, value> as a "bucket", and try to put balanced number of pods into each bucket. We define a domain as a particular instance of a topology. Also, we define an eligible domain as a domain whose nodes meet the requirements of nodeAffinityPolicy and nodeTaintsPolicy. e.g. If TopologyKey is "kubernetes.io/hostname", each Node is a domain of that topology. And, if TopologyKey is "topology.kubernetes.io/zone", each zone is a domain of that topology. It's a required field.
30933105
type: string
30943106
whenUnsatisfiable:
30953107
description: 'WhenUnsatisfiable indicates how to deal with a pod if it doesn''t satisfy the spread constraint. - DoNotSchedule (default) tells the scheduler not to schedule it. - ScheduleAnyway tells the scheduler to schedule the pod in any location, but giving higher precedence to topologies that would help reduce the skew. A constraint is considered "Unsatisfiable" for an incoming pod if and only if every possible node assignment for that pod would violate "MaxSkew" on some topology. For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 3/1/1: | zone1 | zone2 | zone3 | | P P P | P | P | If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler won''t make it *more* imbalanced. It''s a required field.'

0 commit comments

Comments
 (0)