Commit Graph

965 Commits

Author SHA1 Message Date
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
Charlie Drage
4d4cc3b017 Merge pull request #820 from surajnarwade/equal_up_convert
Adding  --build-branch to `kompose up`
2017-09-29 08:52:53 -04:00
Charlie Drage
8efe274474 Merge pull request #815 from ashetty1/fix_pr_811
Fix reference to emptyDir in OpenShift test scripts
2017-09-26 15:27:13 -04:00
Charlie Drage
35166b8871 Merge pull request #816 from surajnarwade/tmpfsfix
Fixed tmpfs with mode failure
2017-09-26 15:24:35 -04:00
Charlie Drage
d3df8d2009 Merge pull request #817 from surajnarwade/vol_validation
Fixed `--volumes` validation
2017-09-26 15:24:03 -04:00
Charlie Drage
ca496dd4ef Merge pull request #827 from surajnarwade/fixing-vet-issue
Fixed `go vet`
2017-09-26 15:18:01 -04:00
Charlie Drage
22b795250e Merge pull request #828 from surajnarwade/buildv3-vendor
Updated vendoring
2017-09-26 15:17:28 -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
Suraj Narwade
f51a7d096e Fixed go vet
Fixes #825 (since `go vet` was failing locally while doing `make test`)
2017-09-26 16:59:13 +05:30
Suraj Narwade
269f604094 Fixed --volumes validation
Now, `--volumes` argument will validate it's input, it will only allow
`persistentVolumeClaim` or `emptyDir`, otherwise it will throw an error.
2017-09-25 17:25:57 +05:30
Suraj Narwade
8a19c47b1a Fixed tmpfs with mode failure
Fixes #807
now kompose will ignore mode of tmpfs and will pass only mount path.
2017-09-25 14:44:03 +05:30
Suraj Narwade
757eac3f25 Adding --build-branch to kompose up
In order to maintain symmetry between `kompose up` and `kompose convert`,
adding `--build-branch`
2017-09-25 12:22:27 +05:30
Anush Shetty
8263958924 Fix reference to emptyDir in OpenShift test scripts:
From --volumes=empty to --volumes=emptyDir
2017-09-19 14:58:53 +05:30
Charlie Drage
99f88ef15c Merge pull request #821 from cdrage/release-1.2.0
1.2.0 Release
2017-09-18 14:39:31 -04:00
Charlie Drage
7908d73652 1.2.0 Release 2017-09-18 14:38:34 -04:00
Charlie Drage
2ed0a32915 Merge pull request #811 from ashetty1/update_os_tests
emptvols -> volumes=yes
2017-09-11 12:20:10 -04:00
Charlie Drage
cf7d0d17e3 Merge pull request #808 from cdrage/remove-redundant-strings-lower
Remove redundant strings.ToLower()
2017-09-11 10:26:37 -04:00
Anush Shetty
1d20de9c6d emptvols -> volumes=yes 2017-09-11 18:39:28 +05:30
Charlie Drage
8fddec9e74 Merge pull request #787 from cdrage/refactor-flags
Add --volumes parameter, deprecate emptyvols
2017-09-08 13:08:05 -04:00
Charlie Drage
a930ce266f Remove redundant strings.ToLower()
Removes the redundant strings.ToLower commands for GlobalProvider in
up.go, convert.go and down.go
2017-09-06 13:41:56 -04:00
Charlie Drage
cc1671aaa9 Add --volumes parameter, deprecate emptyvols
This adds the --volumes paramater with a "generate" and "empty"

By default, "generate" will be used as a place-holder for "true".
Although not used in the code, we will eventually add "none"

This uses CLI paramater naming processes (no emptyVols as that is Go /
Kubernetes specific) and thus we use dashes.
2017-09-05 11:39:57 -04:00
Charlie Drage
36652f6d81 Merge pull request #804 from cdrage/release-1.1.0
1.1.0 Release
2017-08-30 11:45:24 -04:00
Charlie Drage
e555d111a5 1.1.0 Release 2017-08-30 11:38:56 -04:00
Charlie Drage
0f098a2c3a Merge pull request #802 from ashetty1/deploy_tests
Adding OpenShift tests for deploy keys
2017-08-30 10:00:29 -04:00
Anush Shetty
f75ae94ec4 Adding tests for deploy keys 2017-08-30 17:11:40 +05:30
Charlie Drage
5f89e1a9ab Merge pull request #780 from cdrage/update-dev-guide
Update the dev guide with CI details
2017-08-29 09:25:58 -04:00
Charlie Drage
ccb2464526 Merge pull request #642 from ashetty1/v3_tests
OpenShift tests for docker compose v3
2017-08-29 09:12:40 -04:00
Shubham
31765588ae Merge pull request #800 from cdrage/fix-help-putput
Fixes output of help template
2017-08-29 12:05:51 +05:30
Charlie Drage
44ef89b0ec Fixes output of help template
Fixes the issue of the help output not ouputting all commands due to the
wrong function being used within spf13/cobra.

