Skip to content

Commit d4abaae

Browse files
committed
Remove sparkctl
Signed-off-by: Yi Chen <[email protected]>
1 parent 3128c7f commit d4abaae

27 files changed

+4
-2435
lines changed

Diff for: .dockerignore

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ examples/
99
hack/
1010
manifest/
1111
spark-docker/
12-
sparkctl/
1312
test/
1413
vendor/
1514
.dockerignore

Diff for: .github/workflows/integration.yaml

-16
Original file line numberDiff line numberDiff line change
@@ -110,22 +110,6 @@ jobs:
110110
- name: Build Spark operator
111111
run: make build-operator
112112

113-
build-sparkctl:
114-
runs-on: ubuntu-latest
115-
steps:
116-
- name: Checkout source code
117-
uses: actions/checkout@v4
118-
with:
119-
fetch-depth: 0
120-
121-
- name: Set up Go
122-
uses: actions/setup-go@v5
123-
with:
124-
go-version-file: go.mod
125-
126-
- name: Build sparkctl
127-
run: make build-sparkctl
128-
129113
build-helm-chart:
130114
runs-on: ubuntu-latest
131115
steps:

Diff for: .github/workflows/release.yaml

+1-49
Original file line numberDiff line numberDiff line change
@@ -65,51 +65,9 @@ jobs:
6565
echo "Tag '${VERSION}' does not exist."
6666
fi
6767
68-
release_sparkctl:
69-
needs:
70-
- check-release
71-
72-
runs-on: ubuntu-latest
73-
74-
strategy:
75-
fail-fast: true
76-
matrix:
77-
os:
78-
- linux
79-
- darwin
80-
arch:
81-
- amd64
82-
- arm64
83-
84-
env:
85-
GOOS: ${{ matrix.os }}
86-
GOARCH: ${{ matrix.arch }}
87-
88-
steps:
89-
- name: Checkout source code
90-
uses: actions/checkout@v4
91-
92-
- name: Read version from VERSION file
93-
run: |
94-
VERSION=$(cat VERSION | sed "s/^v//")
95-
echo "VERSION=${VERSION}" >> $GITHUB_ENV
96-
97-
- name: Build sparkctl binary
98-
run: |
99-
make build-sparkctl
100-
tar -czvf sparkctl-${VERSION}-${GOOS}-${GOARCH}.tgz -C bin sparkctl
101-
102-
- name: Upload sparkctl binary
103-
uses: actions/upload-artifact@v4
104-
with:
105-
name: sparkctl-${{ env.VERSION }}-${{ env.GOOS }}-${{ env.GOARCH }}
106-
path: sparkctl-${{ env.VERSION }}-${{ env.GOOS }}-${{ env.GOARCH }}.tgz
107-
if-no-files-found: error
108-
retention-days: 1
109-
11068
build_images:
11169
needs:
112-
- release_sparkctl
70+
- check-release
11371

11472
runs-on: ubuntu-latest
11573

@@ -288,11 +246,6 @@ jobs:
288246
helm package charts/${chart}
289247
done
290248
291-
- name: Download artifacts
292-
uses: actions/download-artifact@v4
293-
with:
294-
pattern: sparkctl-*
295-
296249
- name: Release
297250
id: release
298251
uses: softprops/action-gh-release@v2
@@ -305,4 +258,3 @@ jobs:
305258
draft: true
306259
files: |
307260
*.tgz
308-
sparkctl-*/sparkctl-*.tgz

Diff for: .gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
bin/
22
vendor/
33
cover.out
4-
sparkctl/sparkctl
5-
sparkctl/sparkctl-linux-amd64
6-
sparkctl/sparkctl-darwin-amd64
74
**/*.iml
85

96
# Various IDEs

Diff for: .golangci.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ issues:
3333
# Default dirs are skipped independently of this option's value (see exclude-dirs-use-default).
3434
# "/" will be replaced by current OS file path separator to properly work on Windows.
3535
# Default: []
36-
exclude-dirs:
37-
- sparkctl
36+
exclude-dirs: []
3837
# Maximum issues count per one linter.
3938
# Set to 0 to disable.
4039
# Default: 50

Diff for: Makefile

+1-13
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ HELM_DOCS_VERSION ?= v1.14.2
6464

6565
## Binaries
6666
SPARK_OPERATOR ?= $(LOCALBIN)/spark-operator
67-
SPARKCTL ?= $(LOCALBIN)/sparkctl
6867
KUBECTL ?= kubectl
6968
KUSTOMIZE ?= $(LOCALBIN)/kustomize-$(KUSTOMIZE_VERSION)
7069
CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen-$(CONTROLLER_TOOLS_VERSION)
@@ -175,20 +174,9 @@ build-operator: ## Build Spark operator.
175174
echo "Building spark-operator binary..."
176175
go build -o $(SPARK_OPERATOR) -ldflags '${LDFLAGS}' cmd/operator/main.go
177176

178-
.PHONY: build-sparkctl
179-
build-sparkctl: ## Build sparkctl binary.
180-
echo "Building sparkctl binary..."
181-
CGO_ENABLED=0 go build -o $(SPARKCTL) -buildvcs=false cmd/sparkctl/main.go
182-
183-
.PHONY: install-sparkctl
184-
install-sparkctl: build-sparkctl ## Install sparkctl binary.
185-
echo "Installing sparkctl binary to /usr/local/bin..."; \
186-
sudo cp $(SPARKCTL) /usr/local/bin
187-
188177
.PHONY: clean
189-
clean: ## Clean spark-operator and sparktcl binaries.
178+
clean: ## Clean binaries.
190179
rm -f $(SPARK_OPERATOR)
191-
rm -f $(SPARKCTL)
192180

193181
.PHONY: build-api-docs
194182
build-api-docs: gen-crd-api-reference-docs ## Build api documentation.

Diff for: README.md

-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ The Kubernetes Operator for Apache Spark currently supports the following list o
4343
* Supports automatic application re-submission for updated `SparkApplication` objects with updated specification.
4444
* Supports automatic application restart with a configurable restart policy.
4545
* Supports automatic retries of failed submissions with optional linear back-off.
46-
* Supports mounting local Hadoop configuration as a Kubernetes ConfigMap automatically via `sparkctl`.
47-
* Supports automatically staging local application dependencies to Google Cloud Storage (GCS) via `sparkctl`.
4846
* Supports collecting and exporting application-level metrics and driver/executor metrics to Prometheus.
4947

5048
## Project Status

Diff for: cmd/sparkctl/README.md

-231
This file was deleted.

0 commit comments

Comments
 (0)