Skip to content

Commit dab6f18

Browse files
committed
⚠️ upgrade to k8s 0.27.0-alpha.2
Signed-off-by: Mikko Ylinen <[email protected]>
1 parent d351092 commit dab6f18

File tree

7 files changed

+76
-68
lines changed

7 files changed

+76
-68
lines changed

go.mod

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ require (
1717
golang.org/x/sys v0.5.0
1818
golang.org/x/time v0.3.0
1919
gomodules.xyz/jsonpatch/v2 v2.2.0
20-
k8s.io/api v0.26.1
21-
k8s.io/apiextensions-apiserver v0.26.1
22-
k8s.io/apimachinery v0.26.1
23-
k8s.io/client-go v0.26.1
24-
k8s.io/component-base v0.26.1
20+
k8s.io/api v0.27.0-alpha.2
21+
k8s.io/apiextensions-apiserver v0.27.0-alpha.2
22+
k8s.io/apimachinery v0.27.0-alpha.2
23+
k8s.io/client-go v0.27.0-alpha.2
24+
k8s.io/component-base v0.27.0-alpha.2
2525
k8s.io/klog/v2 v2.90.0
26-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
26+
k8s.io/utils v0.0.0-20230209194617-a36077c30491
2727
sigs.k8s.io/yaml v1.3.0
2828
)
2929

