Skip to content

Commit 202cdcc

Browse files
committed
Removed sigs.k8s.io/structured-merge-diff/v4
Signed-off-by: David Gannon <19214156+dgannon991@users.noreply.github.com>
1 parent 7059f2a commit 202cdcc

File tree

2 files changed

+8
-335
lines changed

2 files changed

+8
-335
lines changed

go.mod

+3-7
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ replace (
1212
// Also includes branches we haven't PR'd yet: capture-yamux-logs, context-cancellation
1313
// Tagged from v1.4.4, the porter branch
1414
github.com/hashicorp/go-plugin => github.com/getporter/go-plugin v1.4.4-porter.1
15-
16-
sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1
1715
)
1816

1917
require (
@@ -43,6 +41,7 @@ require (
4341
github.com/hashicorp/go-hclog v1.6.3
4442
github.com/hashicorp/go-multierror v1.1.1
4543
github.com/hashicorp/go-plugin v1.6.2
44+
github.com/jeremywohl/flatten v1.0.1
4645
github.com/magefile/mage v1.15.0
4746
github.com/mattn/go-colorable v0.1.13
4847
github.com/mattn/go-isatty v0.0.20
@@ -156,7 +155,6 @@ require (
156155
github.com/imdario/mergo v0.3.16 // indirect
157156
github.com/in-toto/in-toto-golang v0.9.0 // indirect
158157
github.com/inconshreveable/mousetrap v1.1.0 // indirect
159-
github.com/jeremywohl/flatten v1.0.1 // indirect
160158
github.com/jinzhu/inflection v1.0.0 // indirect
161159
github.com/josharian/intern v1.0.0 // indirect
162160
github.com/json-iterator/go v1.1.12 // indirect
@@ -194,7 +192,6 @@ require (
194192
github.com/opencontainers/selinux v1.11.1 // indirect
195193
github.com/osteele/tuesday v1.0.3 // indirect
196194
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
197-
github.com/pierrec/lz4/v4 v4.1.21 // indirect
198195
github.com/pkg/errors v0.9.1 // indirect
199196
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
200197
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -213,7 +210,6 @@ require (
213210
github.com/sirupsen/logrus v1.9.3 // indirect
214211
github.com/sourcegraph/conc v0.3.0 // indirect
215212
github.com/spf13/cast v1.7.0 // indirect
216-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
217213
github.com/subosito/gotenv v1.6.0 // indirect
218214
github.com/theupdateframework/notary v0.7.0 // indirect
219215
github.com/tidwall/match v1.1.1 // indirect
@@ -260,9 +256,9 @@ require (
260256
k8s.io/apimachinery v0.31.2 // indirect
261257
k8s.io/client-go v0.31.2 // indirect
262258
k8s.io/klog/v2 v2.130.1 // indirect
263-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
259+
k8s.io/kube-openapi v0.0.0-20241009091222-67ed5848f094 // indirect
264260
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
265-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
261+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
266262
sigs.k8s.io/yaml v1.4.0 // indirect
267263
)
268264

0 commit comments

Comments
 (0)