Merge pull request #96317 from Jefftree/test-ssa

Integrate defaults marker to defaulter-gen Kubernetes-commit: 05d1b94a701d807666b40665f5728e0cc5f92054
kubernetes · Nov 14, 2020 · 859536f · 859536f
1 parent e8cd3b1
commit 859536f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/go.mod b/go.mod
@@ -38,5 +38,3 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.0.2
 	sigs.k8s.io/yaml v1.2.0
 )
-
-replace k8s.io/apimachinery => ../apimachinery