Commit Graph

44 Commits

Author SHA1 Message Date
Charlie Drage
63e063818a Fix failing issues with vendoring as well as compiling
Something within golang.org/x/sys messed up and it doesn't help that we
have three different projects using different versions.

This vendor update specifies a golang.org/x/sys as well as fixes the
previous compiling issues with Windows/Linux/macOS builds.

See issue:

```sh
gox -osarch="darwin/amd64 linux/amd64 linux/arm windows/amd64"
-output="bin/kompose-{{.OS}}-{{.Arch}}" -ldflags="-w -X
github.com/kubernetes/kompose/pkg/version.GITCOMMIT=42e7f0e"
Number of parallel builds: 1
-->   windows/amd64: github.com/kubernetes/kompose
-->     linux/amd64: github.com/kubernetes/kompose
-->    darwin/amd64: github.com/kubernetes/kompose
-->       linux/arm: github.com/kubernetes/kompose
1 errors occurred:
--> windows/amd64 error: exit status 2
Stderr: #
github.com/kubernetes/kompose/vendor/golang.org/x/crypto/ssh/terminal
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:42: undefined:
windows.ENABLE_ECHO_INPUT
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:42: undefined:
windows.ENABLE_PROCESSED_INPUT
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:42: undefined:
windows.ENABLE_LINE_INPUT
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:42: undefined:
windows.ENABLE_PROCESSED_OUTPUT
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:43: undefined:
windows.SetConsoleMode
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:62: undefined:
windows.SetConsoleMode
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:67: undefined:
windows.ConsoleScreenBufferInfo
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:68: undefined:
windows.GetConsoleScreenBufferInfo
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:91: undefined:
windows.ENABLE_ECHO_INPUT
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:92: undefined:
windows.ENABLE_PROCESSED_INPUT
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:92: too many
errors
```
2017-11-30 18:54:47 -05:00
Suraj Narwade
b3f2134cec Updated Vendoring 2017-11-27 12:29:12 +05:30
Suraj Narwade
5de4aa85f8 Added sirupsen and updated all occurances
Updated `sirupsen`, `docker/cli`, `docker/libcompose` in `glide`,
Also changed `Sirupsen` with `sirupsen` in all kompose packages as well as in
`docker/distribution` packages
2017-11-27 12:28:46 +05:30
Charlie Drage
28601fa6ea Update vendoring 2017-10-10 12:55:57 -04:00
Charlie Drage
43b1ca0fe0 Resolve logrus and gojsonschema vendoring conflicts
Some vendoring is blocking other PR's due to changes to logrus (Sirupsen
vs sirupsen for lower-case) as well as a non-versioned gojsonschema in
glide.yaml

This updates glide.yaml to reflect the upper-case as well as lower-case
versions of logrus as well as adds a versionized gojsonschema in order
to get rid of the following error:

