Skip to content

Commit 45d8898

Browse files
roboquatroboquat
authored
Merge pull request #616 from gitpod-io/roboquat/automated-dependency-update-main
[bot] [main] Automated dependencies update
2 parents 433b6a7 + cbcfd76 commit 45d8898

35 files changed

+647
-225
lines changed

‎jsonnetfile.lock.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "353107914b9fa18b9d2e0477bb18b7eec5e210ce",
21+
"version": "438ed969386b7ef258e0d5802ca5ce4a45e46d7b",
2222
"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
2323
},
2424
{
@@ -28,7 +28,7 @@
2828
"subdir": "operations/observability/mixins"
2929
}
3030
},
31-
"version": "9e34aea982f3b935dfbf172fe59fb69d0b6af213",
31+
"version": "a2227ff2408864e372ae40ca3684b498fa9dfc9e",
3232
"sum": "wvuIMANAM9nLAR9RmTl2J7ZkFOV/XtIQ8LwKApfydKc=",
3333
"name": "gitpod"
3434
},
@@ -59,7 +59,7 @@
5959
"subdir": "gen/grafonnet-latest"
6060
}
6161
},
62-
"version": "5a8f3d6aa89b7e7513528371d2d1265aedc844bc",
62+
"version": "42d098fae987f25f08480e203ca6ddc548c6efbf",
6363
"sum": "V9vAj21qJOc2DlMPDgB1eEjSQU4A+sAA4AXuJ6bd4xc="
6464
},
6565
{
@@ -69,7 +69,7 @@
6969
"subdir": "gen/grafonnet-v10.0.0"
7070
}
7171
},
72-
"version": "5a8f3d6aa89b7e7513528371d2d1265aedc844bc",
72+
"version": "42d098fae987f25f08480e203ca6ddc548c6efbf",
7373
"sum": "xdcrJPJlpkq4+5LpGwN4tPAuheNNLXZjE6tDcyvFjr0="
7474
},
7575
{
@@ -79,7 +79,7 @@
7979
"subdir": "gen/grafonnet-v11.4.0"
8080
}
8181
},
82-
"version": "5a8f3d6aa89b7e7513528371d2d1265aedc844bc",
82+
"version": "42d098fae987f25f08480e203ca6ddc548c6efbf",
8383
"sum": "aVAX09paQYNOoCSKVpuk1exVIyBoMt/C50QJI+Q/3nA="
8484
},
8585
{
@@ -129,8 +129,8 @@
129129
"subdir": ""
130130
}
131131
},
132-
"version": "5dae7f6adf083639934a4a54aef451174dd84370",
133-
"sum": "St7n7FXqoobaBFI+FvC1OTbcYFZKCKblcwP9jJEV704="
132+
"version": "d6556e52d2762de47dc28ac0f9f2ffe93a50e785",
133+
"sum": "jLkq96mnGjid6+aQFvT16Fspnvud7NM1edY33kDSpIE="
134134
},
135135
{
136136
"source": {
@@ -139,7 +139,7 @@
139139
"subdir": "jsonnet/kube-state-metrics"
140140
}
141141
},
142-
"version": "941c6838fe19636355adbb14e0672e362f420145",
142+
"version": "e332175940b8d8f76648c24d79c1e0d59a9b7926",
143143
"sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM="
144144
},
145145
{
@@ -149,7 +149,7 @@
149149
"subdir": "jsonnet/kube-state-metrics-mixin"
150150
}
151151
},
152-
"version": "941c6838fe19636355adbb14e0672e362f420145",
152+
"version": "e332175940b8d8f76648c24d79c1e0d59a9b7926",
153153
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
154154
},
155155
{
@@ -159,8 +159,8 @@
159159
"subdir": "jsonnet/kube-prometheus"
160160
}
161161
},
162-
"version": "68619d9afe02555c25b784ed2e73e907380f0876",
163-
"sum": "zXJkWr2Fv+XINGqfp1KSMiaB1mbQkxWuT5P24wrW+rg="
162+
"version": "d98c08e752f6ff143ee3a9491b774f55e572a83b",
163+
"sum": "fKY/bBuoAikhIeljLNu54ut2SdtT4qCjxhlNLEQg7zo="
164164
},
165165
{
166166
"source": {
@@ -169,7 +169,7 @@
169169
"subdir": "jsonnet/mixin"
170170
}
171171
},
172-
"version": "6954e4eefc1fe8880330436f01ddc6e36a677e27",
172+
"version": "2f66af64600a06b0baaf6d7f06d8c34c3efe1e5b",
173173
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
174174
"name": "prometheus-operator-mixin"
175175
},
@@ -180,8 +180,8 @@
180180
"subdir": "jsonnet/prometheus-operator"
181181
}
182182
},
183-
"version": "6954e4eefc1fe8880330436f01ddc6e36a677e27",
184-
"sum": "6TSrvGOx2RUMfEI/0sq4tLO2kPfJPjor+gxeZYMIH2Q="
183+
"version": "2f66af64600a06b0baaf6d7f06d8c34c3efe1e5b",
184+
"sum": "drgasp5XaNe+XIzV4Er36mq3IbKAmxmfkh7Se4LtGkw="
185185
},
186186
{
187187
"source": {
@@ -211,7 +211,7 @@
211211
"subdir": "documentation/prometheus-mixin"
212212
}
213213
},
214-
"version": "c9e0e36701bcd1a7a6ccc372834e227fda31e616",
214+
"version": "f4b8840f51bee8afa258e0d4e27fc7fc03358760",
215215
"sum": "JY9uhZWjDnMd6TYjgqyzEqXqBS1zIkJrDzauiXyaJ4A=",
216216
"name": "prometheus"
217217
},
@@ -222,7 +222,7 @@
222222
"subdir": "jsonnet/controller-gen"
223223
}
224224
},
225-
"version": "634d5f1a7edf139368544be734799e410ecec182",
225+
"version": "dec7d5cc8d55ed2c2bb6ce48b5eae8effc098947",
226226
"sum": "O3c9Uurei8MWAY0Ad7DOL1fMqSgdHyHB7MpHsxSITKM=",
227227
"name": "pyrra"
228228
},

