Skip to content

Commit 244742a

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

File tree

2 files changed

+9
-326
lines changed

2 files changed

+9
-326
lines changed

go.mod

+3-6
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
@@ -159,7 +158,6 @@ require (
159158
github.com/imdario/mergo v0.3.16 // indirect
160159
github.com/in-toto/in-toto-golang v0.9.0 // indirect
161160
github.com/inconshreveable/mousetrap v1.1.0 // indirect
162-
github.com/jeremywohl/flatten v1.0.1 // indirect
163161
github.com/jinzhu/inflection v1.0.0 // indirect
164162
github.com/josharian/intern v1.0.0 // indirect
165163
github.com/json-iterator/go v1.1.12 // indirect
@@ -219,7 +217,6 @@ require (
219217
github.com/sirupsen/logrus v1.9.3 // indirect
220218
github.com/sourcegraph/conc v0.3.0 // indirect
221219
github.com/spf13/cast v1.7.0 // indirect
222-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
223220
github.com/subosito/gotenv v1.6.0 // indirect
224221
github.com/theupdateframework/notary v0.7.0 // indirect
225222
github.com/tidwall/match v1.1.1 // indirect
@@ -268,9 +265,9 @@ require (
268265
k8s.io/apimachinery v0.31.2 // indirect
269266
k8s.io/client-go v0.31.2 // indirect
270267
k8s.io/klog/v2 v2.130.1 // indirect
271-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
268+
k8s.io/kube-openapi v0.0.0-20241009091222-67ed5848f094 // indirect
272269
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
273-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
270+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
274271
sigs.k8s.io/yaml v1.4.0 // indirect
275272
)
276273

0 commit comments

Comments
 (0)