Skip to content

Commit 7485bef

Browse files
committed
Bump IPAM to v0.2.3 and metal-operator to latest
1 parent 40461e8 commit 7485bef

File tree

7 files changed

+41
-54
lines changed

7 files changed

+41
-54
lines changed

go.mod

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ module github.com/ironcore-dev/fedhcp
22

33
go 1.24.0
44

5-
toolchain go1.24.1
5+
toolchain go1.24.3
66

77
require (
88
github.com/coredhcp/coredhcp v0.0.0-20240908184240-576af8676ffa
99
github.com/google/addlicense v1.1.1
1010
github.com/insomniacslk/dhcp v0.0.0-20240829085014-a3a4c1f04475
11-
github.com/ironcore-dev/controller-utils v0.9.7
12-
github.com/ironcore-dev/ipam v0.2.2
13-
github.com/ironcore-dev/metal-operator v0.0.0-20240910120000-bbd70c2a0eb0
11+
github.com/ironcore-dev/controller-utils v0.9.9
12+
github.com/ironcore-dev/ipam v0.2.3
13+
github.com/ironcore-dev/metal-operator v0.0.0-20250513095753-f66aeecc9435
1414
github.com/mdlayher/netx v0.0.0-20230430222610-7e21880baee8
1515
github.com/onsi/ginkgo/v2 v2.23.4
1616
github.com/onsi/gomega v1.37.0
@@ -21,23 +21,20 @@ require (
2121
k8s.io/api v0.33.1
2222
k8s.io/apimachinery v0.33.1
2323
k8s.io/client-go v0.33.1
24-
sigs.k8s.io/controller-runtime v0.19.4
24+
sigs.k8s.io/controller-runtime v0.20.4
2525
)
2626

2727
replace github.com/coredhcp/coredhcp => github.com/damyan/coredhcp v0.0.0-20240911115402-66f9c25a305e
2828

2929
replace github.com/insomniacslk/dhcp => github.com/damyan/dhcp v0.0.0-20250326181646-a882567e66e8
3030

3131
require (
32-
github.com/beorn7/perks v1.0.1 // indirect
3332
github.com/bits-and-blooms/bitset v1.14.3 // indirect
3433
github.com/bmatcuk/doublestar/v4 v4.2.0 // indirect
35-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3634
github.com/chappjc/logrus-prefix v0.0.0-20180227015900-3a1d64819adb // indirect
3735
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3836
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
39-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
40-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
37+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
4138
github.com/fsnotify/fsnotify v1.7.0 // indirect
4239
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4340
github.com/go-logr/logr v1.4.2 // indirect
@@ -55,7 +52,6 @@ require (
5552
github.com/hashicorp/hcl v1.0.0 // indirect
5653
github.com/josharian/intern v1.0.0 // indirect
5754
github.com/json-iterator/go v1.1.12 // indirect
58-
github.com/klauspost/compress v1.17.9 // indirect
5955
github.com/magiconair/properties v1.8.7 // indirect
6056
github.com/mailru/easyjson v0.7.7 // indirect
6157
github.com/mattn/go-colorable v0.1.13 // indirect
@@ -70,16 +66,14 @@ require (
7066
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
7167
github.com/pierrec/lz4/v4 v4.1.21 // indirect
7268
github.com/prometheus/client_golang v1.20.3 // indirect
73-
github.com/prometheus/client_model v0.6.1 // indirect
7469
github.com/prometheus/common v0.59.1 // indirect
75-
github.com/prometheus/procfs v0.15.1 // indirect
7670
github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 // indirect
7771
github.com/sagikazarmark/locafero v0.6.0 // indirect
7872
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
7973
github.com/sourcegraph/conc v0.3.0 // indirect
8074
github.com/spf13/afero v1.11.0 // indirect
8175
github.com/spf13/cast v1.7.0 // indirect
82-
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
76+
github.com/spf13/pflag v1.0.6 // indirect
8377
github.com/spf13/viper v1.19.0 // indirect
8478
github.com/subosito/gotenv v1.6.0 // indirect
8579
github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect
@@ -88,22 +82,21 @@ require (
8882
go.uber.org/multierr v1.11.0 // indirect
8983
go.uber.org/zap v1.27.0 // indirect
9084
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
91-
golang.org/x/crypto v0.36.0 // indirect
85+
golang.org/x/crypto v0.37.0 // indirect
9286
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
9387
golang.org/x/net v0.38.0 // indirect
9488
golang.org/x/oauth2 v0.27.0 // indirect
95-
golang.org/x/sync v0.12.0 // indirect
89+
golang.org/x/sync v0.13.0 // indirect
9690
golang.org/x/sys v0.32.0 // indirect
97-
golang.org/x/term v0.30.0 // indirect
98-
golang.org/x/text v0.23.0 // indirect
91+
golang.org/x/term v0.31.0 // indirect
92+
golang.org/x/text v0.24.0 // indirect
9993
golang.org/x/time v0.9.0 // indirect
10094
golang.org/x/tools v0.31.0 // indirect
101-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
10295
google.golang.org/protobuf v1.36.5 // indirect
10396
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
10497
gopkg.in/inf.v0 v0.9.1 // indirect
10598
gopkg.in/ini.v1 v1.67.0 // indirect
106-
k8s.io/apiextensions-apiserver v0.31.4 // indirect
99+
k8s.io/apiextensions-apiserver v0.32.3 // indirect
107100
k8s.io/klog/v2 v2.130.1 // indirect
108101
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
109102
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect

go.sum

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
1919
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2020
github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU=
2121
github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
22-
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
23-
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
24-
github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=
25-
github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
22+
github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
23+
github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
2624
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
2725
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
2826
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
@@ -52,8 +50,6 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
5250
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
5351
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
5452
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
55-
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
56-
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
5753
github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
5854
github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
5955
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8=
@@ -62,12 +58,12 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
6258
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
6359
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
6460
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
65-
github.com/ironcore-dev/controller-utils v0.9.7 h1:ywNcB6lDeOe6UWxJaptbdgb9qb6cDx4+jxBcIGkMQD8=
66-
github.com/ironcore-dev/controller-utils v0.9.7/go.mod h1:7X6JUmq75o4KFe05zUa9rEXnS39dSrlXqUnt9Wuiug0=
67-
github.com/ironcore-dev/ipam v0.2.2 h1:mens+psDYnw2Eakf33vNq+6OS2DebZtilMzI+Gx9NRQ=
68-
github.com/ironcore-dev/ipam v0.2.2/go.mod h1:B9+Q+s9tXDJc+ha2J4CrjlxCuqASgcIlrTMs6ZfKb+o=
69-
github.com/ironcore-dev/metal-operator v0.0.0-20240910120000-bbd70c2a0eb0 h1:uka+TDFFXOVdJurwROD+S8crX1Zb1i/d7+4VKrbmHtA=
70-
github.com/ironcore-dev/metal-operator v0.0.0-20240910120000-bbd70c2a0eb0/go.mod h1:WKHotrH3wiLey9PQcQJErK57J+l/g+XddKtm2PqbsVw=
61+
github.com/ironcore-dev/controller-utils v0.9.9 h1:SRVMjj+jh9yDZj//1hGG7U7S4fRuUVICAiXu7JBHJyo=
62+
github.com/ironcore-dev/controller-utils v0.9.9/go.mod h1:hNqQjd6JkRmKYH1MY1XkfT4Eew3P7etHTJjaHj+vK9Y=
63+
github.com/ironcore-dev/ipam v0.2.3 h1:ELQqMA//eOoeSdZ+m98MFmw5d3OaJJX65F2O5BjlTHY=
64+
github.com/ironcore-dev/ipam v0.2.3/go.mod h1:NSAq8rNgjWAFfJQWmYDm90rzJZLI283kfSFqLBplOJk=
65+
github.com/ironcore-dev/metal-operator v0.0.0-20250513095753-f66aeecc9435 h1:ykVWXFwgMzYatwM6R15+fNiYMg+54AeXTl1PhnsQhrM=
66+
github.com/ironcore-dev/metal-operator v0.0.0-20250513095753-f66aeecc9435/go.mod h1:cpeP3tM5BsxEs1u3gidh8QRoaHH+dMLz+Qv6XjTQS/I=
7167
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
7268
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
7369
github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
@@ -82,8 +78,6 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
8278
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
8379
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
8480
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
85-
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
86-
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
8781
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
8882
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
8983
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
@@ -155,8 +149,8 @@ github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
155149
github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
156150
github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w=
157151
github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
158-
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace h1:9PNP1jnUjRhfmGMlkXHjYPishpcw4jpSt/V/xYY3FMA=
159-
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
152+
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
153+
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
160154
github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
161155
github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
162156
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -189,8 +183,8 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/W
189183
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
190184
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
191185
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
192-
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
193-
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
186+
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
187+
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
194188
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
195189
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
196190
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
@@ -208,8 +202,8 @@ golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT
208202
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
209203
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
210204
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
211-
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
212-
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
205+
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
206+
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
213207
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
214208
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
215209
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -219,12 +213,12 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc
219213
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
220214
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
221215
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
222-
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
223-
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
216+
golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
217+
golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
224218
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
225219
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
226-
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
227-
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
220+
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
221+
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
228222
golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
229223
golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
230224
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -260,8 +254,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
260254
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
261255
k8s.io/api v0.33.1 h1:tA6Cf3bHnLIrUK4IqEgb2v++/GYUtqiu9sRVk3iBXyw=
262256
k8s.io/api v0.33.1/go.mod h1:87esjTn9DRSRTD4fWMXamiXxJhpOIREjWOSjsW1kEHw=
263-
k8s.io/apiextensions-apiserver v0.31.4 h1:FxbqzSvy92Ca9DIs5jqot883G0Ln/PGXfm/07t39LS0=
264-
k8s.io/apiextensions-apiserver v0.31.4/go.mod h1:hIW9YU8UsqZqIWGG99/gsdIU0Ar45Qd3A12QOe/rvpg=
257+
k8s.io/apiextensions-apiserver v0.32.3 h1:4D8vy+9GWerlErCwVIbcQjsWunF9SUGNu7O7hiQTyPY=
258+
k8s.io/apiextensions-apiserver v0.32.3/go.mod h1:8YwcvVRMVzw0r1Stc7XfGAzB/SIVLunqApySV5V7Dss=
265259
k8s.io/apimachinery v0.33.1 h1:mzqXWV8tW9Rw4VeW9rEkqvnxj59k1ezDUl20tFK/oM4=
266260
k8s.io/apimachinery v0.33.1/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
267261
k8s.io/client-go v0.33.1 h1:ZZV/Ks2g92cyxWkRRnfUDsnhNn28eFpt26aGc8KbXF4=
@@ -272,8 +266,8 @@ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUy
272266
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
273267
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
274268
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
275-
sigs.k8s.io/controller-runtime v0.19.4 h1:SUmheabttt0nx8uJtoII4oIP27BVVvAKFvdvGFwV/Qo=
276-
sigs.k8s.io/controller-runtime v0.19.4/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
269+
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
270+
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
277271
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
278272
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
279273
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=

plugins/ipam/k8s.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func (k K8sClient) prepareCreateIpamIP(ctx context.Context, subnetName string, m
125125
log.Debugf("IPAM IP with MAC %v and wrong subnet %s/%s found, ignoring", macKey,
126126
existingIpamIP.Namespace, existingIpamIP.Spec.Subnet.Name)
127127
continue
128-
} else if existingIpamIP.Status.State == ipamv1alpha1.CFailedIPState {
128+
} else if existingIpamIP.Status.State == ipamv1alpha1.FailedIPState {
129129
log.Infof("Failed IP %s in subnet %s found, deleting", client.ObjectKeyFromObject(&existingIpamIP), existingIpamIP.Spec.Subnet.Name)
130130
log.Debugf("Deleting old IP %s:\n%v", client.ObjectKeyFromObject(&existingIpamIP), prettyFormat(existingIpamIP.Status))
131131
if err := k.Client.Delete(ctx, &existingIpamIP); err != nil {

plugins/metal/plugin.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func handler6(req, resp dhcpv6.DHCPv6) (dhcpv6.DHCPv6, bool) {
157157
return nil, true
158158
}
159159

160-
if err := ApplyEndpointForMACAddress(mac, ipamv1alpha1.CIPv6SubnetType); err != nil {
160+
if err := ApplyEndpointForMACAddress(mac, ipamv1alpha1.IPv6SubnetType); err != nil {
161161
log.Errorf("Could not apply endpoint for mac %s: %s", mac.String(), err)
162162
return resp, false
163163
}
@@ -171,7 +171,7 @@ func handler4(req, resp *dhcpv4.DHCPv4) (*dhcpv4.DHCPv4, bool) {
171171

172172
mac := req.ClientHWAddr
173173

174-
if err := ApplyEndpointForMACAddress(mac, ipamv1alpha1.CIPv4SubnetType); err != nil {
174+
if err := ApplyEndpointForMACAddress(mac, ipamv1alpha1.IPv4SubnetType); err != nil {
175175
log.Errorf("Could not apply peer address: %s", err)
176176
return resp, false
177177
}

plugins/metal/plugin_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ var _ = Describe("Endpoint", func() {
307307
It("Should not return an IP address for a known machine without IP address", func(ctx SpecContext) {
308308
mac, _ := net.ParseMAC(machineWithoutIPAddressMACAddress)
309309

310-
ip, err := GetIPAMIPAddressForMACAddress(mac, ipamv1alpha1.CIPv6SubnetType)
310+
ip, err := GetIPAMIPAddressForMACAddress(mac, ipamv1alpha1.IPv6SubnetType)
311311
Eventually(err).ShouldNot(HaveOccurred())
312312
Eventually(ip).Should(BeNil())
313313
})

plugins/oob/k8s.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ func (k K8sClient) prepareCreateIpamIP(ctx context.Context, subnetName string, m
147147
log.Debugf("IPAM IP with MAC %v and wrong subnet %s/%s found, ignoring", macKey,
148148
existingIpamIP.Namespace, existingIpamIP.Spec.Subnet.Name)
149149
continue
150-
} else if existingIpamIP.Status.State == ipamv1alpha1.CFailedIPState {
150+
} else if existingIpamIP.Status.State == ipamv1alpha1.FailedIPState {
151151
log.Infof("Failed IP %s in subnet %s found, deleting", client.ObjectKeyFromObject(&existingIpamIP), existingIpamIP.Spec.Subnet.Name)
152152
log.Debugf("Deleting old IP %s:\n%v", client.ObjectKeyFromObject(&existingIpamIP), prettyFormat(existingIpamIP.Status))
153153
if err := k.Client.Delete(ctx, &existingIpamIP); err != nil {

plugins/oob/plugin.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func handler6(req, resp dhcpv6.DHCPv6) (dhcpv6.DHCPv6, bool) {
111111
ctx, cancel := context.WithCancel(context.Background())
112112
defer cancel()
113113
log.Infof("Requested IP address from relay %s for mac %s", ipaddr.String(), mac.String())
114-
leaseIP, err := k8sClient.getIp(ctx, ipaddr, mac, false, ipamv1alpha1.CIPv6SubnetType)
114+
leaseIP, err := k8sClient.getIp(ctx, ipaddr, mac, false, ipamv1alpha1.IPv6SubnetType)
115115
if err != nil {
116116
log.Errorf("Could not get IPAM IP: %s", err)
117117
return nil, true
@@ -195,7 +195,7 @@ func handler4(req, resp *dhcpv4.DHCPv4) (*dhcpv4.DHCPv4, bool) {
195195
ctx, cancel := context.WithCancel(context.Background())
196196
defer cancel()
197197
log.Debugf("IP: %v", ipaddr)
198-
leaseIP, err := k8sClient.getIp(ctx, ipaddr, mac, exactIP, ipamv1alpha1.CIPv4SubnetType)
198+
leaseIP, err := k8sClient.getIp(ctx, ipaddr, mac, exactIP, ipamv1alpha1.IPv4SubnetType)
199199
if err != nil {
200200
log.Errorf("Could not get IPAM IP: %s", err)
201201
return nil, true

0 commit comments

Comments
 (0)