‎monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,9 @@ spec:
383383
- key
384384
type: object
385385
x-kubernetes-map-type: atomic
386+
enableHttp2:
387+
description: enableHttp2 can be used to disable HTTP2.
388+
type: boolean
386389
followRedirects:
387390
description: |-
388391
followRedirects specifies whether the client should follow HTTP 3xx redirects.
@@ -1324,6 +1327,9 @@ spec:
13241327
- key
13251328
type: object
13261329
x-kubernetes-map-type: atomic
1330+
enableHttp2:
1331+
description: enableHttp2 can be used to disable HTTP2.
1332+
type: boolean
13271333
followRedirects:
13281334
description: |-
13291335
followRedirects specifies whether the client should follow HTTP 3xx redirects.
@@ -2015,6 +2021,9 @@ spec:
20152021
- key
20162022
type: object
20172023
x-kubernetes-map-type: atomic
2024+
enableHttp2:
2025+
description: enableHttp2 can be used to disable HTTP2.
2026+
type: boolean
20182027
followRedirects:
20192028
description: |-
20202029
followRedirects specifies whether the client should follow HTTP 3xx redirects.
@@ -2769,6 +2778,9 @@ spec:
27692778
- key
27702779
type: object
27712780
x-kubernetes-map-type: atomic
2781+
enableHttp2:
2782+
description: enableHttp2 can be used to disable HTTP2.
2783+
type: boolean
27722784
followRedirects:
27732785
description: |-
27742786
followRedirects specifies whether the client should follow HTTP 3xx redirects.
@@ -3525,6 +3537,9 @@ spec:
35253537
- key
35263538
type: object
35273539
x-kubernetes-map-type: atomic
3540+
enableHttp2:
3541+
description: enableHttp2 can be used to disable HTTP2.
3542+
type: boolean
35283543
followRedirects:
35293544
description: |-
35303545
followRedirects specifies whether the client should follow HTTP 3xx redirects.
@@ -4278,6 +4293,9 @@ spec:
42784293
- key
42794294
type: object
42804295
x-kubernetes-map-type: atomic
4296+
enableHttp2:
4297+
description: enableHttp2 can be used to disable HTTP2.
4298+
type: boolean
42814299
followRedirects:
42824300
description: |-
42834301
followRedirects specifies whether the client should follow HTTP 3xx redirects.
@@ -5113,6 +5131,9 @@ spec:
51135131
- key
51145132
type: object
51155133
x-kubernetes-map-type: atomic
5134+
enableHttp2:
5135+
description: enableHttp2 can be used to disable HTTP2.
5136+
type: boolean
51165137
followRedirects:
51175138
description: |-
51185139
followRedirects specifies whether the client should follow HTTP 3xx redirects.
@@ -6005,6 +6026,9 @@ spec:
60056026
- key
60066027
type: object
60076028
x-kubernetes-map-type: atomic
6029+
enableHttp2:
6030+
description: enableHttp2 can be used to disable HTTP2.
6031+
type: boolean
60086032
followRedirects:
60096033
description: |-
60106034
followRedirects specifies whether the client should follow HTTP 3xx redirects.
@@ -6709,6 +6733,9 @@ spec:
67096733
- key
67106734
type: object
67116735
x-kubernetes-map-type: atomic
6736+
enableHttp2:
6737+
description: enableHttp2 can be used to disable HTTP2.
6738+
type: boolean
67126739
followRedirects:
67136740
description: |-
67146741
followRedirects specifies whether the client should follow HTTP 3xx redirects.
@@ -7492,6 +7519,9 @@ spec:
74927519
- key
74937520
type: object
74947521
x-kubernetes-map-type: atomic
7522+
enableHttp2:
7523+
description: enableHttp2 can be used to disable HTTP2.
7524+
type: boolean
74957525
followRedirects:
74967526
description: |-
74977527
followRedirects specifies whether the client should follow HTTP 3xx redirects.
@@ -8220,6 +8250,9 @@ spec:
82208250
- key
82218251
type: object
82228252
x-kubernetes-map-type: atomic
8253+
enableHttp2:
8254+
description: enableHttp2 can be used to disable HTTP2.
8255+
type: boolean
82238256
followRedirects:
82248257
description: |-
82258258
followRedirects specifies whether the client should follow HTTP 3xx redirects.
@@ -8890,6 +8923,9 @@ spec:
88908923
- key
88918924
type: object
88928925
x-kubernetes-map-type: atomic
8926+
enableHttp2:
8927+
description: enableHttp2 can be used to disable HTTP2.
8928+
type: boolean
88938929
followRedirects:
88948930
description: |-
88958931
followRedirects specifies whether the client should follow HTTP 3xx redirects.
@@ -9545,6 +9581,9 @@ spec:
95459581
- key
95469582
type: object
95479583
x-kubernetes-map-type: atomic
9584+
enableHttp2:
9585+
description: enableHttp2 can be used to disable HTTP2.
9586+
type: boolean
95489587
followRedirects:
95499588
description: |-
95509589
followRedirects specifies whether the client should follow HTTP 3xx redirects.
@@ -10276,6 +10315,9 @@ spec:
1027610315
- key
1027710316
type: object
1027810317
x-kubernetes-map-type: atomic
10318+
enableHttp2:
10319+
description: enableHttp2 can be used to disable HTTP2.
10320+
type: boolean
1027910321
followRedirects:
1028010322
description: |-
1028110323
followRedirects specifies whether the client should follow HTTP 3xx redirects.

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

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,8 +1103,10 @@ spec:
11031103
properties:
11041104
authorization:
11051105
description: |-
1106-
authorization defines the header configuration for the client.
1107-
This is mutually exclusive with BasicAuth and is only available starting from Alertmanager v0.22+.
1106+
authorization configures the Authorization header credentials used by
1107+
the client.
1108+
1109+
Cannot be set at the same time as `basicAuth`, `bearerTokenSecret` or `oauth2`.
11081110
properties:
11091111
credentials:
11101112
description: credentials defines a key of a Secret in the namespace that contains the credentials for authentication.
@@ -1139,8 +1141,10 @@ spec:
11391141
type: object
11401142
basicAuth:
11411143
description: |-
1142-
basicAuth defines basicAuth for the client.
1143-
This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
1144+
basicAuth defines the Basic Authentication credentials used by the
1145+
client.
1146+
1147+
Cannot be set at the same time as `authorization`, `bearerTokenSecret` or `oauth2`.
11441148
properties:
11451149
password:
11461150
description: |-
@@ -1193,10 +1197,14 @@ spec:
11931197
type: object
11941198
bearerTokenSecret:
11951199
description: |-
1196-
bearerTokenSecret defines the secret's key that contains the bearer token to be used by the client
1197-
for authentication.
1198-
The secret needs to be in the same namespace as the Alertmanager
1199-
object and accessible by the Prometheus Operator.
1200+
bearerTokenSecret defines a key of a Secret containing the bearer token
1201+
used by the client for authentication. The secret needs to be in the
1202+
same namespace as the custom resource and readable by the Prometheus
1203+
Operator.
1204+
1205+
Cannot be set at the same time as `authorization`, `basicAuth` or `oauth2`.
1206+
1207+
Deprecated: use `authorization` instead.
12001208
properties:
12011209
key:
12021210
description: The key of the secret to select from. Must be a valid secret key.
@@ -1217,8 +1225,13 @@ spec:
12171225
- key
12181226
type: object
12191227
x-kubernetes-map-type: atomic
1228+
enableHttp2:
1229+
description: enableHttp2 can be used to disable HTTP2.
1230+
type: boolean
12201231
followRedirects:
1221-
description: followRedirects defines whether the client should follow HTTP 3xx redirects.
1232+
description: |-
1233+
followRedirects defines whether the client should follow HTTP 3xx
1234+
redirects.
12221235
type: boolean
12231236
noProxy:
12241237
description: |-
@@ -1229,7 +1242,12 @@ spec:
12291242
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
12301243
type: string
12311244
oauth2:
1232-
description: oauth2 defines the client credentials used to fetch a token for the targets.
1245+
description: |-
1246+
oauth2 defines the OAuth2 settings used by the client.
1247+
1248+
It requires Prometheus >= 2.27.0.
1249+
1250+
Cannot be set at the same time as `authorization`, `basicAuth` or `bearerTokenSecret`.
12331251
properties:
12341252
clientId:
12351253
description: |-
@@ -1571,7 +1589,7 @@ spec:
15711589
pattern: ^(http|https|socks5)://.+$
15721590
type: string
15731591
tlsConfig:
1574-
description: tlsConfig defines the TLSConfig for the client.
1592+
description: tlsConfig defines the TLS configuration used by the client.
15751593
properties:
15761594
ca:
15771595
description: ca defines the Certificate authority used when verifying server certificates.
@@ -1778,6 +1796,7 @@ spec:
17781796
x-kubernetes-map-type: atomic
17791797
pagerdutyUrl:
17801798
description: pagerdutyUrl defines the default Pagerduty URL.
1799+
pattern: ^(http|https)://.+$
17811800
type: string
17821801
resolveTimeout:
17831802
description: |-

