Skip to content

Commit bedf2ff

Browse files
csatib02csatib02
committed
fix(deps): resolve the ambiguous opentelemetry-operator import
The telemetry-controller bump imports opentelemetry-operator/apis, which was split out of the monolith at v0.156.0. e2e and pkg/sdk still require an old published logging-operator, and that pulls the monolith at v0.148.0, which still carries apis/v1beta1. Two modules then provide the same package and the build stops. An explicit require does not survive go mod tidy, so the pre-split versions are excluded instead. The newer prometheus-operator types SampleLimit as *int64, and the render helpers still called sort.Strings on what stdlib maps.Keys now returns as an iterator. golang.org/x/exp is no longer imported anywhere: the one remaining use was a type union that spells out the same constraint. Signed-off-by: Bence Csati <bence.csati@axoflow.com>
1 parent fe66567 commit bedf2ff

28 files changed

Lines changed: 483 additions & 377 deletions

‎charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_fluentbitagents.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,7 @@ spec:
883883
type: string
884884
modulus:
885885
format: int64
886+
minimum: 0
886887
type: integer
887888
regex:
888889
type: string
@@ -929,6 +930,7 @@ spec:
929930
type: string
930931
modulus:
931932
format: int64
933+
minimum: 0
932934
type: integer
933935
regex:
934936
type: string
@@ -1831,6 +1833,7 @@ spec:
18311833
type: string
18321834
modulus:
18331835
format: int64
1836+
minimum: 0
18341837
type: integer
18351838
regex:
18361839
type: string
@@ -1877,6 +1880,7 @@ spec:
18771880
type: string
18781881
modulus:
18791882
format: int64
1883+
minimum: 0
18801884
type: integer
18811885
regex:
18821886
type: string

‎charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_fluentdconfigs.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -871,6 +871,7 @@ spec:
871871
type: string
872872
modulus:
873873
format: int64
874+
minimum: 0
874875
type: integer
875876
regex:
876877
type: string
@@ -917,6 +918,7 @@ spec:
917918
type: string
918919
modulus:
919920
format: int64
921+
minimum: 0
920922
type: integer
921923
regex:
922924
type: string
@@ -3511,6 +3513,7 @@ spec:
35113513
type: string
35123514
modulus:
35133515
format: int64
3516+
minimum: 0
35143517
type: integer
35153518
regex:
35163519
type: string
@@ -3557,6 +3560,7 @@ spec:
35573560
type: string
35583561
modulus:
35593562
format: int64
3563+
minimum: 0
35603564
type: integer
35613565
regex:
35623566
type: string

‎charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_loggings.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1752,6 +1752,7 @@ spec:
17521752
type: string
17531753
modulus:
17541754
format: int64
1755+
minimum: 0
17551756
type: integer
17561757
regex:
17571758
type: string
@@ -1798,6 +1799,7 @@ spec:
17981799
type: string
17991800
modulus:
18001801
format: int64
1802+
minimum: 0
18011803
type: integer
18021804
regex:
18031805
type: string
@@ -2700,6 +2702,7 @@ spec:
27002702
type: string
27012703
modulus:
27022704
format: int64
2705+
minimum: 0
27032706
type: integer
27042707
regex:
27052708
type: string
@@ -2746,6 +2749,7 @@ spec:
27462749
type: string
27472750
modulus:
27482751
format: int64
2752+
minimum: 0
27492753
type: integer
27502754
regex:
27512755
type: string
@@ -4509,6 +4513,7 @@ spec:
45094513
type: string
45104514
modulus:
45114515
format: int64
4516+
minimum: 0
45124517
type: integer
45134518
regex:
45144519
type: string
@@ -4555,6 +4560,7 @@ spec:
45554560
type: string
45564561
modulus:
45574562
format: int64
4563+
minimum: 0
45584564
type: integer
45594565
regex:
45604566
type: string
@@ -7149,6 +7155,7 @@ spec:
71497155
type: string
71507156
modulus:
71517157
format: int64
7158+
minimum: 0
71527159
type: integer
71537160
regex:
71547161
type: string
@@ -7195,6 +7202,7 @@ spec:
71957202
type: string
71967203
modulus:
71977204
format: int64
7205+
minimum: 0
71987206
type: integer
71997207
regex:
72007208
type: string
@@ -9680,6 +9688,7 @@ spec:
96809688
type: string
96819689
modulus:
96829690
format: int64
9691+
minimum: 0
96839692
type: integer
96849693
regex:
96859694
type: string
@@ -9726,6 +9735,7 @@ spec:
97269735
type: string
97279736
modulus:
97289737
format: int64
9738+
minimum: 0
97299739
type: integer
97309740
regex:
97319741
type: string
@@ -13887,6 +13897,7 @@ spec:
1388713897
type: string
1388813898
modulus:
1388913899
format: int64
13900+
minimum: 0
1389013901
type: integer
1389113902
regex:
1389213903
type: string
@@ -13933,6 +13944,7 @@ spec:
1393313944
type: string
1393413945
modulus:
1393513946
format: int64
13947+
minimum: 0
1393613948
type: integer
1393713949
regex:
1393813950
type: string

‎charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_syslogngconfigs.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ spec:
124124
type: string
125125
modulus:
126126
format: int64
127+
minimum: 0
127128
type: integer
128129
regex:
129130
type: string
@@ -170,6 +171,7 @@ spec:
170171
type: string
171172
modulus:
172173
format: int64
174+
minimum: 0
173175
type: integer
174176
regex:
175177
type: string
@@ -4331,6 +4333,7 @@ spec:
43314333
type: string
43324334
modulus:
43334335
format: int64
4336+
minimum: 0
43344337
type: integer
43354338
regex:
43364339
type: string
@@ -4377,6 +4380,7 @@ spec:
43774380
type: string
43784381
modulus:
43794382
format: int64
4383+
minimum: 0
43804384
type: integer
43814385
regex:
43824386
type: string