```sh
▶ make bin
go build -ldflags="-w -X github.com/kubernetes/kompose/cmd.GITCOMMIT=0e56b7d" -o kompose main.go
vendor/github.com/docker/cli/cli/compose/schema/schema.go:34: cannot use portsFormatChecker literal (type portsFormatChecker) as type gojsonschema.FormatChecker in argument to gojsonschema.FormatCheckers.Add:
        portsFormatChecker does not implement gojsonschema.FormatChecker (wrong type for IsFormat method)
                have IsFormat(string) bool
                want IsFormat(interface {}) bool
vendor/github.com/docker/cli/cli/compose/schema/schema.go:35: cannot use portsFormatChecker literal (type portsFormatChecker) as type gojsonschema.FormatChecker in argument to gojsonschema.FormatCheckers.Add:
        portsFormatChecker does not implement gojsonschema.FormatChecker (wrong type for IsFormat method)
                have IsFormat(string) bool
                want IsFormat(interface {}) bool
vendor/github.com/docker/cli/cli/compose/schema/schema.go:36: cannot use durationFormatChecker literal (type durationFormatChecker) as type gojsonschema.FormatChecker in argument to gojsonschema.FormatCheckers.Add:
        durationFormatChecker does not implement gojsonschema.FormatChecker (wrong type for IsFormat method)
                have IsFormat(string) bool
                want IsFormat(interface {}) bool
vendor/github.com/docker/libcompose/config/schema_helpers.go:60: cannot use environmentFormatChecker literal (type environmentFormatChecker) as type gojsonschema.FormatChecker in argument to gojsonschema.FormatCheckers.Add:
        environmentFormatChecker does not implement gojsonschema.FormatChecker (wrong type for IsFormat method)
                have IsFormat(string) bool
                want IsFormat(interface {}) bool
vendor/github.com/docker/libcompose/config/schema_helpers.go:61: cannot use portsFormatChecker literal (type portsFormatChecker) as type gojsonschema.FormatChecker in argument to gojsonschema.FormatCheckers.Add:
        portsFormatChecker does not implement gojsonschema.FormatChecker (wrong type for IsFormat method)
                have IsFormat(string) bool
                want IsFormat(interface {}) bool
vendor/github.com/docker/libcompose/config/schema_helpers.go:62: cannot use portsFormatChecker literal (type portsFormatChecker) as type gojsonschema.FormatChecker in argument to gojsonschema.FormatCheckers.Add:
        portsFormatChecker does not implement gojsonschema.FormatChecker (wrong type for IsFormat method)
                have IsFormat(string) bool
                want IsFormat(interface {}) bool
^CMakefile:29: recipe for target 'bin' failed
make: *** [bin] Interrupt
```
2017-10-02 11:29:18 -04:00
Suraj Narwade
bd53d8b4ba Updated vendoring
Updated vendoring for getting changes from docker/cli
for build key in v3
(since docker/cli#481 is merged now)
2017-09-26 19:37:24 +05:30
Charlie Drage
ab149def6b Update vendoring for Cobra CLI fix
Updates the vendoring in order to implement the fix for MarkDeprecated
output in the CLI

See: https://github.com/spf13/cobra/pull/466

Closes https://github.com/kubernetes-incubator/kompose/issues/652
2017-06-20 14:25:02 -04:00
Suraj Narwade
d2253f1eb2 Updating Vendor
resolves #620 as libcompose PR https://github.com/docker/libcompose/pull/476
got merged.
2017-06-16 17:55:50 +05:30
Charlie Drage
e3b707c460 Update vendoring + add novln/docker-parser 2017-06-14 10:23:58 -04:00
Charlie Drage
683ae91823 Update vendoring 2017-06-07 10:23:50 -04:00
Tomas Kral
166eedfc1c
update vendor
added files required by BuildConfig reaper
2017-05-16 17:56:38 +02:00
Suraj Narwade
7f00fec328 Updated Vendoring
It resolves issues #474 and #589 which were coming from libcompose,
as well as resolves #440 and #437 partially as `group_add` & `stop_grace_period`
are supported by libcompose now.
2017-05-15 18:28:03 +05:30
Suraj Narwade
1eb162d697 Updated Vendoring 2017-04-27 21:38:38 +05:30
Charlie Drage
ecea95a2a0 Update vendoring + fix issue with timestamps being added to log
As per the vendoring here:
e9544ca894
for some odd issue, text_formatter.go in the logrus package was updated
to an older file.

This commit updates the vendoring as well as specifies a specific
version for logrus to be used.

Closes + fixes
https://github.com/kubernetes-incubator/kompose/issues/532
2017-03-31 13:58:39 -04:00
Abhishek
d212758856 vendor update 2017-03-24 00:31:39 +05:30
Shubham Minglani
e9544ca894 add github.com/pkg/errors to glide and vendor
This adds github.com/pkg/errors to glide.yaml followed
by glide and glide-vc commands. The github.com/pkg/errors
package is currently required mainly for the errors.Wrap()
and errors.New() methods, since this lets us to annotate the
errors while passing the error message up the call stack.
2017-03-15 19:41:28 +05:30
Charlie Drage
e30b5c0bc5 Update vendoring
This updates the libcompose vendoring as well as a general update to
vendoring (adds the latest git commit of libcompose).

Closes https://github.com/kubernetes-incubator/kompose/issues/426
Closes https://github.com/kubernetes-incubator/kompose/issues/471
2017-03-14 11:20:38 -04:00
Charlie Drage
d444886e2f Update vendoring
Updates vendoring to include
1c4bd4542a
as well as general update to all other packages.
2017-02-13 09:59:13 -05:00
Charlie Drage
c39e9b3cb0 Update logging for logrus 2017-01-18 09:23:52 -05:00
Shubham Minglani
5837d0ad6e bump libcompose to v0.4.0 2017-01-13 01:58:19 +05:30
Charlie Drage
57039425b6 Update vendoring as well as libcompose
This commit updates libcompose in order to merge in
https://github.com/docker/libcompose/pull/423 which affected
https://github.com/kubernetes-incubator/kompose/issues/92 by not
erroring out when an image name wasn't provided.

Closes https://github.com/kubernetes-incubator/kompose/issues/92

As well as knocks out the last required milestone for a 0.2.1 release
https://github.com/kubernetes-incubator/kompose/milestone/2
2017-01-04 13:18:07 -05:00
Ratnadeep Debnath
d4561c6f51 Updated glide dependencies
Added:
- github.com/openshift/origin/pkg/build/api/install
- github.com/openshift/origin/pkg/build/api/v1
2016-12-28 17:02:33 +05:30
Ratnadeep Debnath
1215a6366e Updated Godeps and vendors.
Added:
- github.com/openshift/origin/pkg/build/api/install
- github.com/openshift/origin/pkg/build/api/v1
2016-12-28 17:00:32 +05:30
Charlie Drage
1fdc1f648e Update vendoring 2016-12-22 09:18:22 -05:00
Shubham Minglani
7e378cd546 implement expose service, add tests, fix #140
Implements a kompose specific docker compose label "kompose.service.expose" which can be used to expose the specified services externally. The accepted values are of type string.
If the value is set to "true", the provider sets the endpoint automatically, and for any other value, the value is set as the hostname. If multiple ports are defined in a service, the first one is chosen to be the exposed.

Unit tests, functional tests, glide updates and docs have also been added in this commit for the related feature.
2016-12-21 20:00:38 +05:30
Suraj Deshmukh
10299eb5dc update vendored dependencies 2016-12-16 18:04:46 +05:30
Tomas Kral
fe679fbca6
switch from godep to glide 2016-12-07 19:57:19 +01:00
Tomas Kral
1f8a0e06c9
Upgrade OpenShift and its dependencies.
OpenShift version 1.4.0-alpha.0
2016-10-18 12:04:00 +02:00
Tomas Kral
fe53d56a01
fix golang.org/x/net vendoring 2016-10-11 10:53:11 +02:00
Tuna
592cc95907 upgrade libcompose to fbdac0a6a80837c63eb6c8f43514f7bb3f32df6c 2016-10-09 02:35:51 +02:00
Tomas Kral
6f1d01a809
OpenShift - generate DeploymentConfig with ImageStream. 2016-09-27 10:28:11 +02:00
Tomas Kral
e341adce0e
bump(github.com/docker/libcompose) v0.3.0 2016-08-22 10:51:22 +02:00
Tuna
fe9713f26e update vendoring 2016-08-05 00:31:16 +07:00
Suraj Deshmukh
934a3e1a9a Support for environment variables substitution
Now user can put environment variables in docker-compose
file and it will be read by kompose from environment

Fixes # 56
2016-07-26 12:55:23 +00:00
Tomas Kral
eef44ca57b openshift: use unversioned api 2016-07-21 20:37:50 +02:00
Tomas Kral
3db5069ff5 added OpenShifts fork of Kubernetes
reason for this is that openshift/kubernetes backported
k8s.io/kubernetes/pkg/securitycontextconstraints/util
that is currently required by something that
github.com/openshift/origin/pkg/deploy/api/v1 depends on
2016-07-21 20:37:18 +02:00
Tomas Kral
c2a07f764d update vendor with openshift 2016-07-21 20:35:15 +02:00
Tomas Kral
81744fccb4 bump(github.com/Azure/go-ansiterm) 388960b655244e76e24c75f48631564eaefade62
fixes failing windows build
2016-07-21 20:19:09 +02:00
ngtuna
3164cd8abb update vendoring dependencies 2016-07-19 17:20:46 +07:00
ngtuna
78feadc695 vendoring dependencies 2016-07-18 23:23:39 +07:00
ngtuna
f7295153f3 upgrade k8s v1.3 - fix #6, #12 2016-07-06 01:41:04 +07:00
ngtuna
1c0673a7cc fix issue #3: Print out warning for undefined fields 2016-07-05 15:03:18 +07:00
ngtuna
53802333fe downgrade urfave/cli to v1.14.0 2016-06-30 18:31:00 +00:00
ngtuna
5dd2cf81bf vendoring dependencies 2016-06-30 22:47:32 +07:00