Skip to content

Commit 77b866e

Browse files
committed
chore(deps): bump all with hack for sigs.k8s.io/structured-merge-diff/v4 breakage
1 parent b22f5be commit 77b866e

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

go.mod

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.2
55
require (
66
github.com/go-logr/logr v1.4.2
77
github.com/google/go-github/v66 v66.0.0
8-
github.com/isometry/ghait v0.1.1
8+
github.com/isometry/ghait v0.1.2
99
github.com/onsi/ginkgo/v2 v2.21.0
1010
github.com/onsi/gomega v1.35.1
1111
github.com/spf13/viper v1.19.0
@@ -135,11 +135,19 @@ require (
135135
gopkg.in/yaml.v3 v3.0.1 // indirect
136136
k8s.io/apiextensions-apiserver v0.31.2 // indirect
137137
k8s.io/klog/v2 v2.130.1 // indirect
138-
k8s.io/kube-openapi v0.0.0-20241009091222-67ed5848f094 // indirect
138+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
139139
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 // indirect
140140
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
141-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
141+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
142142
sigs.k8s.io/yaml v1.4.0 // indirect
143143
)
144144

145-
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16
145+
replace (
146+
github.com/imdario/mergo => github.com/imdario/mergo v0.3.16
147+
// Workaround upstream incompatibility introduced in kubernetes-sigs/structured-merge-diff#265
148+
// Should be resolved with release of Kubernetes 1.32.0
149+
// # k8s.io/apimachinery/pkg/util/managedfields/internal
150+
// ../../../go/pkg/mod/k8s.io/[email protected]/pkg/util/managedfields/internal/structuredmerge.go:56:4: unknown field IgnoredFields in struct literal of type merge.Updater
151+
// ../../../go/pkg/mod/k8s.io/[email protected]/pkg/util/managedfields/internal/structuredmerge.go:73:4: unknown field IgnoredFields in struct literal of type merge.Updater
152+
sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1
153+
)

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ github.com/hashicorp/vault/api v1.15.0 h1:O24FYQCWwhwKnF7CuSqP30S51rTV7vz1iACXE/
174174
github.com/hashicorp/vault/api v1.15.0/go.mod h1:+5YTO09JGn0u+b6ySD/LLVf8WkJCPLAL2Vkmrn2+CM8=
175175
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
176176
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
177-
github.com/isometry/ghait v0.1.1 h1:KubE1CQ1/msXuMGrXduH/S84gpYEQx562ZDUq8LVP9I=
178-
github.com/isometry/ghait v0.1.1/go.mod h1:ejrJ0CzNNKBI6GEWyRp+AV0EcpLHztYdsxyjPQ/kWvw=
177+
github.com/isometry/ghait v0.1.2 h1:DLg+XDyWyznYZPqtPMifY07z2NFQ1XCavUx9nPLUwwI=
178+
github.com/isometry/ghait v0.1.2/go.mod h1:/NivBRm7gvIHpoPi8IHrkfZ+1wP+Ihc4s0Mjcu2+CfE=
179179
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
180180
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
181181
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -404,8 +404,8 @@ k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc=
404404
k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs=
405405
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
406406
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
407-
k8s.io/kube-openapi v0.0.0-20241009091222-67ed5848f094 h1:MErs8YA0abvOqJ8gIupA1Tz6PKXYUw34XsGlA7uSL1k=
408-
k8s.io/kube-openapi v0.0.0-20241009091222-67ed5848f094/go.mod h1:7ioBJr1A6igWjsR2fxq2EZ0mlMwYLejazSIc2bzMp2U=
407+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
408+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
409409
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 h1:jGnCPejIetjiy2gqaJ5V0NLwTpF4wbQ6cZIItJCSHno=
410410
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
411411
sigs.k8s.io/controller-runtime v0.19.1 h1:Son+Q40+Be3QWb+niBXAg2vFiYWolDjjRfO8hn/cxOk=

0 commit comments

Comments
 (0)