Skip to content

Commit

Permalink
Update golang packages and fix travis build (#12)
Browse files Browse the repository at this point in the history
* Update go packages

* Fix travis release build

* Remove UpdateNamespace field

* Update README.md
  • Loading branch information
kairen authored Jan 23, 2019
1 parent 28cf580 commit 4cdaf1b
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ script:
after_success:
- bash <(curl -s https://codecov.io/bash)
- |
if [[ "$TRAVIS_BRANCH" == "master" ]]; then
if [[ "$TRAVIS_BRANCH" == release-* ]]; then
# Log into Docker Hub.
docker login -u="$DOCKER_USER" -p="$DOCKER_PASSWORD"
make build_image
Expand Down
24 changes: 12 additions & 12 deletions Gopkg.lock

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

6 changes: 5 additions & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@
name = "github.com/inwinstack/operator-kit"
branch = "v1.11.0"

[[constraint]]
name = "github.com/stretchr/testify"
version = "1.3.0"

[[constraint]]
name = "github.com/inwinstack/blended"
version = "v0.5.2"
version = "v0.6.0"

[prune]
go-tests = true
Expand Down
15 changes: 15 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
# PA Kubernetes Service Syncker
The PA Service Syncker for Kubernetes provides automation synchronizing definitions for Kubernetes services to set the PA NAT, Security, and Service.

### Requirements
The PA Service Syncker depend on [IPAM](https://github.com/inwinstack/ipam) and [PA Controller](https://github.com/inwinstack/pa-controller).

#### Compatibility Matrix

| PA Controller version | 0.6.x | 0.5.x |
|-----------------------|-------|-------|
| 0.6.x | Y | Y |
| 0.5.x | Y | Y |

| IPAM version | 0.6.x | 0.5.x |
|--------------|-------|-------|
| 0.6.x | Y | Y |
| 0.5.x | Y | Y |

## Building from Source
Clone repo into your go path under `$GOPATH/src`:
```sh
Expand Down
3 changes: 1 addition & 2 deletions pkg/k8sutil/ip.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ func newIP(name, namespace, poolName string) *inwinv1.IP {
Namespace: namespace,
},
Spec: inwinv1.IPSpec{
PoolName: poolName,
UpdateNamespace: false,
PoolName: poolName,
},
}
}
Expand Down
3 changes: 1 addition & 2 deletions pkg/operator/service/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ func TestController(t *testing.T) {
Namespace: "default",
},
Spec: inwinv1.IPSpec{
PoolName: "internet",
UpdateNamespace: false,
PoolName: "internet",
},
Status: inwinv1.IPStatus{
Phase: inwinv1.IPActive,
Expand Down

0 comments on commit 4cdaf1b

Please sign in to comment.