‎monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,14 +1206,14 @@ spec:
12061206
https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
12071207
properties:
12081208
bindings:
1209-
description: bindings defines the list of workload resources (Prometheus, PrometheusAgent, or ThanosRuler) which select the configuration resource.
1209+
description: bindings defines the list of workload resources (Prometheus, PrometheusAgent, ThanosRuler or Alertmanager) which select the configuration resource.
12101210
items:
12111211
description: WorkloadBinding is a link between a configuration resource and a workload resource.
12121212
properties:
12131213
conditions:
1214-
description: conditions defines the current state of the configuration resource when bound to the referenced Prometheus object.
1214+
description: conditions defines the current state of the configuration resource when bound to the referenced Workload object.
12151215
items:
1216-
description: ConfigResourceCondition describes the status of configuration resources linked to Prometheus, PrometheusAgent, Alertmanager, or ThanosRuler.
1216+
description: ConfigResourceCondition describes the status of configuration resources linked to Prometheus, PrometheusAgent, Alertmanager or ThanosRuler.
12171217
properties:
12181218
lastTransitionTime:
12191219
description: lastTransitionTime defines the time of the last update to the current status property.
@@ -1268,11 +1268,12 @@ spec:
12681268
minLength: 1
12691269
type: string
12701270
resource:
1271-
description: resource defines the type of resource being referenced (e.g. Prometheus, PrometheusAgent, or ThanosRuler).
1271+
description: resource defines the type of resource being referenced (e.g. Prometheus, PrometheusAgent, ThanosRuler or Alertmanager).
12721272
enum:
12731273
- prometheuses
12741274
- prometheusagents
12751275
- thanosrulers
1276+
- alertmanagers
12761277
type: string
12771278
required:
12781279
- group

0 commit comments

Comments
 (0)