Skip to content

Commit 5183552

Browse files
roboquatroboquat
authored
Merge pull request #301 from gitpod-io/roboquat/automated-dependency-update-main
[bot] [main] Automated dependencies update
2 parents 33245b6 + cc6fcea commit 5183552

File tree

8 files changed

+503
-19
lines changed

8 files changed

+503
-19
lines changed

‎jsonnetfile.lock.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"subdir": "jsonnet"
99
}
1010
},
11-
"version": "005de258286d9f8a4ce76b03b52a85900d2a2341",
12-
"sum": "rZ0w4xX6ms2AAFBZPjkuirPZQOsX5eTNFTOB3WrnBzE=",
11+
"version": "1d297c778b71ccb6b66834aa60b25fc247d0291d",
12+
"sum": "t6SrQWOaCbvZwCeworzI3iwhOga6p11MAZmRcUktLi0=",
1313
"name": "kubescape"
1414
},
1515
{
@@ -29,7 +29,7 @@
2929
"subdir": "contrib/mixin"
3030
}
3131
},
32-
"version": "5707147363361a3dd774f8287e9ccf4885e15fb4",
32+
"version": "4d57eb8d3b2190bfdba3c65f8eb93c0349fc6dcc",
3333
"sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
3434
},
3535
{
@@ -39,8 +39,8 @@
3939
"subdir": "operations/observability/mixins"
4040
}
4141
},
42-
"version": "f54482b8c30b449ee5144ad408ca3289d440948e",
43-
"sum": "Z3EYrIXnwIWvG+tCdXxT+VAuSL4MDYOurQyiXvLuSsE=",
42+
"version": "2871bdc1b853dbdef502c54cf950e7319babef61",
43+
"sum": "f89oAAyik5mzbH8dqIRja+dZDsq1UDI48rBrxHYUK9E=",
4444
"name": "gitpod"
4545
},
4646
{
@@ -120,8 +120,8 @@
120120
"subdir": "jsonnet/kube-prometheus"
121121
}
122122
},
123-
"version": "e08a1ec75a973535781e84b9a1eae6c41ab17f8d",
124-
"sum": "KYMcy+IXGGjXFvUxLEwoUzKJqxKAdDbibsy+KNlJL6g="
123+
"version": "75bc89f6e3094c56119aa7a2ae7c7ecd0e594599",
124+
"sum": "4TGkBBk/5HVWQOhbxXSVtuBVFAJtw2kP3LzEAaIT9ME="
125125
},
126126
{
127127
"source": {
@@ -130,7 +130,7 @@
130130
"subdir": "jsonnet/mixin"
131131
}
132132
},
133-
"version": "16225365d06bc91f55b8bae58d466123a60bc7a6",
133+
"version": "a63bbe70bd58fa1a59a5b22c2ffe4102beebe41f",
134134
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
135135
"name": "prometheus-operator-mixin"
136136
},
@@ -141,8 +141,8 @@
141141
"subdir": "jsonnet/prometheus-operator"
142142
}
143143
},
144-
"version": "16225365d06bc91f55b8bae58d466123a60bc7a6",
145-
"sum": "hlBEN+TbVeGSjfVUs0+OCXJ8DLItryaZ5MQ6hW65pvg="
144+
"version": "a63bbe70bd58fa1a59a5b22c2ffe4102beebe41f",
145+
"sum": "yyCtOZvvEmJ7jL8oogGCt89X/acej9flL588+P4g9F4="
146146
},
147147
{
148148
"source": {
@@ -172,7 +172,7 @@
172172
"subdir": "documentation/prometheus-mixin"
173173
}
174174
},
175-
"version": "15fa34936b6f1febe896ecee0f49889a56347762",
175+
"version": "6767f6e1a946af41f83ca233c6fbfc94a928abee",
176176
"sum": "crD6rsagAMJFnVRw4pO63z3LLYfz4QFIiMR14zjjIfY=",
177177
"name": "prometheus"
178178
},
@@ -183,7 +183,7 @@
183183
"subdir": "config/crd/bases"
184184
}
185185
},
186-
"version": "dd82519ae36a7d00486b1862fc23d805ba84e06b",
186+
"version": "389fb2d2276d030a78551c472a131146f2cc0d48",
187187
"sum": "d1550yhsX4VxdVN7b0gWT0cido/W90P6OGLzLqPwZcs="
188188
},
189189
{
@@ -193,7 +193,7 @@
193193
"subdir": "mixin"
194194
}
195195
},
196-
"version": "891e6f2243b16e4134bb67c8831cfb11ae2807df",
196+
"version": "a947f33e1420d7ad4e171c4300b81a0dac1b083a",
197197
"sum": "oksO55VdKbsLAVA3vl7b1woE9TLmfvH7sz5+1A7iOBE=",
198198
"name": "thanos-mixin"
199199
},

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -858,6 +858,45 @@ spec:
858858
description: The name of the AlertmanagerConfig resource which is used to generate the Alertmanager configuration. It must be defined in the same namespace as the Alertmanager object. The operator will not enforce a `namespace` label for routes and inhibition rules.
859859
minLength: 1
860860
type: string
861+
templates:
862+
description: Custom notification templates.
863+
items:
864+
description: SecretOrConfigMap allows to specify data as a Secret or ConfigMap. Fields are mutually exclusive.
865+
properties:
866+
configMap:
867+
description: ConfigMap containing data to use for the targets.
868+
properties:
869+
key:
870+
description: The key to select.
871+
type: string
872+
name:
873+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
874+
type: string
875+
optional:
876+
description: Specify whether the ConfigMap or its key must be defined
877+
type: boolean
878+
required:
879+
- key
880+
type: object
881+
x-kubernetes-map-type: atomic
882+
secret:
883+
description: Secret containing data to use for the targets.
884+
properties:
885+
key:
886+
description: The key of the secret to select from. Must be a valid secret key.
887+
type: string
888+
name:
889+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
890+
type: string
891+
optional:
892+
description: Specify whether the Secret or its key must be defined
893+
type: boolean
894+
required:
895+
- key
896+
type: object
897+
x-kubernetes-map-type: atomic
898+
type: object
899+
type: array
861900
type: object
862901
baseImage:
863902
description: 'Base image that is used to deploy pods, without tag. Deprecated: use ''image'' instead'

