Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move cmd APIs to internal/cmd/operator-sdk/ #3568

Merged
merged 1 commit into from
Jul 27, 2020
Merged

Move cmd APIs to internal/cmd/operator-sdk/ #3568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/operator-sdk/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

log "github.com/sirupsen/logrus"

"github.com/operator-framework/operator-sdk/cmd/operator-sdk/cli"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/cli"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion hack/generate/cli-doc/gen-cli-doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/cobra/doc"

"github.com/operator-framework/operator-sdk/cmd/operator-sdk/cli"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/cli"
)

const fmTemplate = `---
Expand Down
0 cmd/operator-sdk/bundle/bundle_suite_test.go → .../operator-sdk/bundle/bundle_suite_test.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/bundle/cmd.go → internal/cmd/operator-sdk/bundle/cmd.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/bundle/cmd_test.go → internal/cmd/operator-sdk/bundle/cmd_test.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/bundle/internal/logger.go → ...md/operator-sdk/bundle/internal/logger.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/bundle/internal/result.go → ...md/operator-sdk/bundle/internal/result.go
View file
Open in desktop
File renamed without changes.
0 ...erator-sdk/bundle/internal/result_test.go → ...erator-sdk/bundle/internal/result_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/operator-sdk/bundle/validate.go → internal/cmd/operator-sdk/bundle/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"github.com/spf13/pflag"
"github.com/spf13/viper"

"github.com/operator-framework/operator-sdk/cmd/operator-sdk/bundle/internal"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/bundle/internal"
"github.com/operator-framework/operator-sdk/internal/flags"
internalregistry "github.com/operator-framework/operator-sdk/internal/registry"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/operator-sdk/bundle/validate_test.go → .../cmd/operator-sdk/bundle/validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package bundle
import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/operator-framework/operator-sdk/cmd/operator-sdk/bundle/internal"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/bundle/internal"
)

var _ = Describe("Running a bundle validate command", func() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/operator-sdk/cleanup/cmd.go → internal/cmd/operator-sdk/cleanup/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package cleanup
import (
"github.com/spf13/cobra"

"github.com/operator-framework/operator-sdk/cmd/operator-sdk/cleanup/packagemanifests"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/cleanup/packagemanifests"
)

func NewCmd() *cobra.Command {
Expand Down
0 ...anup/packagemanifests/packagemanifests.go → ...anup/packagemanifests/packagemanifests.go
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions cmd/operator-sdk/cli/cli.go → internal/cmd/operator-sdk/cli/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
package cli

import (
"github.com/operator-framework/operator-sdk/cmd/operator-sdk/bundle"
"github.com/operator-framework/operator-sdk/cmd/operator-sdk/cleanup"
"github.com/operator-framework/operator-sdk/cmd/operator-sdk/completion"
"github.com/operator-framework/operator-sdk/cmd/operator-sdk/generate"
"github.com/operator-framework/operator-sdk/cmd/operator-sdk/olm"
"github.com/operator-framework/operator-sdk/cmd/operator-sdk/run"
"github.com/operator-framework/operator-sdk/cmd/operator-sdk/scorecard"
"github.com/operator-framework/operator-sdk/cmd/operator-sdk/version"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/bundle"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/cleanup"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/completion"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/generate"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/olm"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/run"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/scorecard"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/version"
"github.com/operator-framework/operator-sdk/internal/flags"
ansiblev1 "github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1"
golangv2 "github.com/operator-framework/operator-sdk/internal/plugins/golang/v2"
Expand Down
0 cmd/operator-sdk/completion/bash.go → internal/cmd/operator-sdk/completion/bash.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/completion/bash_test.go → .../cmd/operator-sdk/completion/bash_test.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/completion/cmd.go → internal/cmd/operator-sdk/completion/cmd.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/completion/cmd_test.go → ...l/cmd/operator-sdk/completion/cmd_test.go
View file
Open in desktop
File renamed without changes.
0 ...r-sdk/completion/completion_suite_test.go → ...r-sdk/completion/completion_suite_test.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/completion/zsh.go → internal/cmd/operator-sdk/completion/zsh.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/completion/zsh_test.go → ...l/cmd/operator-sdk/completion/zsh_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/operator-sdk/generate/bundle/bundle.go → ...md/operator-sdk/generate/bundle/bundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
yaml "gopkg.in/yaml.v3"
"sigs.k8s.io/kubebuilder/pkg/model/config"

genutil "github.com/operator-framework/operator-sdk/cmd/operator-sdk/generate/internal"
metricsannotations "github.com/operator-framework/operator-sdk/internal/annotations/metrics"
scorecardannotations "github.com/operator-framework/operator-sdk/internal/annotations/scorecard"
genutil "github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/generate/internal"
gencsv "github.com/operator-framework/operator-sdk/internal/generate/clusterserviceversion"
"github.com/operator-framework/operator-sdk/internal/generate/collector"
"github.com/operator-framework/operator-sdk/internal/registry"
Expand Down
0 cmd/operator-sdk/generate/bundle/cmd.go → ...l/cmd/operator-sdk/generate/bundle/cmd.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions cmd/operator-sdk/generate/cmd.go → internal/cmd/operator-sdk/generate/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package generate
import (
"github.com/spf13/cobra"

"github.com/operator-framework/operator-sdk/cmd/operator-sdk/generate/bundle"
"github.com/operator-framework/operator-sdk/cmd/operator-sdk/generate/kustomize"
"github.com/operator-framework/operator-sdk/cmd/operator-sdk/generate/packagemanifests"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/generate/bundle"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/generate/kustomize"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/generate/packagemanifests"
)

// NewCmd returns the 'generate' command configured for the new project layout.
Expand Down
0 ...operator-sdk/generate/internal/genutil.go → ...operator-sdk/generate/internal/genutil.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/generate/kustomize/cmd.go → ...md/operator-sdk/generate/kustomize/cmd.go
View file
Open in desktop
File renamed without changes.
0 ...rator-sdk/generate/kustomize/manifests.go → ...rator-sdk/generate/kustomize/manifests.go
View file
Open in desktop
File renamed without changes.
0 ...ator-sdk/generate/packagemanifests/cmd.go → ...ator-sdk/generate/packagemanifests/cmd.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rate/packagemanifests/packagemanifests.go → ...rate/packagemanifests/packagemanifests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"sigs.k8s.io/kubebuilder/pkg/model/config"

genutil "github.com/operator-framework/operator-sdk/cmd/operator-sdk/generate/internal"
genutil "github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/generate/internal"
gencsv "github.com/operator-framework/operator-sdk/internal/generate/clusterserviceversion"
"github.com/operator-framework/operator-sdk/internal/generate/collector"
genpkg "github.com/operator-framework/operator-sdk/internal/generate/packagemanifest"
Expand Down
0 cmd/operator-sdk/olm/cmd.go → internal/cmd/operator-sdk/olm/cmd.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/olm/cmd_test.go → internal/cmd/operator-sdk/olm/cmd_test.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/olm/install.go → internal/cmd/operator-sdk/olm/install.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/olm/install_test.go → ...rnal/cmd/operator-sdk/olm/install_test.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/olm/olm_suite_test.go → ...al/cmd/operator-sdk/olm/olm_suite_test.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/olm/status.go → internal/cmd/operator-sdk/olm/status.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/olm/status_test.go → internal/cmd/operator-sdk/olm/status_test.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/olm/uninstall.go → internal/cmd/operator-sdk/olm/uninstall.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/olm/uninstall_test.go → ...al/cmd/operator-sdk/olm/uninstall_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/operator-sdk/run/cmd.go → internal/cmd/operator-sdk/run/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package run
import (
"github.com/spf13/cobra"

"github.com/operator-framework/operator-sdk/cmd/operator-sdk/run/packagemanifests"
"github.com/operator-framework/operator-sdk/internal/cmd/operator-sdk/run/packagemanifests"
)

func NewCmd() *cobra.Command {
Expand Down
0 cmd/operator-sdk/run/cmd_test.go → internal/cmd/operator-sdk/run/cmd_test.go
View file
Open in desktop
File renamed without changes.
0 .../run/packagemanifests/packagemanifests.go → .../run/packagemanifests/packagemanifests.go
View file
Open in desktop
File renamed without changes.
0 ...emanifests/packagemanifests_suite_test.go → ...emanifests/packagemanifests_suite_test.go
View file
Open in desktop
File renamed without changes.
0 ...packagemanifests/packagemanifests_test.go → ...packagemanifests/packagemanifests_test.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/run/run_suite_test.go → ...al/cmd/operator-sdk/run/run_suite_test.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/scorecard/cmd.go → internal/cmd/operator-sdk/scorecard/cmd.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/scorecard/cmd_test.go → ...al/cmd/operator-sdk/scorecard/cmd_test.go
View file
Open in desktop
File renamed without changes.
0 ...tor-sdk/scorecard/scorecard_suite_test.go → ...tor-sdk/scorecard/scorecard_suite_test.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/version/cmd.go → internal/cmd/operator-sdk/version/cmd.go
View file
Open in desktop
File renamed without changes.
0 cmd/operator-sdk/version/cmd_test.go → ...rnal/cmd/operator-sdk/version/cmd_test.go
View file
Open in desktop
File renamed without changes.
0 ...perator-sdk/version/version_suite_test.go → ...perator-sdk/version/version_suite_test.go
View file
Open in desktop
File renamed without changes.