Commit Graph

985 Commits

Author SHA1 Message Date
Charlie Drage
93bde02d5a Merge pull request #841 from cdrage/update-release-script-4
Update version number in introduction.md
2017-10-10 15:03:03 -04:00
Charlie Drage
73b760970e Update version number in introduction.md
Updates the version number in introduction.md when doing a release
2017-10-10 15:02:32 -04:00
Charlie Drage
28c8d784be Merge pull request #799 from cdrage/add-configmap
Add env_file + ConfigMaps feature to Kompose
2017-10-10 14:59:33 -04:00
Charlie Drage
28601fa6ea Update vendoring 2017-10-10 12:55:57 -04:00
Charlie Drage
f4bfe1fcb5 Add env_file + ConfigMaps feature to Kompose
When using env_file with Docker Compose, a ConfigMap will be generated

For example:

```sh
▶ ./kompose convert -f
script/test/fixtures/configmaps/docker-compose.yml
INFO Kubernetes file "redis-service.yaml" created
INFO Kubernetes file "redis-deployment.yaml" created
INFO Kubernetes file "foo-env-configmap.yaml" created
INFO Kubernetes file "bar-env-configmap.yaml" created
```

File:

```yaml
version: '3'

services:
  redis:
    image: 'bitnami/redis:latest'
    environment:
      - ALLOW_EMPTY_PASSWORD=no
    # Env file will override environment / warn!
    env_file:
      - "foo.env"
      - bar.env
    labels:
      kompose.service.type: nodeport
    ports:
      - '6379:6379'
```

To:

```yaml
apiVersion: v1
data:
  ALLOW_EMPTY_PASSWORD: "yes"
kind: ConfigMap
metadata:
  creationTimestamp: null
  name: foo-env
```

```yaml
...
      - env:
        - name: ALLOW_EMPTY_PASSWORD
          valueFrom:
            configMapKeyRef:
              key: ALLOW_EMPTY_PASSWORD
              name: foo-env
```
2017-10-10 12:40:49 -04:00
Charlie Drage
935e90febc Merge pull request #840 from cdrage/update-getting-started
Update getting started guide docs
2017-10-10 12:27:52 -04:00
Charlie Drage
b2621194c6 Merge pull request #838 from denverdino/fix-cpu-limits-and-requests
Fix the cpu limits and requests in generated deployment file
2017-10-10 12:27:20 -04:00
Charlie Drage
a61936f055 Update getting started guide docs
Updates the getting started docs to reflect the three different guides.
2017-10-10 09:02:58 -04:00
Li Yi
d283bbbcc2 Fix the cpu limits and requests in generated deployment file
Signed-off-by: Li Yi <denverdino@gmail.com>
2017-10-10 10:04:34 +08:00
Li Yi
fa5281d440 Fix the cpu limits and requests in generated deployment file
Signed-off-by: Li Yi <denverdino@gmail.com>
2017-10-09 19:22:31 +08:00
Li Yi
865373ef6c Fix the cpu limits and requests in generated deployment file
Signed-off-by: Li Yi <denverdino@gmail.com>
2017-10-09 16:57:57 +08:00
Charlie Drage
073547014c Merge pull request #813 from surajnarwade/placementv3
Added feature for `placement` key in v3
2017-10-06 10:20:33 -04:00
Charlie Drage
57cad65090 Merge pull request #835 from cdrage/resolve-logrus
Update vendoring for logrus and gojsonschema changes
2017-10-06 10:20:07 -04:00
Charlie Drage
07cfc1fe28 Merge pull request #834 from cdrage/docs-update
Add Getting Started guide, adds Minishift tutorial
2017-10-06 10:07:58 -04:00
Suraj Narwade
35198cca12 Added feature for placement key in v3
it will map `engine.labels.operatingsystem` to `beta.kubernetes.io/os` and
`node.hostname` to `kubernetes.io/hostname` and all other constraints will not be supported.
2017-10-06 12:22:14 +05:30
Charlie Drage
5605cb0e54 Add Getting Started guide, adds Minishift tutorial
Updates the getting started guide as well as introduces an
"introduction" page for Kompose.

Adds a Minishift guide as well as a general update to all documentation.
2017-10-05 09:36:53 -04:00
Charlie Drage
f42450b2e8 Merge pull request #824 from surajnarwade/build-repo
Added `--build-repo` in `kompose up`
2017-10-04 11:27:26 -04:00
Charlie Drage
c78c2743f2 Merge pull request #810 from surajnarwade/controller
Added `--controller` feature
2017-10-04 11:20:36 -04:00
Suraj Narwade
4f8babd623 Added --controller feature
Previously we used to mention controller type as `--deployment`,
`--replication-controller` or `--daemonset` as argument.
But now,
it will be like,

ex.

```
kompose convert --controller=daemonset
```
2017-10-04 12:43:45 +05:30
Suraj Narwade
6155698391 Added --build-repo in kompose up
In order to maintain symmetry between kompose up and kompose convert,
adding `--build-repo`
2017-10-03 18:54:51 +05:30
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