@@ -33,19 +33,19 @@ require (
3333
github.com/davecgh/go-spew v1.1.1 // indirect
3434
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
3535
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
36-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
37-
github.com/go-openapi/jsonreference v0.20.0 // indirect
38-
github.com/go-openapi/swag v0.19.14 // indirect
36+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
37+
github.com/go-openapi/jsonreference v0.20.1 // indirect
38+
github.com/go-openapi/swag v0.22.3 // indirect
3939
github.com/gogo/protobuf v1.3.2 // indirect
4040
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4141
github.com/golang/protobuf v1.5.2 // indirect
4242
github.com/google/gnostic v0.5.7-v3refs // indirect
4343
github.com/google/gofuzz v1.1.0 // indirect
44-
github.com/google/uuid v1.1.2 // indirect
44+
github.com/google/uuid v1.3.0 // indirect
4545
github.com/imdario/mergo v0.3.6 // indirect
4646
github.com/josharian/intern v1.0.0 // indirect
4747
github.com/json-iterator/go v1.1.12 // indirect
48-
github.com/mailru/easyjson v0.7.6 // indirect
48+
github.com/mailru/easyjson v0.7.7 // indirect
4949
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
5050
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5151
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -65,7 +65,7 @@ require (
6565
gopkg.in/inf.v0 v0.9.1 // indirect
6666
gopkg.in/yaml.v2 v2.4.0 // indirect
6767
gopkg.in/yaml.v3 v3.0.1 // indirect
68-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
68+
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a // indirect
6969
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
7070
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
7171
)

go.sum

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,12 @@ github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
8888
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
8989
github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A=
9090
github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4=
91-
github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
92-
github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
93-
github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
94-
github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
95-
github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
96-
github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
97-
github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng=
98-
github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
91+
github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
92+
github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
93+
github.com/go-openapi/jsonreference v0.20.1 h1:FBLnyygC4/IZZr893oiomc9XaghoveYTrLC1F86HID8=
94+
github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
95+
github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
96+
github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
9997
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
10098
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
10199
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -158,8 +156,8 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf
158156
github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
159157
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
160158
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
161-
github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
162-
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
159+
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
160+
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
163161
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
164162
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
165163
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -187,14 +185,14 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv
187185
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
188186
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
189187
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
188+
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
189+
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
190190
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
191191
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
192192
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
193193
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
194-
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
195-
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
196-
github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
197-
github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
194+
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
195+
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
198196
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
199197
github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM=
200198
github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
@@ -209,8 +207,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
209207
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
210208
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
211209
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
212-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
213-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
214210
github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU=
215211
github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc=
216212
github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q=
@@ -248,6 +244,7 @@ github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
248244
github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
249245
github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
250246
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
247+
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
251248
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
252249
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
253250
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
@@ -256,13 +253,17 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
256253
github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
257254
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
258255
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
256+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
257+
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
259258
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
260259
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
261260
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
262261
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
263-
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
264262
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
265-
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
263+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
264+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
265+
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
266+
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
266267
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
267268
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
268269
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -563,8 +564,8 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks
563564
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
564565
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
565566
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
566-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
567-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
567+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
568+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
568569
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
569570
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
570571
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
@@ -588,22 +589,22 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
588589
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
589590
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
590591
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
591-
k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ=
592-
k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg=
593-
k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI=
594-
k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM=
595-
k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ=
596-
k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
597-
k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU=
598-
k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE=
599-
k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
600-
k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
592+
k8s.io/api v0.27.0-alpha.2 h1:0dgyAB8IUYV+d49NsYQ0RwmbZyhVMVo5eKKL/nE8oc4=
593+
k8s.io/api v0.27.0-alpha.2/go.mod h1:vaMBc1hEu66MsgL4gSxfoaJ7nnefwtO1yC9ZgOfWU4E=
594+
k8s.io/apiextensions-apiserver v0.27.0-alpha.2 h1:AOXDUDUrnK3iyQe9h+SfNiL2MQv7qXwRpvw0rzR7+Jk=
595+
k8s.io/apiextensions-apiserver v0.27.0-alpha.2/go.mod h1:Ww0t5RybXI3aCeuE39L+HmctKYcwfQjkpx5p2593eLY=
596+
k8s.io/apimachinery v0.27.0-alpha.2 h1:hE3r36BDC7kYr5AFAT/G9/wnnFqlGwMxo7q8tV5T56Y=
597+
k8s.io/apimachinery v0.27.0-alpha.2/go.mod h1:ZMhtJx+JNGzwCUeULGdPglfsNv0/EmXTT4Inrn2tKB4=
598+
k8s.io/client-go v0.27.0-alpha.2 h1:qEgwkuYKx/nzNZ4pUzagV7kcYMAPfHSXl5aMyiH701c=
599+
k8s.io/client-go v0.27.0-alpha.2/go.mod h1:POWf/v0OxJ4g87xTyhyQcBOcIQ/c57RuGo+TGO82uEE=
600+
k8s.io/component-base v0.27.0-alpha.2 h1:XC8aBinXwwFZ6Q5gG1ZgTb6l16oT0whJR+ViYRi2ud0=
601+
k8s.io/component-base v0.27.0-alpha.2/go.mod h1:Vjzu7Dt2WH/3IIX1HFGW1bGkQyGQYuZ+2Sgtzr/QtMo=
601602
k8s.io/klog/v2 v2.90.0 h1:VkTxIV/FjRXn1fgNNcKGM8cfmL1Z33ZjXRTVxKCoF5M=
602603
k8s.io/klog/v2 v2.90.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
603-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
604-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
605-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y=
606-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
604+
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
605+
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
606+
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
607+
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
607608
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
608609
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
609610
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

pkg/cache/cache_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,10 +1349,10 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
13491349

13501350
By("adding an event handler listening for object creation which sends the object to a channel")
13511351
out := make(chan interface{})
1352-
addFunc := func(obj interface{}) {
1352+
addFunc := func(obj interface{}, isInInitialList bool) {
13531353
out <- obj
13541354
}
1355-
_, _ = sii.AddEventHandler(kcache.ResourceEventHandlerFuncs{AddFunc: addFunc})
1355+
_, _ = sii.AddEventHandler(kcache.ResourceEventHandlerDetailedFuncs{AddFunc: addFunc})
13561356

13571357
By("adding an object")
13581358
cl, err := client.New(cfg, client.Options{})
@@ -1373,10 +1373,10 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
13731373

13741374
By("adding an event handler listening for object creation which sends the object to a channel")
13751375
out := make(chan interface{})
1376-
addFunc := func(obj interface{}) {
1376+
addFunc := func(obj interface{}, isInInitialList bool) {
13771377
out <- obj
13781378
}
1379-
_, _ = sii.AddEventHandler(kcache.ResourceEventHandlerFuncs{AddFunc: addFunc})
1379+
_, _ = sii.AddEventHandler(kcache.ResourceEventHandlerDetailedFuncs{AddFunc: addFunc})
13801380

13811381
By("adding an object")
13821382
cl, err := client.New(cfg, client.Options{})
@@ -1532,10 +1532,10 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
15321532

15331533
By("adding an event handler listening for object creation which sends the object to a channel")
15341534
out := make(chan interface{})
1535-
addFunc := func(obj interface{}) {
1535+
addFunc := func(obj interface{}, isInInitialList bool) {
15361536
out <- obj
15371537
}
1538-
_, _ = sii.AddEventHandler(kcache.ResourceEventHandlerFuncs{AddFunc: addFunc})
1538+
_, _ = sii.AddEventHandler(kcache.ResourceEventHandlerDetailedFuncs{AddFunc: addFunc})
15391539

15401540
By("adding an object")
15411541
cl, err := client.New(cfg, client.Options{})
@@ -1650,10 +1650,10 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
16501650

16511651
By("adding an event handler listening for object creation which sends the object to a channel")
16521652
out := make(chan interface{})
1653-
addFunc := func(obj interface{}) {
1653+
addFunc := func(obj interface{}, isInInitialList bool) {
16541654
out <- obj
16551655
}
1656-
_, _ = sii.AddEventHandler(kcache.ResourceEventHandlerFuncs{AddFunc: addFunc})
1656+
_, _ = sii.AddEventHandler(kcache.ResourceEventHandlerDetailedFuncs{AddFunc: addFunc})
16571657

16581658
By("adding an object")
16591659
cl, err := client.New(cfg, client.Options{})

pkg/cache/multi_namespace_cache.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,18 @@ type multiNamespaceInformer struct {
305305
namespaceToInformer map[string]Informer
306306
}
307307

308+
// multiNamespaceRegistrationHandles implements ResourceEventHandlerRegistration
309+
type multiNamespaceRegistrationHandles map[string]toolscache.ResourceEventHandlerRegistration
310+
311+
func (re multiNamespaceRegistrationHandles) HasSynced() bool {
312+
return false
313+
}
314+
308315
var _ Informer = &multiNamespaceInformer{}
309316

310317
// AddEventHandler adds the handler to each namespaced informer.
311318
func (i *multiNamespaceInformer) AddEventHandler(handler toolscache.ResourceEventHandler) (toolscache.ResourceEventHandlerRegistration, error) {
312-
handles := make(map[string]toolscache.ResourceEventHandlerRegistration, len(i.namespaceToInformer))
319+
handles := make(multiNamespaceRegistrationHandles, len(i.namespaceToInformer))
313320
for ns, informer := range i.namespaceToInformer {
314321
registration, err := informer.AddEventHandler(handler)
315322
if err != nil {
@@ -322,7 +329,7 @@ func (i *multiNamespaceInformer) AddEventHandler(handler toolscache.ResourceEven
322329

323330
// AddEventHandlerWithResyncPeriod adds the handler with a resync period to each namespaced informer.
324331
func (i *multiNamespaceInformer) AddEventHandlerWithResyncPeriod(handler toolscache.ResourceEventHandler, resyncPeriod time.Duration) (toolscache.ResourceEventHandlerRegistration, error) {
325-
handles := make(map[string]toolscache.ResourceEventHandlerRegistration, len(i.namespaceToInformer))
332+
handles := make(multiNamespaceRegistrationHandles, len(i.namespaceToInformer))
326333
for ns, informer := range i.namespaceToInformer {
327334
registration, err := informer.AddEventHandlerWithResyncPeriod(handler, resyncPeriod)
328335
if err != nil {
@@ -335,7 +342,7 @@ func (i *multiNamespaceInformer) AddEventHandlerWithResyncPeriod(handler toolsca
335342

336343
// RemoveEventHandler removes a formerly added event handler given by its registration handle.
337344
func (i *multiNamespaceInformer) RemoveEventHandler(h toolscache.ResourceEventHandlerRegistration) error {
338-
handles, ok := h.(map[string]toolscache.ResourceEventHandlerRegistration)
345+
handles, ok := h.(multiNamespaceRegistrationHandles)
339346
if !ok {
340347
return fmt.Errorf("it is not the registration returned by multiNamespaceInformer")
341348
}

pkg/controller/controllertest/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (f *FakeInformer) Run(<-chan struct{}) {
7070
// Add fakes an Add event for obj.
7171
func (f *FakeInformer) Add(obj metav1.Object) {
7272
for _, h := range f.handlers {
73-
h.OnAdd(obj)
73+
h.OnAdd(obj, false)
7474
}
7575
}
7676

pkg/internal/source/event_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ type EventHandler struct {
5656
}
5757

5858
// OnAdd creates CreateEvent and calls Create on EventHandler.
59-
func (e *EventHandler) OnAdd(obj interface{}) {
59+
func (e *EventHandler) OnAdd(obj interface{}, isInInitialList bool) {
6060
c := event.CreateEvent{}
6161

6262
// Pull Object out of the object

0 commit comments

Comments
 (0)