Move sparkctl to cmd directory (kubeflow#2347)

* Move spark-operator Signed-off-by: Yi Chen <[email protected]> * Move sparkctl to cmd directory Signed-off-by: Yi Chen <[email protected]> * Remove unnecessary app package/directory Signed-off-by: Yi Chen <[email protected]> --------- Signed-off-by: Yi Chen <[email protected]>
ChenYi015 · Dec 6, 2024 · 2375a30 · 2375a30
1 parent 5dd91c4
commit 2375a30
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 51 deletions.
diff --git a/Makefile b/Makefile
@@ -173,12 +173,12 @@ override LDFLAGS += \
 .PHONY: build-operator
 build-operator: ## Build Spark operator.
 	echo "Building spark-operator binary..."
-	go build -o $(SPARK_OPERATOR) -ldflags '${LDFLAGS}' cmd/main.go
+	go build -o $(SPARK_OPERATOR) -ldflags '${LDFLAGS}' cmd/operator/main.go
 
 .PHONY: build-sparkctl
 build-sparkctl: ## Build sparkctl binary.
 	echo "Building sparkctl binary..."
-	CGO_ENABLED=0 go build -o $(SPARKCTL) -buildvcs=false sparkctl/main.go
+	CGO_ENABLED=0 go build -o $(SPARKCTL) -buildvcs=false cmd/sparkctl/main.go
 
 .PHONY: install-sparkctl
 install-sparkctl: build-sparkctl ## Install sparkctl binary.
@@ -191,7 +191,7 @@ clean: ## Clean spark-operator and sparktcl binaries.
 	rm -f $(SPARKCTL)
 
 .PHONY: build-api-docs
-build-api-docs: gen-crd-api-reference-docs ## Build api documentaion.
+build-api-docs: gen-crd-api-reference-docs ## Build api documentation.
 	$(GEN_CRD_API_REFERENCE_DOCS) \
 	-config hack/api-docs/config.json \
 	-api-dir github.com/kubeflow/spark-operator/api/v1beta2 \

diff --git a/cmd/main.go b/cmd/main.go
diff --git a/cmd/operator/root.go → cmd/operator/main.go b/cmd/operator/root.go → cmd/operator/main.go
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-    https://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,9 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package operator
+package main
 
 import (
+	"fmt"
+	"os"
+
 	"github.com/spf13/cobra"
 
 	"github.com/kubeflow/spark-operator/cmd/operator/controller"
@@ -37,3 +40,10 @@ func NewCommand() *cobra.Command {
 	command.AddCommand(version.NewCommand())
 	return command
 }
+
+func main() {
+	if err := NewCommand().Execute(); err != nil {
+		fmt.Fprintf(os.Stderr, "%v\n", err)
+		os.Exit(1)
+	}
+}
diff --git a/sparkctl/README.md → cmd/sparkctl/README.md b/sparkctl/README.md → cmd/sparkctl/README.md
diff --git a/sparkctl/cmd/client.go → cmd/sparkctl/app/client.go b/sparkctl/cmd/client.go → cmd/sparkctl/app/client.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package app
 
 import (
 	"context"

diff --git a/sparkctl/cmd/create.go → cmd/sparkctl/app/create.go b/sparkctl/cmd/create.go → cmd/sparkctl/app/create.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package app
 
 import (
 	"context"

diff --git a/sparkctl/cmd/create_test.go → cmd/sparkctl/app/create_test.go b/sparkctl/cmd/create_test.go → cmd/sparkctl/app/create_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package app
 
 import (
 	"strings"

diff --git a/sparkctl/cmd/delete.go → cmd/sparkctl/app/delete.go b/sparkctl/cmd/delete.go → cmd/sparkctl/app/delete.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package app
 
 import (
 	"context"

diff --git a/sparkctl/cmd/event.go → cmd/sparkctl/app/event.go b/sparkctl/cmd/event.go → cmd/sparkctl/app/event.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package app
 
 import (
 	"context"

diff --git a/sparkctl/cmd/forward.go → cmd/sparkctl/app/forward.go b/sparkctl/cmd/forward.go → cmd/sparkctl/app/forward.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package app
 
 import (
 	"context"

diff --git a/sparkctl/cmd/gcs.go → cmd/sparkctl/app/gcs.go b/sparkctl/cmd/gcs.go → cmd/sparkctl/app/gcs.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package app
 
 import (
 	"fmt"

diff --git a/sparkctl/cmd/list.go → cmd/sparkctl/app/list.go b/sparkctl/cmd/list.go → cmd/sparkctl/app/list.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package app
 
 import (
 	"context"

diff --git a/sparkctl/cmd/log.go → cmd/sparkctl/app/log.go b/sparkctl/cmd/log.go → cmd/sparkctl/app/log.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package app
 
 import (
 	"context"

diff --git a/sparkctl/cmd/root.go → cmd/sparkctl/app/root.go b/sparkctl/cmd/root.go → cmd/sparkctl/app/root.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package app
 
 import (
 	"fmt"

diff --git a/sparkctl/cmd/s3.go → cmd/sparkctl/app/s3.go b/sparkctl/cmd/s3.go → cmd/sparkctl/app/s3.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package app
 
 import (
 	"context"

diff --git a/sparkctl/cmd/status.go → cmd/sparkctl/app/status.go b/sparkctl/cmd/status.go → cmd/sparkctl/app/status.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package app
 
 import (
 	"fmt"

diff --git a/sparkctl/cmd/testdata/hadoop-conf/binary.dat → ...rkctl/app/testdata/hadoop-conf/binary.dat b/sparkctl/cmd/testdata/hadoop-conf/binary.dat → ...rkctl/app/testdata/hadoop-conf/binary.dat
diff --git a/...tl/cmd/testdata/hadoop-conf/core-site.xml → ...tl/app/testdata/hadoop-conf/core-site.xml b/...tl/cmd/testdata/hadoop-conf/core-site.xml → ...tl/app/testdata/hadoop-conf/core-site.xml
diff --git a/sparkctl/cmd/testdata/test-app.yaml → cmd/sparkctl/app/testdata/test-app.yaml b/sparkctl/cmd/testdata/test-app.yaml → cmd/sparkctl/app/testdata/test-app.yaml
diff --git a/sparkctl/cmd/utils.go → cmd/sparkctl/app/utils.go b/sparkctl/cmd/utils.go → cmd/sparkctl/app/utils.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package app
 
 import (
 	"time"

diff --git a/sparkctl/main.go → cmd/sparkctl/main.go b/sparkctl/main.go → cmd/sparkctl/main.go
@@ -19,9 +19,9 @@ package main
 import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
-	"github.com/kubeflow/spark-operator/sparkctl/cmd"
+	"github.com/kubeflow/spark-operator/cmd/sparkctl/app"
 )
 
 func main() {
-	cmd.Execute()
+	app.Execute()
 }