Automatically resolving conflicts in go.mod and updating dependency v…

networkservicemesh · Sep 15, 2023 · 34d6206 · 34d6206
1 parent 936ba36
commit 34d6206
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/networkservicemesh/api v1.10.1-0.20230822145124-c4a3ece88804
 	github.com/networkservicemesh/govpp v0.0.0-20230907103511-c36dcfff5b20
 	github.com/networkservicemesh/sdk v0.5.1-0.20230915092224-d68a6f4ada08
-	github.com/networkservicemesh/sdk-k8s v0.0.0-20230915092923-b2217adabcc2
+	github.com/networkservicemesh/sdk-k8s v0.0.0-20230915092202-14a8d4d2ed08
 	github.com/networkservicemesh/sdk-sriov v0.0.0-20230801095340-7452850dc144
 	github.com/networkservicemesh/sdk-vpp v0.0.0-20230915092124-8a47f25f1d3f
 	github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb

diff --git a/go.sum b/go.sum
@@ -245,8 +245,8 @@ github.com/networkservicemesh/govpp v0.0.0-20230907103511-c36dcfff5b20 h1:6D86dV
 github.com/networkservicemesh/govpp v0.0.0-20230907103511-c36dcfff5b20/go.mod h1:uTpdzM7rhTAJG86sjt3dQcHVABUgohuZCAyGWX5Rfmo=
 github.com/networkservicemesh/sdk v0.5.1-0.20230915092224-d68a6f4ada08 h1:Lj5T688Rb7mnPixUH+F3G6vz5SHgznjw1jtqsxRDw6Y=
 github.com/networkservicemesh/sdk v0.5.1-0.20230915092224-d68a6f4ada08/go.mod h1:WrQdP/NEx+2knCVIL0X/dlAkg4y/RFvcXBhRwcz5M2Q=
-github.com/networkservicemesh/sdk-k8s v0.0.0-20230915092923-b2217adabcc2 h1:nFn+b/8NmLySNgo2SXXWIB1pfG21mMdc4AEB3BYiL3k=
-github.com/networkservicemesh/sdk-k8s v0.0.0-20230915092923-b2217adabcc2/go.mod h1:zxPvhpmLN+9/c/8a3lMnGNWDm82SZlVltsSU851Imjg=
+github.com/networkservicemesh/sdk-k8s v0.0.0-20230915092202-14a8d4d2ed08 h1:gNpPKv7gQQv0sA2+kjidjAKXTnCC8oRorQN7QMZ9vz8=
+github.com/networkservicemesh/sdk-k8s v0.0.0-20230915092202-14a8d4d2ed08/go.mod h1:tDty66dFjT8E98OM/NRl0oW2lJgTbqOnm+nhzM2EfuA=
 github.com/networkservicemesh/sdk-kernel v0.0.0-20230829144358-77e8a631e818 h1:6a6/zAj3PogXknn09mUlaf2Qvaiaph3aOGq97kIJZlM=
 github.com/networkservicemesh/sdk-kernel v0.0.0-20230829144358-77e8a631e818/go.mod h1:5INtH34Tgf9m7jJ22HI9OWptZOrG9h2eS38bavLQ2Hk=
 github.com/networkservicemesh/sdk-sriov v0.0.0-20230801095340-7452850dc144 h1:MjNd4Ka67lit27b4JgINUC7Ctp95V5pi5Q0l8Uyq/Yc=