Closes https://github.com/spf13/cobra/issues/512
Closes https://github.com/kubernetes/kompose/issues/744
2017-08-28 11:25:04 -04:00
Charlie Drage
59c36d92be Merge pull request #796 from cdrage/little-x
Update to lowercase in conversion.md
2017-08-28 10:51:24 -04:00
Charlie Drage
b1f234154a Update to lowercase in conversion.md
Makes the table a little less clustered with lowercase abbreviations.
2017-08-28 10:50:40 -04:00
Shubham
4f6b92f6c8 Merge pull request #759 from cdrage/add-healthcheck
Adds healthcheck
2017-08-27 09:09:54 +05:30
Charlie Drage
8e6a148dc6 Merge pull request #785 from cdrage/add-bintray
Add Bintray documentation to README and installation doc
2017-08-25 15:29:03 -04:00
Charlie Drage
fd674e272d Merge pull request #797 from JadCham/patch-2
Fix kompose docker container wrong href
2017-08-25 15:28:46 -04:00
Jad Chamoun
188edeaf48 Fix kompose docker container wrong href
The link was pointing to komposeui instead of kompose-docker
2017-08-25 12:18:32 -07:00
Charlie Drage
01f7eb5fbe Merge pull request #795 from surajnarwade/functial-test-for-examples
Added functional test for docker compose files in Example directory
2017-08-25 10:34:35 -04:00
Charlie Drage
22b7a06d5f Merge pull request #794 from rupalibehera/pipeline
changing the organisation from kubernetes-incubator to kubernetes
2017-08-25 10:13:04 -04:00
Charlie Drage
912f1feed2 Add Bintray documentation to README and installation doc
Adds information on nightly builds to the README and installation
document.
2017-08-25 10:08:55 -04:00
Charlie Drage
2e99b8fd3a Adds healthcheck
This PR adds support for HealthCheck, being able to supply, for example:

```yaml
version: "3"

services:
  redis:
    image: redis
    healthcheck:
      test: echo "hello world"
      interval: 10s
      timeout: 1s
      retries: 5
```

Which is then converted to:

```yaml
spec:
  containers:
  - image: redis
    livenessProbe:
      exec:
        command:
        - echo "hello world"
      failureThreshold: 5
      periodSeconds: 10
      timeoutSeconds: 1
    name: redis
    resources: {}
  restartPolicy: Always
```

At the moment, this only supports livenessProbe, with support for readinessProbe in the future.
2017-08-25 10:02:51 -04:00
Suraj Narwade
8b952abe29 Added functional test for docker compose files in Example directory
Fixes #793
2017-08-24 17:09:51 +05:30
Rupali Behera
1a263a8cdf changing the organisation from kubernetes-incubator to kubernetes 2017-08-24 15:20:44 +05:30
Tomas Kral
2ff2d38ed1 Merge pull request #771 from cdrage/add-global
Add deploy: mode: global support
2017-08-24 07:53:20 +02:00
Charlie Drage
bd6d493cef Add deploy: mode: global support
Adds support for deploy: mode.

For example:

```yaml
version: "3"

services:
  foo:
    deploy:
      resources:
        mode: global
        replicas: 6
    image: redis
```

Will only generate replicas: 1 in Kubernetes pods as "global" limits
replicas to only one.
2017-08-23 12:47:27 -04:00
Charlie Drage
6a1d18c744 Update the dev guide with CI details
Updates the development.md doc with details on what CI's we use.
2017-08-23 12:11:06 -04:00
Tomas Kral
d675e0a61b Merge pull request #786 from cdrage/fix-minor-help-usage
Fix minor help output
2017-08-22 08:49:05 +02:00
Tomas Kral
7dadf002aa Merge pull request #777 from cdrage/remove-dab-examples
Remove dab examples
2017-08-22 08:48:42 +02:00
Tomas Kral
b9020f039d Merge pull request #779 from cdrage/conversion-matrix
Update conversion matrix with windows notes
2017-08-22 08:47:08 +02:00
Charlie Drage
efcc64511a Fix minor help output
Fixes the minor help output for --build (removes the space)
2017-08-21 15:15:13 -04:00
Charlie Drage
faa844a733 Merge pull request #784 from Rajadeepan/Rajadeepan-patch-1
Fix minor typo in comment
2017-08-21 14:22:29 -04:00
Rajadeepan D Ramesh
d1d9a045af Fix minor typo in comment
Fix minor typo in comment
2017-08-21 23:40:05 +05:30