Skip to content

Commit 6611e13

Browse files
authored
Merge pull request #311 from gitpod-io/roboquat/automated-dependency-update-main
[bot] [main] Automated dependencies update
2 parents a63126d + 44c5001 commit 6611e13

File tree

63 files changed

+3745
-1219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3745
-1219
lines changed

jsonnetfile.lock.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"subdir": "contrib/mixin"
3030
}
3131
},
32-
"version": "4d57eb8d3b2190bfdba3c65f8eb93c0349fc6dcc",
32+
"version": "b886bbc89f31d7ac59bdfbb3d14a4263dae85a1b",
3333
"sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
3434
},
3535
{
@@ -39,8 +39,8 @@
3939
"subdir": "operations/observability/mixins"
4040
}
4141
},
42-
"version": "2871bdc1b853dbdef502c54cf950e7319babef61",
43-
"sum": "f89oAAyik5mzbH8dqIRja+dZDsq1UDI48rBrxHYUK9E=",
42+
"version": "80cda586da3787f7a4ec371172e969326ea2e6f3",
43+
"sum": "38Dk8dt1ZfQW+Tr+dZXtW7zVuVmGk6Im769Lqh14nEE=",
4444
"name": "gitpod"
4545
},
4646
{
@@ -80,7 +80,7 @@
8080
"subdir": "grafana-builder"
8181
}
8282
},
83-
"version": "c132c4afcf17491718539db4c2d94c0ea4346120",
83+
"version": "dbf6fc14105c28b6fd0253005f7ca2da37d3d4e1",
8484
"sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0="
8585
},
8686
{
@@ -100,7 +100,7 @@
100100
"subdir": "jsonnet/kube-state-metrics"
101101
}
102102
},
103-
"version": "734389481ab1a47422f07e80ef93b4359cadbaed",
103+
"version": "20ef8a759681c8ed263184f481f4b60686f300bd",
104104
"sum": "evJ+PXRzuM1tezCG5WzpAn4Lk3YJfMvDFcs+45fsscU="
105105
},
106106
{
@@ -110,7 +110,7 @@
110110
"subdir": "jsonnet/kube-state-metrics-mixin"
111111
}
112112
},
113-
"version": "734389481ab1a47422f07e80ef93b4359cadbaed",
113+
"version": "20ef8a759681c8ed263184f481f4b60686f300bd",
114114
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
115115
},
116116
{
@@ -120,8 +120,8 @@
120120
"subdir": "jsonnet/kube-prometheus"
121121
}
122122
},
123-
"version": "75bc89f6e3094c56119aa7a2ae7c7ecd0e594599",
124-
"sum": "4TGkBBk/5HVWQOhbxXSVtuBVFAJtw2kP3LzEAaIT9ME="
123+
"version": "0a073679c6fd06c1d11812f2efd7be77092f78ca",
124+
"sum": "2ZoIA4W0IQCvvxzFxyQcURLFh4FCxWg2FEtWzbMPRb8="
125125
},
126126
{
127127
"source": {
@@ -130,7 +130,7 @@
130130
"subdir": "jsonnet/mixin"
131131
}
132132
},
133-
"version": "a63bbe70bd58fa1a59a5b22c2ffe4102beebe41f",
133+
"version": "ad64869358bfc470bac56c48a1ecee6dfb8dc88c",
134134
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
135135
"name": "prometheus-operator-mixin"
136136
},
@@ -141,8 +141,8 @@
141141
"subdir": "jsonnet/prometheus-operator"
142142
}
143143
},
144-
"version": "a63bbe70bd58fa1a59a5b22c2ffe4102beebe41f",
145-
"sum": "yyCtOZvvEmJ7jL8oogGCt89X/acej9flL588+P4g9F4="
144+
"version": "ad64869358bfc470bac56c48a1ecee6dfb8dc88c",
145+
"sum": "zMopZuzEV7tZcO5AiKZMK8tSxabMKNdObpAOaYNY1jo="
146146
},
147147
{
148148
"source": {
@@ -151,7 +151,7 @@
151151
"subdir": "doc/alertmanager-mixin"
152152
}
153153
},
154-
"version": "c732372d7d3be49198398d34753080459f01749e",
154+
"version": "699bc4dfdf59cd0501d36808a02b302a4336d695",
155155
"sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=",
156156
"name": "alertmanager"
157157
},
@@ -162,7 +162,7 @@
162162
"subdir": "docs/node-mixin"
163163
}
164164
},
165-
"version": "4ad86b349b7ffdbc30087c00a12def3254fd850b",
165+
"version": "8755e852fa40d14338cc56e4780406c42c7c2237",
166166
"sum": "tappaHscNBSJCA6ypSWt7DDhohIOkxNjcLFRb3WKpu4="
167167
},
168168
{
@@ -172,7 +172,7 @@
172172
"subdir": "documentation/prometheus-mixin"
173173
}
174174
},
175-
"version": "6767f6e1a946af41f83ca233c6fbfc94a928abee",
175+
"version": "161a3010d13d8e9d42e4106f2f247a7a554dad92",
176176
"sum": "crD6rsagAMJFnVRw4pO63z3LLYfz4QFIiMR14zjjIfY=",
177177
"name": "prometheus"
178178
},
@@ -193,8 +193,8 @@
193193
"subdir": "mixin"
194194
}
195195
},
196-
"version": "a947f33e1420d7ad4e171c4300b81a0dac1b083a",
197-
"sum": "oksO55VdKbsLAVA3vl7b1woE9TLmfvH7sz5+1A7iOBE=",
196+
"version": "0d659bf171afa6bdf5c5ece3033df3a7e8245d8c",
197+
"sum": "095uB0qB1Ek+aNYf+CgydVZk5aFETsfD8GYf6gDwSJs=",
198198
"name": "thanos-mixin"
199199
},
200200
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ spec:
8080
type: object
8181
x-kubernetes-map-type: atomic
8282
additionalArgs:
83-
description: AdditionalArgs allows setting additional arguments for the Prometheus container. It is intended for e.g. activating hidden flags which are not supported by the dedicated configuration options yet. The arguments are passed as-is to the Prometheus container which may cause issues if they are invalid or not supporeted by the given Prometheus version. In case of an argument conflict (e.g. an argument which is already set by the operator itself) or when providing an invalid argument the reconciliation will fail and an error will be logged.
83+
description: AdditionalArgs allows setting additional arguments for the Prometheus container. It is intended for e.g. activating hidden flags which are not supported by the dedicated configuration options yet. The arguments are passed as-is to the Prometheus container which may cause issues if they are invalid or not supported by the given Prometheus version. In case of an argument conflict (e.g. an argument which is already set by the operator itself) or when providing an invalid argument the reconciliation will fail and an error will be logged.
8484
items:
8585
description: Argument as part of the AdditionalArgs list.
8686
properties:
@@ -4223,7 +4223,7 @@ spec:
42234223
description: "Thanos configuration allows configuring various aspects of a Prometheus server in a Thanos environment. \n This section is experimental, it may change significantly without deprecation notice in any release. \n This is experimental and may change significantly without backward compatibility in any release."
42244224
properties:
42254225
additionalArgs:
4226-
description: AdditionalArgs allows setting additional arguments for the Thanos container. The arguments are passed as-is to the Thanos container which may cause issues if they are invalid or not supporeted the given Thanos version. In case of an argument conflict (e.g. an argument which is already set by the operator itself) or when providing an invalid argument the reconciliation will fail and an error will be logged.
4226+
description: AdditionalArgs allows setting additional arguments for the Thanos container. The arguments are passed as-is to the Thanos container which may cause issues if they are invalid or not supported the given Thanos version. In case of an argument conflict (e.g. an argument which is already set by the operator itself) or when providing an invalid argument the reconciliation will fail and an error will be logged.
42274227
items:
42284228
description: Argument as part of the AdditionalArgs list.
42294229
properties:

monitoring-satellite/manifests/grafana/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/component: grafana
66
app.kubernetes.io/name: grafana
77
app.kubernetes.io/part-of: kube-prometheus
8-
app.kubernetes.io/version: 9.1.1
8+
app.kubernetes.io/version: 9.1.2
99
name: grafana-config
1010
namespace: monitoring-satellite
1111
stringData:

monitoring-satellite/manifests/grafana/dashboardDatasources.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/component: grafana
66
app.kubernetes.io/name: grafana
77
app.kubernetes.io/part-of: kube-prometheus
8-
app.kubernetes.io/version: 9.1.1
8+
app.kubernetes.io/version: 9.1.2
99
name: grafana-datasources
1010
namespace: monitoring-satellite
1111
stringData:

0 commit comments

Comments
 (0)