Skip to content

Commit

Permalink
fix Gopkg.toml dependencies -> constraint
Browse files Browse the repository at this point in the history
  • Loading branch information
ghostec committed Nov 7, 2017
1 parent b6ffa0a commit 7b97f0f
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 44 deletions.
18 changes: 13 additions & 5 deletions Gopkg.lock

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

46 changes: 9 additions & 37 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

## Dependencies define constraints on dependent projects. They are respected by
## dep whether coming from the Gopkg.toml of the current project or a dependency.
# [[dependencies]]
# [[constraint]]
## Required: the root import path of the project being constrained.
# name = "github.com/user/project"
#
Expand All @@ -27,8 +27,8 @@
## Optional: an alternate location (URL or import path) for the project's source.
# source = "https://github.com/myfork/package.git"

## Overrides have the same structure as [[dependencies]], but supercede all
## [[dependencies]] declarations from all projects. Only the current project's
## Overrides have the same structure as [[constraint]], but supercede all
## [[constraint]] declarations from all projects. Only the current project's
## [[overrides]] are applied.
##
## Overrides are a sledgehammer. Use them only as a last resort.
Expand All @@ -49,42 +49,14 @@
## what source location any dependent projects specify.
# source = "https://github.com/myfork/package.git"

[[dependencies]]
branch = "master"
name = "github.com/lib/pq"

[[dependencies]]
branch = "master"
name = "github.com/onsi/ginkgo"

[[dependencies]]
branch = "master"
name = "github.com/onsi/gomega"

[[dependencies]]
branch = "master"
name = "github.com/spf13/cobra"

[[dependencies]]
branch = "master"
name = "github.com/spf13/viper"

[[dependencies]]
branch = "v2"
name = "gopkg.in/yaml.v2"
[[constraint]]
name = "k8s.io/client-go"
version = "=3.0.0-beta.0"

[[dependencies]]
[[override]]
name = "k8s.io/apimachinery"
revision = "75b8dd260ef0469d96d578705a87cffd0e09dab8"

[[dependencies]]
name = "k8s.io/client-go"
version = "v3.0.0-beta.0"

[[dependencies]]
version = "=v3.1.4"
[[constraint]]
name = "github.com/topfreegames/extensions"

[[dependencies]]
name = "github.com/go-redis/redis"
version = "v6.3.1"
version = "=v3.1.4"
2 changes: 1 addition & 1 deletion helm/charts/maestro/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: maestro
home: https://github.com/topfreegames/maestro
description: Maestro api and worker
version: 4.4.4
version: 4.4.5
maintainers:
- name: TFGCo
email: backend@tfgco.com
2 changes: 1 addition & 1 deletion metadata/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
package metadata

//Version of Maestro
var Version = "4.4.4"
var Version = "4.4.5"

//KubeVersion is the desired Kubernetes version
var KubeVersion = "v1.7.5"

0 comments on commit 7b97f0f

Please sign in to comment.