forked from LaconicNetwork/kompose
Merge pull request #69 from janetkuo/remove-rs-support
Remove the support for converting to Replica Sets
This commit is contained in:
Janet Kuo
GitHub
commit
52500d3895
15
README.md
15
README.md
@ -68,7 +68,7 @@ file "redis-deployment.json" created
|
||||
|
||||
## Alternate formats
|
||||
|
||||
The default `kompose` transformation will generate Kubernetes [Deployments](http://kubernetes.io/docs/user-guide/deployments/) and [Services](http://kubernetes.io/docs/user-guide/services/), in json format. You have alternative option to generate yaml with `-y`. Also, you can alternatively generate [Replication Controllers](http://kubernetes.io/docs/user-guide/replication-controller/) objects, [Deamon Sets](http://kubernetes.io/docs/admin/daemons/), [Replica Sets](http://kubernetes.io/docs/user-guide/replicasets/) or [Helm](https://github.com/helm/helm) charts.
|
||||
The default `kompose` transformation will generate Kubernetes [Deployments](http://kubernetes.io/docs/user-guide/deployments/) and [Services](http://kubernetes.io/docs/user-guide/services/), in json format. You have alternative option to generate yaml with `-y`. Also, you can alternatively generate [Replication Controllers](http://kubernetes.io/docs/user-guide/replication-controller/) objects, [Deamon Sets](http://kubernetes.io/docs/admin/daemons/), or [Helm](https://github.com/helm/helm) charts.
|
||||
|
||||
```console
|
||||
$ kompose convert
|
||||
@ -99,16 +99,6 @@ file "web-daemonset.yaml" created
|
||||
|
||||
The `*-daemonset.yaml` files contain the Daemon Set objects
|
||||
|
||||
```console
|
||||
$ kompose convert --rs -y
|
||||
file "redis-svc.yaml" created
|
||||
file "web-svc.yaml" created
|
||||
file "redis-replicaset.yaml" created
|
||||
file "web-replicaset.yaml" created
|
||||
```
|
||||
|
||||
The `*-replicaset.yaml` files contain the Replica Set objects
|
||||
|
||||
If you want to generate a Chart to be used with [Helm](https://github.com/kubernetes/helm) simply do:
|
||||
|
||||
```console
|
||||
@ -145,7 +135,7 @@ Currently `kompose` does not support the following Docker Compose options.
|
||||
|
||||
For example:
|
||||
|
||||
```
|
||||
```console
|
||||
$ cat nginx.yml
|
||||
nginx:
|
||||
image: nginx
|
||||
@ -154,6 +144,7 @@ nginx:
|
||||
cap_add:
|
||||
- ALL
|
||||
container_name: foobar
|
||||
|
||||
$ kompose convert -f nginx.yml
|
||||
WARNING: Unsupported key Build - ignoring
|
||||
WARNING: Unsupported key CapAdd - ignoring
|
||||
|
||||
@ -804,7 +804,6 @@ func loadComposeFile(file string) KomposeObject {
|
||||
type convertOptions struct {
|
||||
toStdout bool
|
||||
createD bool
|
||||
createRS bool
|
||||
createRC bool
|
||||
createDS bool
|
||||
createDeploymentConfig bool
|
||||
@ -821,7 +820,6 @@ func komposeConvert(komposeObject KomposeObject, opt convertOptions) {
|
||||
mReplicationControllers := make(map[string][]byte)
|
||||
mDeployments := make(map[string][]byte)
|
||||
mDaemonSets := make(map[string][]byte)
|
||||
mReplicaSets := make(map[string][]byte)
|
||||
// OpenShift DeploymentConfigs
|
||||
mDeploymentConfigs := make(map[string][]byte)
|
||||
|
||||
@ -839,7 +837,6 @@ func komposeConvert(komposeObject KomposeObject, opt convertOptions) {
|
||||
sc := initSC(name, service)
|
||||
dc := initDC(name, service, opt.replicas)
|
||||
ds := initDS(name, service)
|
||||
rs := initRS(name, service, opt.replicas)
|
||||
osDC := initDeploymentConfig(name, service, opt.replicas) // OpenShift DeploymentConfigs
|
||||
|
||||
// Configure the environment variables.
|
||||
@ -902,7 +899,6 @@ func komposeConvert(komposeObject KomposeObject, opt convertOptions) {
|
||||
|
||||
// Update each supported controllers
|
||||
updateController(rc, fillTemplate, fillObjectMeta)
|
||||
updateController(rs, fillTemplate, fillObjectMeta)
|
||||
updateController(dc, fillTemplate, fillObjectMeta)
|
||||
updateController(ds, fillTemplate, fillObjectMeta)
|
||||
// OpenShift DeploymentConfigs
|
||||
@ -926,12 +922,6 @@ func komposeConvert(komposeObject KomposeObject, opt convertOptions) {
|
||||
logrus.Fatalf(err.Error())
|
||||
}
|
||||
|
||||
// convert datars to json / yaml
|
||||
datars, err := transformer(rs, opt.generateYaml)
|
||||
if err != nil {
|
||||
logrus.Fatalf(err.Error())
|
||||
}
|
||||
|
||||
var datasvc []byte
|
||||
// If ports not provided in configuration we will not make service
|
||||
if len(ports) == 0 {
|
||||
@ -954,7 +944,6 @@ func komposeConvert(komposeObject KomposeObject, opt convertOptions) {
|
||||
mReplicationControllers[name] = datarc
|
||||
mDeployments[name] = datadc
|
||||
mDaemonSets[name] = datads
|
||||
mReplicaSets[name] = datars
|
||||
mDeploymentConfigs[name] = dataDeploymentConfig
|
||||
}
|
||||
|
||||
@ -977,12 +966,6 @@ func komposeConvert(komposeObject KomposeObject, opt convertOptions) {
|
||||
}
|
||||
}
|
||||
|
||||
if opt.createRS {
|
||||
for k, v := range mReplicaSets {
|
||||
print(k, "replicaset", v, opt.toStdout, opt.generateYaml, f)
|
||||
}
|
||||
}
|
||||
|
||||
if opt.createRC {
|
||||
for k, v := range mReplicationControllers {
|
||||
print(k, "rc", v, opt.toStdout, opt.generateYaml, f)
|
||||
@ -994,7 +977,7 @@ func komposeConvert(komposeObject KomposeObject, opt convertOptions) {
|
||||
}
|
||||
|
||||
if opt.createChart {
|
||||
err := generateHelm(opt.inputFile, svcnames, opt.generateYaml, opt.createD, opt.createDS, opt.createRS, opt.createRC, opt.outFile)
|
||||
err := generateHelm(opt.inputFile, svcnames, opt.generateYaml, opt.createD, opt.createDS, opt.createRC, opt.outFile)
|
||||
if err != nil {
|
||||
logrus.Fatalf("Failed to create Chart data: %s\n", err)
|
||||
}
|
||||
@ -1016,7 +999,6 @@ func Convert(c *cli.Context) {
|
||||
toStdout := c.BoolT("stdout")
|
||||
createD := c.BoolT("deployment")
|
||||
createDS := c.BoolT("daemonset")
|
||||
createRS := c.BoolT("replicaset")
|
||||
createRC := c.BoolT("replicationcontroller")
|
||||
createChart := c.BoolT("chart")
|
||||
replicas := c.Int("replicas")
|
||||
@ -1024,7 +1006,7 @@ func Convert(c *cli.Context) {
|
||||
createDeploymentConfig := c.BoolT("deploymentconfig")
|
||||
|
||||
// Create Deployment by default if no controller has be set
|
||||
if !createD && !createDS && !createRS && !createRC && !createDeploymentConfig {
|
||||
if !createD && !createDS && !createRC && !createDeploymentConfig {
|
||||
createD = true
|
||||
}
|
||||
|
||||
@ -1046,9 +1028,6 @@ func Convert(c *cli.Context) {
|
||||
if createDS {
|
||||
count++
|
||||
}
|
||||
if createRS {
|
||||
count++
|
||||
}
|
||||
if createRC {
|
||||
count++
|
||||
}
|
||||
@ -1077,7 +1056,6 @@ func Convert(c *cli.Context) {
|
||||
opt := convertOptions{
|
||||
toStdout: toStdout,
|
||||
createD: createD,
|
||||
createRS: createRS,
|
||||
createRC: createRC,
|
||||
createDS: createDS,
|
||||
createDeploymentConfig: createDeploymentConfig,
|
||||
|
||||
@ -32,7 +32,7 @@ import (
|
||||
/**
|
||||
* Generate Helm Chart configuration
|
||||
*/
|
||||
func generateHelm(filename string, svcnames []string, generateYaml, createD, createDS, createRS, createRC bool, outFile string) error {
|
||||
func generateHelm(filename string, svcnames []string, generateYaml, createD, createDS, createRC bool, outFile string) error {
|
||||
type ChartDetails struct {
|
||||
Name string
|
||||
}
|
||||
@ -115,11 +115,6 @@ home:
|
||||
return err
|
||||
}
|
||||
}
|
||||
if createRS {
|
||||
if err = cpToChart(manifestDir, svcname, "replicaset", extension); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
/* The svc file is optional */
|
||||
infile, err := ioutil.ReadFile(svcname + "-svc" + extension)
|
||||
|
||||
@ -64,10 +64,6 @@ func ConvertCommand() cli.Command {
|
||||
Name: "replicationcontroller,rc",
|
||||
Usage: "Generate a replication controller resource file",
|
||||
},
|
||||
cli.BoolFlag{
|
||||
Name: "replicaset,rs",
|
||||
Usage: "Generate a replicaset resource file",
|
||||
},
|
||||
cli.IntFlag{
|
||||
Name: "replicas",
|
||||
Value: 1,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user