‎charts/logging-operator/crds/logging.banzaicloud.io_fluentbitagents.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -880,6 +880,7 @@ spec:
880880
type: string
881881
modulus:
882882
format: int64
883+
minimum: 0
883884
type: integer
884885
regex:
885886
type: string
@@ -926,6 +927,7 @@ spec:
926927
type: string
927928
modulus:
928929
format: int64
930+
minimum: 0
929931
type: integer
930932
regex:
931933
type: string
@@ -1828,6 +1830,7 @@ spec:
18281830
type: string
18291831
modulus:
18301832
format: int64
1833+
minimum: 0
18311834
type: integer
18321835
regex:
18331836
type: string
@@ -1874,6 +1877,7 @@ spec:
18741877
type: string
18751878
modulus:
18761879
format: int64
1880+
minimum: 0
18771881
type: integer
18781882
regex:
18791883
type: string

‎charts/logging-operator/crds/logging.banzaicloud.io_fluentdconfigs.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -868,6 +868,7 @@ spec:
868868
type: string
869869
modulus:
870870
format: int64
871+
minimum: 0
871872
type: integer
872873
regex:
873874
type: string
@@ -914,6 +915,7 @@ spec:
914915
type: string
915916
modulus:
916917
format: int64
918+
minimum: 0
917919
type: integer
918920
regex:
919921
type: string
@@ -3508,6 +3510,7 @@ spec:
35083510
type: string
35093511
modulus:
35103512
format: int64
3513+
minimum: 0
35113514
type: integer
35123515
regex:
35133516
type: string
@@ -3554,6 +3557,7 @@ spec:
35543557
type: string
35553558
modulus:
35563559
format: int64
3560+
minimum: 0
35573561
type: integer
35583562
regex:
35593563
type: string

‎charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1749,6 +1749,7 @@ spec:
17491749
type: string
17501750
modulus:
17511751
format: int64
1752+
minimum: 0
17521753
type: integer
17531754
regex:
17541755
type: string
@@ -1795,6 +1796,7 @@ spec:
17951796
type: string
17961797
modulus:
17971798
format: int64
1799+
minimum: 0
17981800
type: integer
17991801
regex:
18001802
type: string
@@ -2697,6 +2699,7 @@ spec:
26972699
type: string
26982700
modulus:
26992701
format: int64
2702+
minimum: 0
27002703
type: integer
27012704
regex:
27022705
type: string
@@ -2743,6 +2746,7 @@ spec:
27432746
type: string
27442747
modulus:
27452748
format: int64
2749+
minimum: 0
27462750
type: integer
27472751
regex:
27482752
type: string
@@ -4506,6 +4510,7 @@ spec:
45064510
type: string
45074511
modulus:
45084512
format: int64
4513+
minimum: 0
45094514
type: integer
45104515
regex:
45114516
type: string
@@ -4552,6 +4557,7 @@ spec:
45524557
type: string
45534558
modulus:
45544559
format: int64
4560+
minimum: 0
45554561
type: integer
45564562
regex:
45574563
type: string
@@ -7146,6 +7152,7 @@ spec:
71467152
type: string
71477153
modulus:
71487154
format: int64
7155+
minimum: 0
71497156
type: integer
71507157
regex:
71517158
type: string
@@ -7192,6 +7199,7 @@ spec:
71927199
type: string
71937200
modulus:
71947201
format: int64
7202+
minimum: 0
71957203
type: integer
71967204
regex:
71977205
type: string
@@ -9677,6 +9685,7 @@ spec:
96779685
type: string
96789686
modulus:
96799687
format: int64
9688+
minimum: 0
96809689
type: integer
96819690
regex:
96829691
type: string
@@ -9723,6 +9732,7 @@ spec:
97239732
type: string
97249733
modulus:
97259734
format: int64
9735+
minimum: 0
97269736
type: integer
97279737
regex:
97289738
type: string
@@ -13884,6 +13894,7 @@ spec:
1388413894
type: string
1388513895
modulus:
1388613896
format: int64
13897+
minimum: 0
1388713898
type: integer
1388813899
regex:
1388913900
type: string
@@ -13930,6 +13941,7 @@ spec:
1393013941
type: string
1393113942
modulus:
1393213943
format: int64
13944+
minimum: 0
1393313945
type: integer
1393413946
regex:
1393513947
type: string

‎charts/logging-operator/crds/logging.banzaicloud.io_syslogngconfigs.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ spec:
121121
type: string
122122
modulus:
123123
format: int64
124+
minimum: 0
124125
type: integer
125126
regex:
126127
type: string
@@ -167,6 +168,7 @@ spec:
167168
type: string
168169
modulus:
169170
format: int64
171+
minimum: 0
170172
type: integer
171173
regex:
172174
type: string
@@ -4328,6 +4330,7 @@ spec:
43284330
type: string
43294331
modulus:
43304332
format: int64
4333+
minimum: 0
43314334
type: integer
43324335
regex:
43334336
type: string
@@ -4374,6 +4377,7 @@ spec:
43744377
type: string
43754378
modulus:
43764379
format: int64
4380+
minimum: 0
43774381
type: integer
43784382
regex:
43794383
type: string

0 commit comments

Comments
 (0)