diff --git a/pkg/kobject/kobject.go b/pkg/kobject/kobject.go index 763796a2..17c003c3 100644 --- a/pkg/kobject/kobject.go +++ b/pkg/kobject/kobject.go @@ -145,7 +145,6 @@ type ServiceConfig struct { CPUQuota int64 CapAdd []string CapDrop []string - Entrypoint []string Expose []string Privileged bool Restart string diff --git a/pkg/loader/compose/compose.go b/pkg/loader/compose/compose.go index f5b55be0..ff45af6f 100644 --- a/pkg/loader/compose/compose.go +++ b/pkg/loader/compose/compose.go @@ -151,8 +151,8 @@ func (c *Compose) LoadFile(file string) kobject.KomposeObject { serviceConfig := kobject.ServiceConfig{} serviceConfig.Image = composeServiceConfig.Image serviceConfig.ContainerName = composeServiceConfig.ContainerName - serviceConfig.Entrypoint = composeServiceConfig.Entrypoint - serviceConfig.Command = composeServiceConfig.Command + serviceConfig.Command = composeServiceConfig.Entrypoint + serviceConfig.Args = composeServiceConfig.Command // load environment variables envs := loadEnvVars(composeServiceConfig.Environment.ToMap()) diff --git a/pkg/transformer/kubernetes/k8sutils.go b/pkg/transformer/kubernetes/k8sutils.go index 7440a57c..79f48075 100644 --- a/pkg/transformer/kubernetes/k8sutils.go +++ b/pkg/transformer/kubernetes/k8sutils.go @@ -258,8 +258,8 @@ func UpdateKubernetesObjects(name string, service kobject.ServiceConfig, objects template.Spec.Containers[0].Name = service.ContainerName } template.Spec.Containers[0].Env = envs - template.Spec.Containers[0].Command = service.Entrypoint - template.Spec.Containers[0].Args = service.Command + template.Spec.Containers[0].Command = service.Command + template.Spec.Containers[0].Args = service.Args template.Spec.Containers[0].WorkingDir = service.WorkingDir template.Spec.Containers[0].VolumeMounts = volumesMount template.Spec.Volumes = volumes diff --git a/pkg/transformer/kubernetes/kubernetes_test.go b/pkg/transformer/kubernetes/kubernetes_test.go index 7102ab07..4b4b9122 100644 --- a/pkg/transformer/kubernetes/kubernetes_test.go +++ b/pkg/transformer/kubernetes/kubernetes_test.go @@ -42,13 +42,12 @@ func newServiceConfig() kobject.ServiceConfig { Network: []string{"network1", "network2"}, // not supported Labels: nil, Annotations: map[string]string{"abc": "def"}, - CPUSet: "cpu_set", // not supported - CPUShares: 1, // not supported - CPUQuota: 1, // not supported - CapAdd: []string{"cap_add"}, // not supported - CapDrop: []string{"cap_drop"}, // not supported - Entrypoint: []string{"entrypoint"}, // not supported - Expose: []string{"expose"}, // not supported + CPUSet: "cpu_set", // not supported + CPUShares: 1, // not supported + CPUQuota: 1, // not supported + CapAdd: []string{"cap_add"}, // not supported + CapDrop: []string{"cap_drop"}, // not supported + Expose: []string{"expose"}, // not supported Privileged: true, Restart: "always", User: "user", // not supported