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

Merge pull request #373 from procrypt/error_should_be_displayed

Browse Source 
error out if controller object is specified with "restart: on-failure"
This commit is contained in:
Charlie Drage 2017-01-30 09:21:20 -05:00 committed by GitHub
commit 2f05ecdcf0
6 changed files with 48 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cmd/convert.go
View File

@ -55,21 +55,25 @@ var convertCmd = &cobra.Command{
// Create the Convert Options. // Create the Convert Options.
ConvertOpt = kobject.ConvertOptions{ ConvertOpt = kobject.ConvertOptions{
ToStdout: ConvertStdout, ToStdout: ConvertStdout,
CreateChart: ConvertChart, CreateChart: ConvertChart,
GenerateYaml: ConvertYaml, GenerateYaml: ConvertYaml,
GenerateJSON: ConvertJSON, GenerateJSON: ConvertJSON,
Replicas: ConvertReplicas, Replicas: ConvertReplicas,
InputFiles: GlobalFiles, InputFiles: GlobalFiles,
OutFile: ConvertOut, OutFile: ConvertOut,
Provider: strings.ToLower(GlobalProvider), Provider: strings.ToLower(GlobalProvider),
CreateD: ConvertDeployment, CreateD: ConvertDeployment,
CreateDS: ConvertDaemonSet, CreateDS: ConvertDaemonSet,
CreateRC: ConvertReplicationController, CreateRC: ConvertReplicationController,
BuildRepo: ConvertBuildRepo, BuildRepo: ConvertBuildRepo,
BuildBranch: ConvertBuildBranch, BuildBranch: ConvertBuildBranch,
CreateDeploymentConfig: ConvertDeploymentConfig, CreateDeploymentConfig: ConvertDeploymentConfig,
EmptyVols: ConvertEmptyVols, EmptyVols: ConvertEmptyVols,
IsDeploymentFlag: cmd.Flags().Lookup("deployment").Changed,
IsDaemonSetFlag: cmd.Flags().Lookup("daemon-set").Changed,
IsReplicationControllerFlag: cmd.Flags().Lookup("replication-controller").Changed,
IsDeploymentConfigFlag: cmd.Flags().Lookup("deployment-config").Changed,
} }
// Validate before doing anything else. Use "bundle" if passed in. // Validate before doing anything else. Use "bundle" if passed in.

34
pkg/kobject/kobject.go
View File

@ -29,21 +29,25 @@ type KomposeObject struct {
// ConvertOptions holds all options that controls transformation process // ConvertOptions holds all options that controls transformation process
type ConvertOptions struct { type ConvertOptions struct {
ToStdout bool ToStdout bool
CreateD bool CreateD bool
CreateRC bool CreateRC bool
CreateDS bool CreateDS bool
CreateDeploymentConfig bool CreateDeploymentConfig bool
BuildRepo string BuildRepo string
BuildBranch string BuildBranch string
CreateChart bool CreateChart bool
GenerateYaml bool GenerateYaml bool
GenerateJSON bool GenerateJSON bool
EmptyVols bool EmptyVols bool
Replicas int Replicas int
InputFiles []string InputFiles []string
OutFile string OutFile string
Provider string Provider string
IsDeploymentFlag bool
IsDaemonSetFlag bool
IsReplicationControllerFlag bool
IsDeploymentConfigFlag bool
} }
// ServiceConfig holds the basic struct of a container // ServiceConfig holds the basic struct of a container

4
pkg/transformer/kubernetes/kubernetes.go
View File

@ -468,6 +468,10 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.
// Generate pod only and nothing more // Generate pod only and nothing more
if service.Restart == "no" || service.Restart == "on-failure" { if service.Restart == "no" || service.Restart == "on-failure" {
// Error out if Controller Object is specified with restart: 'on-failure'
if opt.IsDeploymentFlag || opt.IsDaemonSetFlag || opt.IsReplicationControllerFlag {
logrus.Fatalf("Controller object cannot be specified with restart: 'on-failure'")
}
pod := k.InitPod(name, service) pod := k.InitPod(name, service)
objects = append(objects, pod) objects = append(objects, pod)
} else { } else {

4
pkg/transformer/openshift/openshift.go
View File

@ -321,6 +321,10 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
// Generate pod only and nothing more // Generate pod only and nothing more
if service.Restart == "no" || service.Restart == "on-failure" { if service.Restart == "no" || service.Restart == "on-failure" {
// Error out if Controller Object is specified with restart: 'on-failure'
if opt.IsDeploymentConfigFlag {
logrus.Fatalf("Controller object cannot be specified with restart: 'on-failure'")
}
pod := o.InitPod(name, service) pod := o.InitPod(name, service)
objects = append(objects, pod) objects = append(objects, pod)
} else { } else {

4
script/test/cmd/tests.sh
View File

@ -110,10 +110,10 @@ convert::expect_success_and_warning "kompose --bundle $KOMPOSE_ROOT/script/test/
# Test related to restart options in docker-compose # Test related to restart options in docker-compose
# kubernetes test # kubernetes test
convert::expect_success "kompose -f $KOMPOSE_ROOT/script/test/fixtures/restart-options/docker-compose-restart-no.yml convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/restart-options/output-k8s-restart-no.json" convert::expect_success "kompose -f $KOMPOSE_ROOT/script/test/fixtures/restart-options/docker-compose-restart-no.yml convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/restart-options/output-k8s-restart-no.json"
convert::expect_success "kompose -f $KOMPOSE_ROOT/script/test/fixtures/restart-options/docker-compose-restart-onfail.yml convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/restart-options/output-k8s-restart-onfail.json" convert::failure "kompose -f $KOMPOSE_ROOT/script/test/fixtures/restart-options/docker-compose-restart-onfail.yml convert --stdout -j" "Controller object cannot be specified with restart: 'on-failure'"
# openshift test # openshift test
convert::expect_success "kompose -f $KOMPOSE_ROOT/script/test/fixtures/restart-options/docker-compose-restart-no.yml --provider openshift convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/restart-options/output-os-restart-no.json" convert::expect_success "kompose -f $KOMPOSE_ROOT/script/test/fixtures/restart-options/docker-compose-restart-no.yml --provider openshift convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/restart-options/output-os-restart-no.json"
convert::expect_success "kompose -f $KOMPOSE_ROOT/script/test/fixtures/restart-options/docker-compose-restart-onfail.yml --provider openshift convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/restart-options/output-os-restart-onfail.json" convert::failure "kompose -f $KOMPOSE_ROOT/script/test/fixtures/restart-options/docker-compose-restart-onfail.yml --provider openshift convert --stdout -j" "Controller object cannot be specified with restart: 'on-failure'"
###### ######

35
script/test/fixtures/restart-options/output-k8s-restart-onfail.json vendored
View File

@ -1,35 +0,0 @@
{
"kind": "List",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "Pod",
"apiVersion": "v1",
"metadata": {
"name": "foo",
"creationTimestamp": null,
"labels": {
"service": "foo"
}
},
"spec": {
"containers": [
{
"name": "foo",
"image": "foobar",
"env": [
{
"name": "GITHUB",
"value": "surajssd"
}
],
"resources": {}
}
],
"restartPolicy": "OnFailure"
},
"status": {}
}
]
}