Merge 2ad79e1be1
into 4b07d2452d
This commit is contained in:
commit
120757d45e
1 changed files with 19 additions and 15 deletions
|
@ -9,17 +9,17 @@ requirements you can build a raw server binary, a local container image,
|
||||||
or push an image to a remote repository.
|
or push an image to a remote repository.
|
||||||
|
|
||||||
Build a raw server binary
|
Build a raw server binary
|
||||||
```console
|
```shell
|
||||||
$ make controller
|
$ make controller
|
||||||
```
|
```
|
||||||
|
|
||||||
Build a local container image
|
Build a local container image
|
||||||
```console
|
```shell
|
||||||
$ make container TAG=0.0 PREFIX=$USER/ingress-controller
|
$ make container TAG=0.0 PREFIX=$USER/ingress-controller
|
||||||
```
|
```
|
||||||
|
|
||||||
Push the container image to a remote repository
|
Push the container image to a remote repository
|
||||||
```console
|
```shell
|
||||||
$ make push TAG=0.0 PREFIX=$USER/ingress-controller
|
$ make push TAG=0.0 PREFIX=$USER/ingress-controller
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@ $ make push TAG=0.0 PREFIX=$USER/ingress-controller
|
||||||
The build should use dependencies in the `ingress/vendor` directory.
|
The build should use dependencies in the `ingress/vendor` directory.
|
||||||
Occasionally, you might need to update the dependencies.
|
Occasionally, you might need to update the dependencies.
|
||||||
|
|
||||||
```console
|
```shell
|
||||||
$ godep version
|
$ godep version
|
||||||
godep v74 (linux/amd64/go1.6.1)
|
godep v74 (linux/amd64/go1.6.1)
|
||||||
$ go version
|
$ go version
|
||||||
|
@ -36,12 +36,12 @@ go version go1.6.1 linux/amd64
|
||||||
```
|
```
|
||||||
|
|
||||||
This will automatically save godeps to `vendor/`
|
This will automatically save godeps to `vendor/`
|
||||||
```console
|
```shell
|
||||||
$ godep save ./...
|
$ godep save ./...
|
||||||
```
|
```
|
||||||
|
|
||||||
If you have an older version of `godep`
|
If you have an older version of `godep`
|
||||||
```console
|
```shell
|
||||||
$ go get github.com/tools/godep
|
$ go get github.com/tools/godep
|
||||||
$ cd $GOPATH/src/github.com/tools/godep
|
$ cd $GOPATH/src/github.com/tools/godep
|
||||||
$ go build -o godep *.go
|
$ go build -o godep *.go
|
||||||
|
@ -49,7 +49,7 @@ $ go build -o godep *.go
|
||||||
|
|
||||||
In general, you can follow [this guide](https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/devel/godep.md#using-godep-to-manage-dependencies)
|
In general, you can follow [this guide](https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/devel/godep.md#using-godep-to-manage-dependencies)
|
||||||
to update godeps. To update a particular dependency, eg: Kubernetes:
|
to update godeps. To update a particular dependency, eg: Kubernetes:
|
||||||
```console
|
```shell
|
||||||
cd $GOPATH/src/github.com/kubernetes/ingress
|
cd $GOPATH/src/github.com/kubernetes/ingress
|
||||||
godep restore
|
godep restore
|
||||||
go get -u github.com/kubernetes/kubernetes
|
go get -u github.com/kubernetes/kubernetes
|
||||||
|
@ -64,19 +64,23 @@ git commit
|
||||||
|
|
||||||
## Testing
|
## Testing
|
||||||
|
|
||||||
To run unittets, enter each directory in `controllers/`
|
See also [related FAQs](../faq#how-are-the-ingress-controllers-tested).
|
||||||
```console
|
|
||||||
|
### Unit tests
|
||||||
|
|
||||||
|
To run unit tests, enter each directory in `controllers/`
|
||||||
|
```shell
|
||||||
$ cd $GOPATH/src/k8s.io/ingress/controllers/gce
|
$ cd $GOPATH/src/k8s.io/ingress/controllers/gce
|
||||||
$ go test ./...
|
$ go test ./...
|
||||||
```
|
```
|
||||||
|
|
||||||
If you have access to a Kubernetes cluster, you can also run e2e tests
|
### e2e tests
|
||||||
```console
|
|
||||||
$ cd $GOPATH/src/k8s.io/kubernetes
|
|
||||||
$ ./hack/ginkgo-e2e.sh --ginkgo.focus=Ingress.* --delete-namespace-on-failure=false
|
|
||||||
```
|
|
||||||
|
|
||||||
See also [related FAQs](../faq#how-are-the-ingress-controllers-tested).
|
If you have access to a Kubernetes cluster, you can also run e2e tests
|
||||||
|
```shell
|
||||||
|
$ cd $GOPATH/src/k8s.io/kubernetes
|
||||||
|
$ go run hack/e2e.go -- -v --test --test_args="--ginkgo.focus=Ingress.* --delete-namespace-on-failure=false"
|
||||||
|
```
|
||||||
|
|
||||||
[TODO](https://github.com/kubernetes/ingress/issues/5): add instructions on running integration tests, or e2e against
|
[TODO](https://github.com/kubernetes/ingress/issues/5): add instructions on running integration tests, or e2e against
|
||||||
local-up/minikube.
|
local-up/minikube.
|
||||||
|
|
Loading…
Reference in a new issue