Skip to content

Commit

Permalink
Fix review comments, documentation
Browse files Browse the repository at this point in the history
go.mod: go version to 1.13, kubernetes version to 1.17.10
build.sh: remove GO111MODULE definition
run_uts.sh: at first cd into project directory
  • Loading branch information
eMGabriel authored and Levovar committed Mar 17, 2020
1 parent e44631b commit 5f4b79f
Show file tree
Hide file tree
Showing 6 changed files with 535 additions and 36 deletions.
6 changes: 2 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ So, you are adamant you want to contribute to our project, and maybe even alread

Keep in mind that the project is:

- written in Golang, so you will need a properly set-up Golang 1.9+ development environment
- managed by Glide, so you will need to install it on your machine (for the time being)
- written in Golang and using `go module` feature for dependency management, so you will need a properly set-up `Golang 1.12+` development environment
- build scripts depend on `docker`, to be able to run scripts locally you will have to install it on your machine

Once you have the prerequisites, fork our project, code your changes, test your contribution, then start a normal GitHub review process.

Expand All @@ -61,8 +61,6 @@ However, we require you to break-up big contributions into smaller, functionally
### Future plans
The following topics are on our mind right now, so if you are looking for topic to start with these are as good as any!

We are aiming to adopt the go module style dependency management within our project.

Being a new project, we have not yet integrated the repository to an automated CI system (like Travis).

Increasing UT coverage of existing code is alway appreciated.
Expand Down
2 changes: 1 addition & 1 deletion deployment-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ go get -d github.com/nokia/danm
cd $GOPATH/src/github.com/nokia/danm
./build_danm.sh
```
This will first build the Alpine based builder container, mount the $GOPATH/src and the $GOPATH/bin directory into it, and invoke the necessary script to build all binaries inside the container.
This will first build the Alpine based builder container, mount the $GOPATH/src, $GOPATH/bin and $GOPATH/pkg directory into it, and invoke the necessary script to build all binaries inside the container.
The builder container destroys itself once its purpose has been fulfilled.

The result will be 6, statically linked binaries put into your $GOPATH/bin directory.
Expand Down
37 changes: 31 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,20 +1,45 @@
module github.com/nokia/danm

go 1.12
go 1.13

require (
github.com/apparentlymart/go-cidr v1.0.1
github.com/containernetworking/cni v0.7.1
github.com/containernetworking/plugins v0.8.5
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/intel/multus-cni v0.0.0-20191029173424-8c76fd62e0e9
github.com/intel/multus-cni v0.0.0-20200316130803-079c853eba60
github.com/intel/sriov-cni v2.1.0+incompatible
github.com/j-keck/arping v1.0.0
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
github.com/vishvananda/netlink v1.1.1-0.20200221165523-c79a4b7b4066
k8s.io/api v0.17.3
k8s.io/apimachinery v0.17.3
k8s.io/client-go v0.17.3
k8s.io/code-generator v0.17.3
k8s.io/api v0.17.4
k8s.io/apimachinery v0.17.4
k8s.io/client-go v0.17.4
k8s.io/code-generator v0.17.4
k8s.io/kubernetes v1.14.10
)

replace (
k8s.io/api => k8s.io/api v0.17.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.4
k8s.io/apimachinery => k8s.io/apimachinery v0.17.4
k8s.io/apiserver => k8s.io/apiserver v0.17.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.4
k8s.io/client-go => k8s.io/client-go v0.17.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.4
k8s.io/code-generator => k8s.io/code-generator v0.17.4
k8s.io/component-base => k8s.io/component-base v0.17.4
k8s.io/cri-api => k8s.io/cri-api v0.17.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.4
k8s.io/kubectl => k8s.io/kubectl v0.17.4
k8s.io/kubelet => k8s.io/kubelet v0.17.4
k8s.io/kubernetes => k8s.io/kubernetes v1.17.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.4
k8s.io/metrics => k8s.io/metrics v0.17.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.4
)
Loading

0 comments on commit 5f4b79f

Please sign in to comment.