Commit Graph

119 Commits

Author SHA1 Message Date
Hang Yan
4f34ff25ae Fix typo in cli help message 2018-02-07 11:12:30 +08:00
adolphlwq
678103831a provide more details for building 2018-02-01 17:46:37 +08:00
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
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
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
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
79b5a02729 1.4.0 Release 2017-10-31 16:47:47 -04:00
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
c27bbc223c 1.3.0 Release 2017-10-10 15:24:44 -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
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
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
Charlie Drage
7908d73652 1.2.0 Release 2017-09-18 14:38:34 -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
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
e555d111a5 1.1.0 Release 2017-08-30 11:38:56 -04:00
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
efcc64511a Fix minor help output
Fixes the minor help output for --build (removes the space)
2017-08-21 15:15:13 -04:00
Rajadeepan D Ramesh
d1d9a045af Fix minor typo in comment
Fix minor typo in comment
2017-08-21 23:40:05 +05:30
Charlie Drage
90a89b6826 1.0.0 Release 2017-07-20 11:54:54 -04:00
Charlie Drage
796313f626 Merge pull request #704 from cdrage/graduate-from-incubator
kubernetes-incubator -> kubernetes
2017-07-12 16:49:55 -04:00
Charlie Drage
787b7d9261 kubernetes-incubator -> kubernetes
Today, we graduate from the incubator, thus all links are updates from
kubernetes-incubator to kubernetes
2017-07-12 15:42:13 -04:00
Shubham Minglani
0a9e2a7885 remove unused parameter from ValidateComposeFile()
In pkg/app/app.go, the function ValidateComposeFile() has an
unused parameter "cmd *cobra.Command".

This commit removes that parameter from the function and the
callers of the function.
2017-07-12 14:45:52 +05:30
Charlie Drage
52b11e505a Merge pull request #682 from surajnarwade/sanity_check_fix
Remove empty if branch
2017-07-07 10:10:34 -04:00
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
8336b6526f Remove empty if branch
This PR will remove empty `if` branch which is of no use now as
this logic is being done in if statements which are written further.
2017-07-07 12:01:20 +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
b8a46895a6 Disable DAB
See issue: https://github.com/kubernetes-incubator/kompose/issues/390

Disable DAB as it is hard to maintain / not much usage / DAB is still
experimental in Docker and there hasn't been much movement:
https://github.com/moby/moby/issues/26876

MarkDeprecated does not work at the moment due to issue:
https://github.com/kubernetes-incubator/kompose/issues/652

However, that is not a blocker as we `fatalF` within `ValidateFlags`
2017-06-20 09:02:53 -04:00
Charlie Drage
e2f9084003 Adds both build and push support
This adds support for building and pushing docker containers
when you perform either `kompose convert` or `kompose up`.

Docker Compose files who have build parameters with their respective
image and build keys will automatically be both built and pushed.
2017-06-14 10:19:12 -04:00
Charlie Drage
4da352210c 0.7.0 Release 2017-05-25 12:05:54 -04:00
Charlie Drage
1cacfddf1a Update kompose completion
Updates Kompose completion with neutral language (using shell instead of
bash).

Fixes the indentation issues when outputting `kompose completion --help`
2017-05-19 10:27:11 -04:00
Charlie Drage
0bc69a487f 0.6.0 Release 2017-04-28 09:46:54 -04:00
Abhishek
f41985a00e Added support for different namespaces
Now we can deploy application in different namespaces using the "--namespace=<value>" flag with kompose up and kompose down. The --namepace flag will deploy the application in that particular "namespace" if exist."
2017-04-12 18:40:32 +05:30
Tomas Kral
1c789c5a93 Merge pull request #523 from cdrage/remove-unused-flags-from-down
Remove unused parameters from Kompose down
2017-04-11 10:20:23 +02:00
qujinping
3919ad25b5 Support insecure registry and enhance parsing of image stream tag 2017-04-07 10:01:46 +08:00
Charlie Drage
3c870ffa86 0.5.0 Release 2017-04-04 12:24:27 -04:00
Tomas Kral
f5e3985405 Merge pull request #524 from cdrage/fix-typo
Fix typo in replicas and organize flags
2017-04-03 14:58:19 +02:00
Charlie Drage
c74d8a5981 Fix typo in replicas and organize flags
Fixes a typo in the `--replicas` command as well as changes up some
grammar and moves the 'markashidden' flag values elsewhere.
2017-03-29 09:24:58 -04:00
Charlie Drage
12a6a0b1f1 Remove unused parameters from Kompose down
Remove --replicas and --emptyvols from Kompose down
2017-03-29 09:21:15 -04:00
Tomas Kral
41be9467fa Merge pull request #515 from cdrage/fix-spelling-error
Fix the DAB spelling error
2017-03-28 22:03:04 +02:00
Suraj Narwade
a7e459ce05 Removing unused variable from convert.go
Fixes #513
removed `ConvertSource` and `ConvertBuildConfig`, since they are no longer used.
2017-03-28 16:18:02 +05:30
Charlie Drage
1298b57620 Fix the DAB spelling error
It's Distributed Application Bundle (DAB).
2017-03-27 10:48:13 -04:00
Charlie Drage
d4fd8cbebb 0.4.0 Release 2017-03-21 14:48:27 -04:00
Charlie Drage
c0043ebd11 Clean up logrus
Replaces "log" from "logrus" as commonly used in large Go projects.

