deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity
1,160 Commits 4 Branches 1 Tag 32 MiB
04e9ee9949
Commit Graph

122 Commits

Author SHA1 Message Date
xianlubird
04e9ee9949 Fix missing attribute when convert with multiple docker-compose files 
Signed-off-by: xianlubird <xianlubird@gmail.com>
 2018-05-03 11:51:55 +08:00
Hang Yan
f3412a7399 Add headless service type label 
Also remove the relation between restart and service create
 2018-04-15 00:23:48 +08:00
Hang Yan
88b8e316b9 Support hostname and domainname 2018-03-31 12:00:37 +08:00
Charlie Drage
b5cc556308
Merge pull request #956 from hangyan/refactor-test-cmd 
Refactor tests script to uses vars
 2018-03-21 08:49:10 -04:00
Charlie Drage
442caa4359
Merge pull request #957 from hangyan/support-hostpath-volume 
Support hostpath volume
 2018-03-19 11:47:00 -04:00
Hang Yan
cf833c8818 Support hostpath volume 2018-03-16 10:40:25 +08:00
Hang Yan
6e5b6a3055 Fix deploy resources parse error 2018-03-15 14:00:17 +08:00
Hang Yan
5f38cc723e Refactor tests script to uses vars 2018-03-09 11:21:43 +08:00
Charlie Drage
a5a113d042
Merge pull request #950 from hangyan/support-old-restart-policy 
Support old restart policy in compose v3
 2018-03-07 08:41:46 -05:00
Suraj Narwade
908e3f1b59
Merge pull request #907 from caglar10ur/serviceports 
Allow services to use same port with different protocols
 2018-03-07 12:29:05 +05:30
Hang Yan
723bd0f9d8 Support old restart policy in compose v3 2018-03-07 13:35:36 +08:00
Charlie Drage
b365953266
Merge pull request #938 from hangyan/fix-helm-custom-dir 
Fix custom output and charts conflict error
 2018-02-27 10:07:39 -05:00
Hang Yan
0f3d368215 Fix cli custom output and charts conflict error 2018-02-27 16:10:35 +08:00
Hang Yan
b8f1707d30 Fix healthcheck parser nil pointer error 2018-02-09 11:10:03 +08:00
Charlie Drage
f857afad1c
Merge pull request #929 from hangyan/fix-v2compose-pvc-size-error 
Fix custom pvc size in v2 compose not working error
 2018-02-08 08:24:49 -05:00
Hang Yan
f18450d045 Fix custom pvc size in v2 compose not working error 2018-02-08 16:13:49 +08:00
Hang Yan
0ef015d3da Fix unset env bug for v3 compose 2018-02-08 15:12:16 +08:00
S.Çağlar Onur
e6ae470830 Allow services to use same port with different protocols 
kompose fails if compose file declares different protocols for the same port. eg;

...
     ports:
      - 666:666/udp
      - 666:666/tcp
...

This PR adds the port to the output and also makes sure that names are unique for each port/protocol pair.
This is supported with LoadBalancer (kubernetes/kubernetes#2995) so trying to use this config with LB panics.
 2018-01-17 11:26:03 -08:00
Charlie Drage
6b7ba44dfc
Merge pull request #900 from piyush1594/iss_kompose_down 
Added Case for Config Map in kompose down
 2018-01-04 09:11:14 -05:00
Tim Hockin
a178cf53db Convert registry to k8s.gcr.io 2017-12-22 09:55:16 -08:00
Piyush Garg
52f8f1f2b4 Added Case for Config Map in kompose down. 
To implement this, added label in
configmap object at the time of init

Fixed ConfigMap test because we are
adding one more field labels in metadata
 2017-12-22 15:44:10 +05:30
Charlie Drage
c1f18136d3
Merge pull request #896 from Code0x58/add-ingress-tls 
Add kompose.service.expose.tls-secret
 2017-12-20 10:51:04 -05:00
Charlie Drage
e6a40eb5c9
Merge pull request #805 from ashetty1/issue_770 
Script for generating unit tests
 2017-12-19 11:07:15 -05:00
Oliver Bristow
35a782024d Add kompose.service.expose.tls-secret 2017-12-18 15:56:38 +00:00
Suraj Narwade
286fbd1203 Fixed kompose build failure 
While `local` build, kompose was not recognizing `dockerfile` key
Hence it was breaking the build as mentioned in issue #832.
This PR will fix the issue.
 2017-12-01 11:15:03 +05:30
Suraj Narwade
ada8af2410 Added functional test 2017-11-30 11:14:44 +05:30
Anush Shetty
7bb67675f4 Script for generating CLI tests: 
* Made an entry in the Makefile: `make gen-cmd` will run the script now

* Added a section on adding CLI tests in development docs
 2017-10-30 14:29:18 +05:30
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
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
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
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
Charlie Drage
35166b8871 Merge pull request #816 from surajnarwade/tmpfsfix 
Fixed tmpfs with mode failure
 2017-09-26 15:24:35 -04:00
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
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
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
Shubham
4f6b92f6c8 Merge pull request #759 from cdrage/add-healthcheck 
Adds healthcheck
 2017-08-27 09:09:54 +05:30
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
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
Suraj Narwade
ec5c4d8550 Adding save command to annotation 
This command will add `kompose command` used to generate artifacts as well as `kompose version`,
for ex,

```
metadata:
    annotations:
      kompose.cmd: kompose convert -f /home/snarwade --stdout
      kompose.version: 1.0.0 (HEAD)
```

For functional test, Now each test has template like,

```
 "annotations": {
           "kompose.cmd": "%CMD%",
           "kompose.version": "%VERSION%"
```

Because, for every machine these values will be different.

Updated functional test with new annotations
 2017-08-14 12:22:33 +05:30
Suraj Narwade
641f8f8932 Added support for group_add key 
This PR will add support for `group_add` key which will map to
supplemental group in pod security context.
 2017-08-10 11:54:35 +05:30
Charlie Drage
af26b797a2 Add CPU limit, CPU Reservation and Memory Reservation 
This adds support for CPU limit, CPU reservation as well as memory
reservation.

Specifically, when using the `deploy` key in Docker Compose.
 2017-08-03 09:41:14 -04:00
Suraj Narwade
d5a5f42d8b Handling Volume at early stage 
It will resolve #544 as well as refactor volume handling part.
 2017-07-26 19:59:05 +05:30
Charlie Drage
b8d64ea336 Merge pull request #677 from cdrage/its-2017 
2016 -> 2017 for licensing
 2017-07-07 10:10:02 -04:00
Suraj Narwade
9dcb2bfba6 added support for restart-policy keys in v3 
Resolves `restart_policy` from issue #644
 2017-07-06 17:44:19 +05:30
Suraj Narwade
041d7f7d61 Added support for replicas keys in v3 
resolves #644 `replicas` key
 2017-07-04 12:40:12 +05:30
Charlie Drage
ce32bb817d 2016 -> 2017 for licensing 
New year, update to the license.
 2017-06-28 10:49:52 -04:00
Charlie Drage
cf39f78435 Merge pull request #653 from cdrage/remove-dab 
Disable dab
 2017-06-21 07:39:59 -04:00