diff --git a/client/convert.go b/client/convert.go index c56122b25..3e62a6222 100644 --- a/client/convert.go +++ b/client/convert.go @@ -33,7 +33,6 @@ func (k *Kompose) Convert(options ConvertOptions) ([]runtime.Object, error) { PushImageRegistry: options.PushImageRegistry, CreateDeploymentConfig: k.createDeploymentConfig(options), EmptyVols: false, - Profiles: options.Profiles, Volumes: *options.VolumeType, PVCRequestSize: options.PvcRequestSize, InsecureRepository: k.insecureRepository(options), diff --git a/client/convert_test.go b/client/convert_test.go index 89a6b4c60..b70149360 100644 --- a/client/convert_test.go +++ b/client/convert_test.go @@ -2,8 +2,6 @@ package client import ( "fmt" - v1 "k8s.io/api/core/v1" - "sort" "testing" "gotest.tools/v3/assert" @@ -71,7 +69,7 @@ func TestConvertWithDefaultOptions(t *testing.T) { client, err := NewClient(WithErrorOnWarning()) assert.Check(t, is.Equal(err, nil)) objects, err := client.Convert(ConvertOptions{ - ToStdout: true, + OutFile: "./testdata/generated/", InputFiles: []string{ "./testdata/docker-compose.yaml", }, @@ -83,89 +81,3 @@ func TestConvertWithDefaultOptions(t *testing.T) { } } } - -func TestConvertWithProfiles(t *testing.T) { - client, err := NewClient(WithErrorOnWarning()) - assert.Check(t, is.Equal(err, nil)) - - type Want struct { - deploymentsNames []string - servicesNames []string - } - - tests := []struct { - name string - options ConvertOptions - want Want - }{ - { - name: "No profiles provided", - options: ConvertOptions{ - ToStdout: true, - InputFiles: []string{ - "./testdata/docker-compose-profiles.yaml", - }, - }, - want: Want{ - deploymentsNames: nil, - servicesNames: nil, - }, - }, - { - name: "All profiles provided", - options: ConvertOptions{ - ToStdout: true, - InputFiles: []string{ - "./testdata/docker-compose-profiles.yaml", - }, - Profiles: []string{"hello", "world"}, - }, - want: Want{ - deploymentsNames: []string{"backend", "frontend", "database"}, - servicesNames: []string{"backend", "frontend", "database"}, - }, - }, - { - name: "One profile only", - options: ConvertOptions{ - ToStdout: true, - InputFiles: []string{ - "./testdata/docker-compose-profiles.yaml", - }, - Profiles: []string{"hello"}, - }, - want: Want{ - deploymentsNames: []string{"backend", "frontend"}, - servicesNames: []string{"backend", "frontend"}, - }, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - objects, err := client.Convert(tt.options) - assert.Check(t, is.Equal(err, nil)) - - sort.Strings(tt.want.deploymentsNames) - sort.Strings(tt.want.servicesNames) - - var deploymentsNames []string - var servicesNames []string - - for _, object := range objects { - if deployment, ok := object.(*appsv1.Deployment); ok { - deploymentsNames = append(deploymentsNames, deployment.Name) - } - - if service, ok := object.(*v1.Service); ok { - servicesNames = append(servicesNames, service.Name) - } - } - - sort.Strings(deploymentsNames) - sort.Strings(servicesNames) - - assert.Check(t, is.DeepEqual(deploymentsNames, tt.want.deploymentsNames)) - assert.Check(t, is.DeepEqual(servicesNames, tt.want.servicesNames)) - }) - } -} diff --git a/client/testdata/docker-compose-profiles.yaml b/client/testdata/docker-compose-profiles.yaml deleted file mode 100644 index 3f42dd2ad..000000000 --- a/client/testdata/docker-compose-profiles.yaml +++ /dev/null @@ -1,17 +0,0 @@ -version: '3' -services: - backend: - image: dummy:tag - profiles: ['hello', 'world'] - ports: - - "80:80" - frontend: - image: dummy:tag - profiles: [ 'hello' ] - ports: - - "80:80" - database: - image: dummy:tag - profiles: [ 'world' ] - ports: - - "80:80" diff --git a/client/types.go b/client/types.go index a5c738552..35e94abe0 100644 --- a/client/types.go +++ b/client/types.go @@ -44,7 +44,6 @@ type ConvertOptions struct { PvcRequestSize string WithKomposeAnnotations *bool InputFiles []string - Profiles []string Provider GenerateNetworkPolicies bool } diff --git a/cmd/convert.go b/cmd/convert.go index 898227bc1..c2972f551 100644 --- a/cmd/convert.go +++ b/cmd/convert.go @@ -46,7 +46,6 @@ var ( ConvertDeploymentConfig bool ConvertReplicas int ConvertController string - ConvertProfiles []string ConvertPushImage bool ConvertNamespace string ConvertPushImageRegistry string @@ -116,7 +115,6 @@ var convertCmd = &cobra.Command{ IsReplicaSetFlag: cmd.Flags().Lookup("replicas").Changed, IsDeploymentConfigFlag: cmd.Flags().Lookup("deployment-config").Changed, YAMLIndent: ConvertYAMLIndent, - Profiles: ConvertProfiles, WithKomposeAnnotation: WithKomposeAnnotation, MultipleContainerMode: MultipleContainerMode, ServiceGroupMode: ServiceGroupMode, @@ -201,8 +199,6 @@ func init() { convertCmd.Flags().IntVar(&ConvertYAMLIndent, "indent", 2, "Spaces length to indent generated yaml files") - convertCmd.Flags().StringArrayVar(&ConvertProfiles, "profile", []string{}, `Specify the profile to use, can use multiple profiles`) - // In order to 'separate' both OpenShift and Kubernetes only flags. A custom help page is created customHelp := `Usage:{{if .Runnable}} {{if .HasAvailableFlags}}{{appendIfNotPresent .UseLine "[flags]"}}{{else}}{{.UseLine}}{{end}}{{end}}{{if .HasAvailableSubCommands}} diff --git a/pkg/app/app.go b/pkg/app/app.go index 918f66f9a..25a930a10 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -217,7 +217,7 @@ func Convert(opt kobject.ConvertOptions) ([]runtime.Object, error) { komposeObject := kobject.KomposeObject{ ServiceConfigs: make(map[string]kobject.ServiceConfig), } - komposeObject, err = l.LoadFile(opt.InputFiles, opt.Profiles) + komposeObject, err = l.LoadFile(opt.InputFiles) if err != nil { log.Fatalf(err.Error()) } diff --git a/pkg/kobject/kobject.go b/pkg/kobject/kobject.go index 2da35cf68..525008c58 100644 --- a/pkg/kobject/kobject.go +++ b/pkg/kobject/kobject.go @@ -53,7 +53,6 @@ type ConvertOptions struct { BuildRepo string BuildBranch string Build string - Profiles []string PushImage bool PushImageRegistry string CreateChart bool diff --git a/pkg/loader/compose/compose.go b/pkg/loader/compose/compose.go index c750e007e..973962434 100644 --- a/pkg/loader/compose/compose.go +++ b/pkg/loader/compose/compose.go @@ -149,19 +149,14 @@ func checkUnsupportedKey(composeProject *types.Project) []string { } // LoadFile loads a compose file into KomposeObject -func (c *Compose) LoadFile(files []string, profiles []string) (kobject.KomposeObject, error) { +func (c *Compose) LoadFile(files []string) (kobject.KomposeObject, error) { // Gather the working directory workingDir, err := getComposeFileDir(files) if err != nil { return kobject.KomposeObject{}, err } - projectOptions, err := cli.NewProjectOptions( - files, cli.WithOsEnv, - cli.WithWorkingDirectory(workingDir), - cli.WithInterpolation(true), - cli.WithProfiles(profiles), - ) + projectOptions, err := cli.NewProjectOptions(files, cli.WithOsEnv, cli.WithWorkingDirectory(workingDir), cli.WithInterpolation(true)) if err != nil { return kobject.KomposeObject{}, errors.Wrap(err, "Unable to create compose options") } diff --git a/pkg/loader/loader.go b/pkg/loader/loader.go index def6f3783..bbea343c0 100644 --- a/pkg/loader/loader.go +++ b/pkg/loader/loader.go @@ -25,7 +25,7 @@ import ( // Loader interface defines loader that loads files and converts it to kobject representation type Loader interface { - LoadFile(files []string, profiles []string) (kobject.KomposeObject, error) + LoadFile(files []string) (kobject.KomposeObject, error) ///Name() string }