Makes it easier from a developer perspective to use `log.Info`,
`log.Debug`, etc.
2017-02-27 10:53:24 -05:00
Charlie Drage
10cff91295 121011e Release 2017-02-24 09:45:28 -05:00
Suraj Deshmukh
0bc24d5ca6 normalize docker-compose service that has name with underscore
kubernetes or openshift does not allow underscores in the object
names, while docker-compose does, in this commit the code has been
added to convert underscores to hypens.
2017-02-14 17:39:42 +05:30
Tomas Kral
18955c63d4
fix passing gitcommit in version output 2017-02-11 17:05:08 +01:00
Charlie Drage
8bf06407ba Merge pull request #368 from procrypt/yaml_and_yml
added support for docker-compose.yaml besides docker-compose.yml
2017-01-30 09:21:33 -05:00
Abhishek
1ecd32a362 error out if controller object is specified with "restart: on-failure" 2017-01-30 17:52:36 +05:30
Charlie Drage
c20ce2f088 0.2.0 Release 2017-01-27 15:36:17 -05:00
Abhishek
96a0572f50 added support for docker-compose.yaml besides docker-compose.yml 2017-01-23 13:30:33 +05:30
Tomas Kral
99c1a79fbd Merge pull request #383 from cdrage/clean-up-logging
Update logging for logrus
2017-01-19 18:37:25 +01:00
Charlie Drage
94a9f88521 Merge pull request #370 from cdrage/add-autocompletion
Add bash auto completion support
2017-01-19 10:04:56 -05:00
Charlie Drage
1b8a229b5a Disables timestamp with logging
This commit disables the timestamp when outputting logs in order to be
more clean / concise.

One of the reasons being that the kompose up / convert / down commands
are *too fast* and thus output's all [0000].

For example, the output will look like this:
INFO I'm a little teapot

Instead of:
INFO[0000] I'm a little teapot
2017-01-18 09:23:52 -05:00
Charlie Drage
a58cd69d0d Add bash auto completion support
Adds auto completion support that's generated via:
```
$ kompose complete
```

This file is added to /etc/bash_completion.d/kompose.sh
2017-01-17 14:06:30 -05:00
Tomas Kral
4f176b847e
fix golint errors 2017-01-05 10:31:11 +01:00
Abhishek
cfcbfa8c6d make default kompose conversion YAML 2017-01-04 12:50:56 +05:30
Abhishek
a5a3805760 added support for multiple-compose files 2017-01-03 17:18:34 +05:30
Ratnadeep Debnath
7c959b65d4 Fixed typos in openshift buildconfig
- spelling mistake
- pass compose file dir instead of compose file to initBuildConfig call
- Use as default value for cli --build-branch option
- Pass current build branch to buildconfig related functions instead of opt.BuildBranch
- Fix printing buildconfig source branch in logs.
2016-12-28 19:23:37 +05:30
Ratnadeep Debnath
a1797a8d07 In buildconfig, detect current branch and it's remote url as defaults. 2016-12-28 17:00:33 +05:30
Ratnadeep Debnath
6f3e670af1 Refactor openshift buildconfig CLI options.
- Remove --buildconfig, -bc option. Create buildconfig if service has build info
- Rename --branch to --build-branch
- Rename --repo to --build-repo
2016-12-28 17:00:33 +05:30
Ratnadeep Debnath
fa724fe12d Allow specifying repo,branch info for buildconfig over CLI. 2016-12-28 17:00:33 +05:30
Ratnadeep Debnath
92b6678d1b Initial implementation of BuildConfig support for Openshift provider. 2016-12-28 17:00:32 +05:30
Suraj Deshmukh
5625a97833 Flag validation called on up and down
On kompose up and kompose down flag validation
was done which is validating flags that are not there
in kompose up and kompose down
2016-12-27 15:59:07 +05:30
Charlie Drage
1b9228e696 Switch to spf13/cobra from urfave/cli
There's A LOT happening in this commit, so here's an outline:

First off, urfave/cli has been removed in favour of spf13/cobra. With
this, comes changes to the formatting as well as the help page for
Kompose.

Upon converting, I noticed a CLI flag was NOT appearing for OpenShift.
Specifically, --deploymentconfig. This has been added with a note
that says it is OpenShift only.

Exit codes have been fixed. If the conversion / down / up fails for
any reason, Kompose will exit with Code 1.

--verbose as well as --suppress-warnings can now be set at the
same time.

app_test.go in the cli directory has been moved to pkg/transformer
to better reflect the testing coverage.

version.go has been removed and converted to it's own CLI command in
conjuction with (most) Go software. A new CLI command has been
created. kompose version

--dab isn't a conventional way for short-form CLI paramters. This
has been shortened to -b for bundle.

CLI flags consisting of only two/three letters have been removed due to
it being unconventional for CLI. For example, --dc was removed in preference
for --deploymentconfig

--replicas has been added as an option when using kompose down or
kompose up. This has been added as previously in app.go the
replica amount was hard-coded as 1.

Differentiating names have been used for flags. For example,
persistent flags use the name Global (ex. GlobalOut). Command-specific
flags have their own names (ex. UpOpt).

Closes #239 #253
2016-12-22 08:15:51 -05:00