Commit Graph
1025 Commits
Author SHA1 Message Date
Charlie Drage 84be7400a2 Merge pull request #846 from surajnarwade/buildv3
Added support for build key in v3
2017-11-30 09:06:32 -05:00
Charlie Drage 995dff6690 Merge pull request #868 from surajnarwade/equal_up_convert
Adding `--controller` flag in `up` & `down`
2017-11-30 09:06:13 -05:00
Suraj Narwade ada8af2410 Added functional test 2017-11-30 11:14:44 +05:30
Suraj Narwade 126d9820c4 Adding --controller flag in up & down
To make `kompose up` & `kompose convert` equal in feature, This PR will
add `--controller` flag for `kompose up` as well as `kompose down`
so that user experience will be the same for `up` & `convert`
Resolves #798

since we are adding `--controller` to `up` and `down`, So respective code to deploy and undeploy also being added for `daemonset` and `replicationcontroller`

Added tests for `--controller`
2017-11-27 15:26:24 +05:30
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
Suraj Narwade d02492ad59 Updated Makefile with respective vendor-update commands 2017-11-27 12:28:32 +05:30
Charlie Drage a194e59651 Merge pull request #875 from cdrage/update-conversion-docs
Update conversion doc for env_file
2017-11-22 12:02:27 -05:00
Charlie Drage 7496662ff3 Update conversion doc for env_file
Updates the conversion doc to indicate that we support env_file

