Skip to content

Commit

Permalink
Remove temporary replace directive for cnirpc
Browse files Browse the repository at this point in the history 
The replace directive was needed because the import of cnirpc from
pillar and the cnirpc package itself were part of the same PR.
Now that cnirpc is merged, we can reference it normally by the github
path and the commit ID.

Signed-off-by: Milan Lenco <milan@zededa.com>
  • Loading branch information
@milan-zededa @rouming
milan-zededa authored and rouming committed Apr 3, 2024
1 parent c73ed7a commit 8ff4729
Show file tree
Hide file tree
Showing 4 changed files with 211 additions and 6 deletions.
5 changes: 1 addition & 4 deletions pkg/pillar/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ require (
github.com/lf-edge/edge-containers v0.0.0-20240207093504-5dfda0619b80
github.com/lf-edge/eve-api/go v0.0.0-20240229195728-6180247abbc1
github.com/lf-edge/eve-libs v0.0.0-20240207103937-2c1dfb073c07
github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-00010101000000-000000000000
github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d
github.com/lf-edge/go-qemu v0.0.0-20231121152149-4c467eda0c56
github.com/linuxkit/linuxkit/src/cmd/linuxkit v0.0.0-20240205114432-657b33805ef1
github.com/miekg/dns v1.1.43
Expand Down Expand Up @@ -213,6 +213,3 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

// TODO: Remove the replace directive once cnirpc is merged.
replace github.com/lf-edge/eve/pkg/kube/cnirpc => ../kube/cnirpc
2 changes: 2 additions & 0 deletions pkg/pillar/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1458,6 +1458,8 @@ github.com/lf-edge/eve-api/go v0.0.0-20240229195728-6180247abbc1 h1:zLZ778WcW/ab
github.com/lf-edge/eve-api/go v0.0.0-20240229195728-6180247abbc1/go.mod h1:6XqpOM8p1HsluNIGw2ihYPYsaAisQ5CuJpbIKHXQo5w=
github.com/lf-edge/eve-libs v0.0.0-20240207103937-2c1dfb073c07 h1:ujraUvdScxfIzzuqD324iZgeR7TtA0OUsrJay+WtxLA=
github.com/lf-edge/eve-libs v0.0.0-20240207103937-2c1dfb073c07/go.mod h1:vujNUs0RNVJ8qscqiUhYPRRjeIkfLV1kAcAwAzUnCq0=
github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d h1:tUBb9M6u42LXwHAYHyh22wJeUUQlTpDkXwRXalpRqbo=
github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d/go.mod h1:Nn3juMJJ1G8dyHOebdZyS4jOB/fuxAd5fIajBaWjHr8=
github.com/lf-edge/go-qemu v0.0.0-20231121152149-4c467eda0c56 h1:LmFp0jbNSwPLuxJA+nQ+mMQrQ53ESkvHP4CVMqR0zrY=
github.com/lf-edge/go-qemu v0.0.0-20231121152149-4c467eda0c56/go.mod h1:Z1YRCAzPvFSjlmUGeVXQcMhGMajnD5hbcxob0ff/2tY=
github.com/linuxkit/linuxkit/src/cmd/linuxkit v0.0.0-20240205114432-657b33805ef1 h1:wG7qsHX4XqabEfbNyXu/8yuOTfq8cNoKZjbQ17T7WuI=
Expand Down
207 changes: 207 additions & 0 deletions pkg/pillar/vendor/github.com/lf-edge/eve/pkg/kube/cnirpc/LICENSE
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions pkg/pillar/vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ github.com/lf-edge/eve-libs/zedUpload/httputil
github.com/lf-edge/eve-libs/zedUpload/ociutil
github.com/lf-edge/eve-libs/zedUpload/sftputil
github.com/lf-edge/eve-libs/zedUpload/types
# github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-00010101000000-000000000000 => ../kube/cnirpc
# github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d
## explicit; go 1.20
github.com/lf-edge/eve/pkg/kube/cnirpc
# github.com/lf-edge/go-qemu v0.0.0-20231121152149-4c467eda0c56
Expand Down Expand Up @@ -1502,4 +1502,3 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.3.0
## explicit; go 1.12
sigs.k8s.io/yaml
# github.com/lf-edge/eve/pkg/kube/cnirpc => ../kube/cnirpc

0 comments on commit 8ff4729

Please sign in to comment.