‎monitoring-satellite/manifests/kubescape/configMap.yaml

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,141 @@ data:
245245
"controlID": "C-0038"
246246
}
247247
]
248+
},
249+
{
250+
"name": "exclude-allowed-hostPath",
251+
"policyType": "postureExceptionPolicy",
252+
"actions": [
253+
"alertOnly"
254+
],
255+
"resources": [
256+
{
257+
"designatorType": "Attributes",
258+
"attributes": {
259+
"kind": "DaemonSet",
260+
"name": "fluentbit-gke"
261+
}
262+
},
263+
{
264+
"designatorType": "Attributes",
265+
"attributes": {
266+
"kind": "DaemonSet",
267+
"name": "fluentbit-gke-256pd"
268+
}
269+
},
270+
{
271+
"designatorType": "Attributes",
272+
"attributes": {
273+
"kind": "DaemonSet",
274+
"name": "fluentbit-gke-max"
275+
}
276+
},
277+
{
278+
"designatorType": "Attributes",
279+
"attributes": {
280+
"kind": "DaemonSet",
281+
"name": "gke-metrics-agent"
282+
}
283+
},
284+
{
285+
"designatorType": "Attributes",
286+
"attributes": {
287+
"kind": "DaemonSet",
288+
"name": "gke-metrics-agent-scaling-10"
289+
}
290+
},
291+
{
292+
"designatorType": "Attributes",
293+
"attributes": {
294+
"kind": "DaemonSet",
295+
"name": "gke-metrics-agent-scaling-20"
296+
}
297+
},
298+
{
299+
"designatorType": "Attributes",
300+
"attributes": {
301+
"kind": "DaemonSet",
302+
"name": "kube-proxy"
303+
}
304+
},
305+
{
306+
"designatorType": "Attributes",
307+
"attributes": {
308+
"kind": "DaemonSet",
309+
"name": "network-metering-agent"
310+
}
311+
},
312+
{
313+
"designatorType": "Attributes",
314+
"attributes": {
315+
"kind": "DaemonSet",
316+
"name": "nvidia-gpu-device-plugin"
317+
}
318+
},
319+
{
320+
"designatorType": "Attributes",
321+
"attributes": {
322+
"kind": "DaemonSet",
323+
"name": "pdcsi-node"
324+
}
325+
},
326+
{
327+
"designatorType": "Attributes",
328+
"attributes": {
329+
"kind": "DaemonSet",
330+
"name": "pdcsi-node-windows"
331+
}
332+
},
333+
{
334+
"designatorType": "Attributes",
335+
"attributes": {
336+
"kind": "DaemonSet",
337+
"name": "node-exporter"
338+
}
339+
},
340+
{
341+
"designatorType": "Attributes",
342+
"attributes": {
343+
"kind": "DaemonSet",
344+
"name": "calico-node"
345+
}
346+
},
347+
{
348+
"designatorType": "Attributes",
349+
"attributes": {
350+
"kind": "DaemonSet",
351+
"name": "ws-daemon"
352+
}
353+
},
354+
{
355+
"designatorType": "Attributes",
356+
"attributes": {
357+
"kind": "DaemonSet",
358+
"name": "registry-facade"
359+
}
360+
},
361+
{
362+
"designatorType": "Attributes",
363+
"attributes": {
364+
"kind": "Deployment",
365+
"name": "event-exporter-gke"
366+
}
367+
},
368+
],
369+
"posturePolicies": [
370+
{
371+
"controlID": "C-0006"
372+
},
373+
{
374+
"controlID": "C-0045"
375+
},
376+
{
377+
"controlID": "C-0048"
378+
},
379+
{
380+
"controlID": "C-0074"
381+
}
382+
]
248383
}
249384
]
250385
kind: ConfigMap

0 commit comments

Comments
 (0)