Skip to content

Commit 6022a4f

Browse files
swiatekmswiatekm
authored
Bump prometheus and prometheus operator (#4547)
* Bump prometheus dependencies # Conflicts: # go.mod # go.sum # Conflicts: # go.mod # go.sum * Update Prometheus operator scrape config generation * Fix gather tests * Fix target allocator tests Update golden files * Update CRDs after K8s library bump * Fix linter warnings * Disable sharding in a more maintainable way
1 parent 62e599c commit 6022a4f

34 files changed

+5705
-875
lines changed

‎bundle/community/manifests/opentelemetry.io_instrumentations.yaml‎

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,23 @@ spec:
7878
- fieldPath
7979
type: object
8080
x-kubernetes-map-type: atomic
81+
fileKeyRef:
82+
properties:
83+
key:
84+
type: string
85+
optional:
86+
default: false
87+
type: boolean
88+
path:
89+
type: string
90+
volumeName:
91+
type: string
92+
required:
93+
- key
94+
- path
95+
- volumeName
96+
type: object
97+
x-kubernetes-map-type: atomic
8198
resourceFieldRef:
8299
properties:
83100
containerName:
@@ -146,6 +163,23 @@ spec:
146163
- fieldPath
147164
type: object
148165
x-kubernetes-map-type: atomic
166+
fileKeyRef:
167+
properties:
168+
key:
169+
type: string
170+
optional:
171+
default: false
172+
type: boolean
173+
path:
174+
type: string
175+
volumeName:
176+
type: string
177+
required:
178+
- key
179+
- path
180+
- volumeName
181+
type: object
182+
x-kubernetes-map-type: atomic
149183
resourceFieldRef:
150184
properties:
151185
containerName:
@@ -375,6 +409,23 @@ spec:
375409
- fieldPath
376410
type: object
377411
x-kubernetes-map-type: atomic
412+
fileKeyRef:
413+
properties:
414+
key:
415+
type: string
416+
optional:
417+
default: false
418+
type: boolean
419+
path:
420+
type: string
421+
volumeName:
422+
type: string
423+
required:
424+
- key
425+
- path
426+
- volumeName
427+
type: object
428+
x-kubernetes-map-type: atomic
378429
resourceFieldRef:
379430
properties:
380431
containerName:
@@ -595,6 +646,23 @@ spec:
595646
- fieldPath
596647
type: object
597648
x-kubernetes-map-type: atomic
649+
fileKeyRef:
650+
properties:
651+
key:
652+
type: string
653+
optional:
654+
default: false
655+
type: boolean
656+
path:
657+
type: string
658+
volumeName:
659+
type: string
660+
required:
661+
- key
662+
- path
663+
- volumeName
664+
type: object
665+
x-kubernetes-map-type: atomic
598666
resourceFieldRef:
599667
properties:
600668
containerName:
@@ -681,6 +749,23 @@ spec:
681749
- fieldPath
682750
type: object
683751
x-kubernetes-map-type: atomic
752+
fileKeyRef:
753+
properties:
754+
key:
755+
type: string
756+
optional:
757+
default: false
758+
type: boolean
759+
path:
760+
type: string
761+
volumeName:
762+
type: string
763+
required:
764+
- key
765+
- path
766+
- volumeName
767+
type: object
768+
x-kubernetes-map-type: atomic
684769
resourceFieldRef:
685770
properties:
686771
containerName:
@@ -905,6 +990,23 @@ spec:
905990
- fieldPath
906991
type: object
907992
x-kubernetes-map-type: atomic
993+
fileKeyRef:
994+
properties:
995+
key:
996+
type: string
997+
optional:
998+
default: false
999+
type: boolean
1000+
path:
1001+
type: string
1002+
volumeName:
1003+
type: string
1004+
required:
1005+
- key
1006+
- path
1007+
- volumeName
1008+
type: object
1009+
x-kubernetes-map-type: atomic
9081010
resourceFieldRef:
9091011
properties:
9101012
containerName:
@@ -1139,6 +1241,23 @@ spec:
11391241
- fieldPath
11401242
type: object
11411243
x-kubernetes-map-type: atomic
1244+
fileKeyRef:
1245+
properties:
1246+
key:
1247+
type: string
1248+
optional:
1249+
default: false
1250+
type: boolean
1251+
path:
1252+
type: string
1253+
volumeName:
1254+
type: string
1255+
required:
1256+
- key
1257+
- path
1258+
- volumeName
1259+
type: object
1260+
x-kubernetes-map-type: atomic
11421261
resourceFieldRef:
11431262
properties:
11441263
containerName:
@@ -1207,6 +1326,23 @@ spec:
12071326
- fieldPath
12081327
type: object
12091328
x-kubernetes-map-type: atomic
1329+
fileKeyRef:
1330+
properties:
1331+
key:
1332+
type: string
1333+
optional:
1334+
default: false
1335+
type: boolean
1336+
path:
1337+
type: string
1338+
volumeName:
1339+
type: string
1340+
required:
1341+
- key
1342+
- path
1343+
- volumeName
1344+
type: object
1345+
x-kubernetes-map-type: atomic
12101346
resourceFieldRef:
12111347
properties:
12121348
containerName:
@@ -1429,6 +1565,23 @@ spec:
14291565
- fieldPath
14301566
type: object
14311567
x-kubernetes-map-type: atomic
1568+
fileKeyRef:
1569+
properties:
1570+
key:
1571+
type: string
1572+
optional:
1573+
default: false
1574+
type: boolean
1575+
path:
1576+
type: string
1577+
volumeName:
1578+
type: string
1579+
required:
1580+
- key
1581+
- path
1582+
- volumeName
1583+
type: object
1584+
x-kubernetes-map-type: atomic
14321585
resourceFieldRef:
14331586
properties:
14341587
containerName:
@@ -1664,6 +1817,23 @@ spec:
16641817
- fieldPath
16651818
type: object
16661819
x-kubernetes-map-type: atomic
1820+
fileKeyRef:
1821+
properties:
1822+
key:
1823+
type: string
1824+
optional:
1825+
default: false
1826+
type: boolean
1827+
path:
1828+
type: string
1829+
volumeName:
1830+
type: string
1831+
required:
1832+
- key
1833+
- path
1834+
- volumeName
1835+
type: object
1836+
x-kubernetes-map-type: atomic
16671837
resourceFieldRef:
16681838
properties:
16691839
containerName:

‎bundle/community/manifests/opentelemetry.io_opampbridges.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,23 @@ spec:
531531
- fieldPath
532532
type: object
533533
x-kubernetes-map-type: atomic
534+
fileKeyRef:
535+
properties:
536+
key:
537+
type: string
538+
optional:
539+
default: false
540+
type: boolean
541+
path:
542+
type: string
543+
volumeName:
544+
type: string
545+
required:
546+
- key
547+
- path
548+
- volumeName
549+
type: object
550+
x-kubernetes-map-type: atomic
534551
resourceFieldRef:
535552
properties:
536553
containerName:
@@ -1564,6 +1581,25 @@ spec:
15641581
type: array
15651582
x-kubernetes-list-type: atomic
15661583
type: object
1584+
podCertificate:
1585+
properties:
1586+
certificateChainPath:
1587+
type: string
1588+
credentialBundlePath:
1589+
type: string
1590+
keyPath:
1591+
type: string
1592+
keyType:
1593+
type: string
1594+
maxExpirationSeconds:
1595+
format: int32
1596+
type: integer
1597+
signerName:
1598+
type: string
1599+
required:
1600+
- keyType
1601+
- signerName
1602+
type: object
15671603
secret:
15681604
properties:
15691605
items:

0 commit comments

Comments
 (0)