Closes https://github.com/kubernetes/kompose/issues/873
2017-11-22 12:01:52 -05:00
Charlie Drage 999278fa0c Merge pull request #874 from cdrage/release-1.5.0
1.5.0 Release
2017-11-21 11:22:57 -05:00
Charlie Drage a2575df355 1.5.0 Release 2017-11-21 11:22:21 -05:00
Charlie Drage a567cfff4a Merge pull request #864 from cdrage/update-versions
Move version information to separate file
2017-11-21 07:40:56 -05:00
Charlie Drage d7c515b0cb Merge pull request #867 from abitrolly/master
Set PVC volume size with kompose.volume.size
2017-11-15 09:40:59 -05:00
Anatoli Babenia 1975c32740 Set service volume size with kompose.volume.size label (#235)
1. Copy labels from compose to kobject
2. If kompose.volume.size is set on service level, use it

Internal API changes:

- Add PVCSize to kobject Volumes struct
- Pass default volume size as CreatePVC() param
2017-11-12 13:05:55 +03:00
Charlie Drage b6eddd7a7d Merge pull request #862 from xianlubird/feature/ignore-links
Ignore links attribute and print warning message
2017-11-09 11:07:21 -05:00
Charlie Drage ae11eb4e65 Merge pull request #866 from abitrolly/patch-1
architecture.md  Link sources
2017-11-08 09:17:45 -05:00
Anatoli Babenia c8efd1511d architecture.md Link sources 2017-11-08 13:01:00 +02:00
xianlubird 9b66188144 Ignore links attribute and print warning message
Signed-off-by: xianlubird@gmail.com
2017-11-08 10:08:12 +08:00
Charlie Drage 0f4bfebf08 Move version information to separate file
Moves the version information to a seperate file. This is mostly due to
import cycle errors occuring when using "import
github.com/kubernetes/kompose/cmd" in order to get the global variable
of VERSION and GITCOMMIT.

Update's the Makefile and other files accordingly.

If the version and commmit is unretriveable due to not being able to
find the kompose binary, the one from pkg/version/version.go will be
used.
2017-11-07 15:28:04 -05:00
Charlie Drage fe62a96465 Merge pull request #863 from xianlubird/bug/typo
Fix typo
2017-11-07 12:16:46 -05:00
xianlubird c717cbd65d Fix typo
Signed-off-by: xianlu <xianlu.cxl@alibaba-inc.com>
2017-11-07 17:39:44 +08:00
Charlie Drage e7373ded2b Merge pull request #861 from cdrage/update-docs-toc
Add TOC to documentation, add readme.md notice
2017-11-06 13:35:43 -05:00
Charlie Drage e5b1f02b5e Add TOC to documentation, add readme.md notice
Adds TOC to architecture.md, getting-started.md, integrations.md and
user-guide.md

Updates README.md to add a notice that the files are best viewed on the
website.
2017-11-06 10:55:04 -05:00
Charlie Drage c7964e71e7 Merge pull request #858 from cdrage/release-1.4.0
1.4.0 Release
2017-10-31 16:48:12 -04:00
Charlie Drage 79b5a02729 1.4.0 Release 2017-10-31 16:47:47 -04:00
Charlie Drage 7cd0635adb Merge pull request #819 from ashetty1/issue_781
Adding documentation for tests
2017-10-26 14:00:57 -04:00
Charlie Drage 393b3929a8 Merge pull request #852 from surajnarwade/update-help
Updated `--help` page for `kompose up`
2017-10-25 13:48:22 -04:00
Suraj Narwade c7d6bc63d9 Added support for build key in v3
Resolves #636

This PR will add support for `build` in docker compose v3.
As https://github.com/docker/cli/pull/481 got merged now
2017-10-25 14:38:08 +05:30
Suraj Narwade 471578c92f Updated --help page for kompose up
This PR will add customhelp section in `kompose up --help` section,
which will show consistency in help section.
Issue reference: #842

for example,

```
$ kompose up --help
Deploy your Dockerized application to a container orchestrator. (default "kubernetes")

Usage:
  kompose up [flags]

OpenShift Flags:
      --build-branch             Specify repository branch to use for buildconfig (default is current branch name)
      --build-repo               Specify source repository for buildconfig (default is current branch's remote url
      --insecure-repository      Specify to use insecure docker repository while generating Openshift image stream object

Flags:
      --build string       Set the type of build ("local"|"build-config" (OpenShift only)|"none") (default "local")
  -h, --help               help for up
      --namespace string   Specify Namespace to deploy your application (default "default")
      --replicas int       Specify the number of replicas generated (default 1)
      --volumes string     Volumes to be generated ("persistentVolumeClaim"|"emptyDir") (default "persistentVolumeClaim")

Global Flags:
      --error-on-warning    Treat any warning as an error
  -f, --file stringArray    Specify an alternative compose file
      --provider string     Specify a provider. Kubernetes or OpenShift. (default "kubernetes")
      --suppress-warnings   Suppress all warnings
  -v, --verbose             verbose output
```
2017-10-13 18:03:33 +05:30
Charlie Drage b4bbc4dbff Merge pull request #849 from piyush1594/readme-fix
Fix Redirecting Error in README.md
2017-10-12 10:28:45 -04:00
piyush 4d30969041 Fix Redirecting Error in README.md
Setup and Quickstart file are giving 404 as they were renamed
to installation and getting-started repectively.
Renamed the same in README.md to fix redirecting.
Fixes #845
2017-10-12 14:12:08 +05:30
Charlie Drage 2fb357baa3 Merge pull request #848 from cdrage/update-site-gen
Redirects not working
2017-10-11 14:20:24 -04:00
Charlie Drage 24a85684cd Redirects not working
Due to not adding a trailing `/` redirects were not working.

For example, going to kompose.io/docs/user-guide.md will appear as
plaintext html, adding a trailing / creates an index.html in the
directory and correctly redirects the user.
2017-10-11 14:18:48 -04:00
Charlie Drage cfbc83a8ea Merge pull request #847 from piyush1594/redirecting-fixes
Fix Redirecting Error
2017-10-11 12:05:22 -04:00
piyush 5c8d831b02 Fix Redirecting Error
This wil fix the redirecting issue to quickstart in integrations.md
and to kompose installation in maven-example.md
Fixes #844
2017-10-11 20:54:50 +05:30
Anush Shetty d040121939 Adding documentation for tests 2017-10-11 19:58:53 +05:30
Charlie Drage 903acfdbbf Merge pull request #836 from piyush1594/docs-update
Added Fabric8 Maven Plugin in Integration
2017-10-10 15:57:23 -04:00
Charlie Drage 4f187a13d7 Merge pull request #843 from cdrage/release-1.3.0
1.3.0 Release
2017-10-10 15:25:37 -04:00
Charlie Drage c27bbc223c 1.3.0 Release 2017-10-10 15:24:44 -04:00
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
Piyush d0fff4c85d Added Fabric8 Maven Plugin in Integration
Fixed typo

Updated documents

Updated integrations.md and maven-example.md

Added output for commands and some minor updates

Added coomand to access service and minor updates

Fixed minor typing errors

Added screenshot of output

Added output image in image folder and minor typing errors

Fixed typo

Updated minor typos
2017-10-09 18:09:06 +05:30
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