deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

adding replicas to --rc, it's going to be kompose convert --rc <replica>. Close #15

Browse Source
This commit is contained in:
ngtuna 2016-07-14 02:10:00 +07:00
parent e5af4ed2a8
commit a2ae1c3990
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cli/app/app.go
View File

@ -259,7 +259,7 @@ func createOutFile(out string) *os.File {
}
// Init RC object
func initRC(name string, service *project.ServiceConfig) *api.ReplicationController {
func initRC(name string, service *project.ServiceConfig, replicas int) *api.ReplicationController {
rc := &api.ReplicationController{
TypeMeta: unversioned.TypeMeta{
Kind: "ReplicationController",
@ -270,7 +270,7 @@ func initRC(name string, service *project.ServiceConfig) *api.ReplicationControl
//Labels: map[string]string{"service": name},
},
Spec: api.ReplicationControllerSpec{
Replicas: 1,
Replicas: int32(replicas),
Selector: map[string]string{"service": name},
Template: &api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
@ -563,11 +563,11 @@ func ProjectKuberConvert(p *project.Project, c *cli.Context) {
createDS := c.BoolT("daemonset")
createRS := c.BoolT("replicaset")
createChart := c.BoolT("chart")
createRC := c.BoolT("replicationcontroller")
replicas := c.Int("replicationcontroller")
singleOutput := len(outFile) != 0 || toStdout
// Create Deployment by default if no controller has be set
if !createD && !createDS && !createRS && !createRC {
if !createD && !createDS && !createRS && replicas == 0 {
createD = true
}
@ -589,7 +589,7 @@ func ProjectKuberConvert(p *project.Project, c *cli.Context) {
if createRS {
count++
}
if createRC {
if (replicas != 0) {
count++
}
if count > 1 {
@ -625,7 +625,7 @@ func ProjectKuberConvert(p *project.Project, c *cli.Context) {
checkUnsupportedKey(*service)
rc := initRC(name, service)
rc := initRC(name, service, replicas)
sc := initSC(name, service)
dc := initDC(name, service)
ds := initDS(name, service)
@ -820,7 +820,7 @@ func ProjectKuberConvert(p *project.Project, c *cli.Context) {
}
}
if createRC {
if (replicas != 0) {
for k, v := range mReplicationControllers {
print(k, "rc", v, toStdout, generateYaml, f)
}
@ -831,7 +831,7 @@ func ProjectKuberConvert(p *project.Project, c *cli.Context) {
}
if createChart {
err := generateHelm(composeFile, svcnames, generateYaml, createD, createDS, createRS, createRC)
err := generateHelm(composeFile, svcnames, generateYaml, createD, createDS, createRS, replicas)
if err != nil {
logrus.Fatalf("Failed to create Chart data: %s\n", err)
}

4
cli/app/k8sutils.go
View File

@ -32,7 +32,7 @@ import (
/**
* Generate Helm Chart configuration
*/
func generateHelm(filename string, svcnames []string, generateYaml, createD, createDS, createRS, createRC bool) error {
func generateHelm(filename string, svcnames []string, generateYaml, createD, createDS, createRS bool, replicas int) error {
type ChartDetails struct {
Name string
}
@ -105,7 +105,7 @@ home:
return err
}
}
if createRC {
if (replicas != 0) {
if err = cpToChart(manifestDir, svcname, "replicationcontroller", extension); err != nil {
return err
}

5
cli/command/command.go
View File

@ -48,9 +48,10 @@ func ConvertCommand(factory app.ProjectFactory) cli.Command {
Name: "daemonset,ds",
Usage: "Generate a daemonset resource file",
},
cli.BoolFlag{
cli.IntFlag{
Name: "replicationcontroller,rc",
Usage: "Generate a replicationcontroller file",
Value: 0,
Usage: "Specify replicas in order to generate a replication controller resource file",
},
cli.BoolFlag{
Name: "replicaset,rs",