Skip to content

Commit ef9a2a1

Browse files
ChenYi015ImpSyjacobsalwaydependabot[bot]missedone
authored
Release v2.0.2 (#2233)
* FEATURE: add cli argument to modify controller workqueue ratelimiter (#2186) * add cli argument to modify controller workqueue ratelimiter Signed-off-by: ImpSy <[email protected]> * add cli argument to modify controller workqueue ratelimiter support to helm chart Signed-off-by: ImpSy <[email protected]> --------- Signed-off-by: ImpSy <[email protected]> (cherry picked from commit d37a0e9) Signed-off-by: Yi Chen <[email protected]> * Fix ingress capability discovery (#2201) Signed-off-by: Jacob Salway <[email protected]> (cherry picked from commit 56b4974) Signed-off-by: Yi Chen <[email protected]> * Bump github.com/aws/aws-sdk-go-v2 from 1.30.5 to 1.31.0 (#2207) Bumps [github.com/aws/aws-sdk-go-v2](https://github.com/aws/aws-sdk-go-v2) from 1.30.5 to 1.31.0. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@v1.30.5...v1.31.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit faa0822) Signed-off-by: Yi Chen <[email protected]> * Bump golang.org/x/net from 0.28.0 to 0.29.0 (#2205) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.28.0 to 0.29.0. - [Commits](golang/net@v0.28.0...v0.29.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 6106178) Signed-off-by: Yi Chen <[email protected]> * Bump github.com/docker/docker from 27.0.3+incompatible to 27.1.1+incompatible (#2125) Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.0.3+incompatible to 27.1.1+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](moby/moby@v27.0.3...v27.1.1) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 316536f) Signed-off-by: Yi Chen <[email protected]> * Bump github.com/aws/aws-sdk-go-v2/service/s3 from 1.58.3 to 1.63.3 (#2206) Bumps [github.com/aws/aws-sdk-go-v2/service/s3](https://github.com/aws/aws-sdk-go-v2) from 1.58.3 to 1.63.3. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@service/s3/v1.58.3...service/s3/v1.63.3) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 1972fb7) Signed-off-by: Yi Chen <[email protected]> * Update integration test workflow and add golangci lint check (#2197) * Update integration test workflow Signed-off-by: Yi Chen <[email protected]> * Update golangci lint config Signed-off-by: Yi Chen <[email protected]> --------- Signed-off-by: Yi Chen <[email protected]> (cherry picked from commit 143b16e) Signed-off-by: Yi Chen <[email protected]> * Bump github.com/aws/aws-sdk-go-v2 from 1.31.0 to 1.32.0 (#2229) Bumps [github.com/aws/aws-sdk-go-v2](https://github.com/aws/aws-sdk-go-v2) from 1.31.0 to 1.32.0. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@v1.31.0...v1.32.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit a4dcfcb) Signed-off-by: Yi Chen <[email protected]> * Bump cloud.google.com/go/storage from 1.43.0 to 1.44.0 (#2228) Bumps [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) from 1.43.0 to 1.44.0. - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](googleapis/google-cloud-go@pubsub/v1.43.0...spanner/v1.44.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/storage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 2542009) Signed-off-by: Yi Chen <[email protected]> * Bump manusa/actions-setup-minikube from 2.11.0 to 2.12.0 (#2226) Bumps [manusa/actions-setup-minikube](https://github.com/manusa/actions-setup-minikube) from 2.11.0 to 2.12.0. - [Release notes](https://github.com/manusa/actions-setup-minikube/releases) - [Commits](manusa/actions-setup-minikube@v2.11.0...v2.12.0) --- updated-dependencies: - dependency-name: manusa/actions-setup-minikube dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 4358fd4) Signed-off-by: Yi Chen <[email protected]> * Bump golang.org/x/time from 0.6.0 to 0.7.0 (#2227) Bumps [golang.org/x/time](https://github.com/golang/time) from 0.6.0 to 0.7.0. - [Commits](golang/time@v0.6.0...v0.7.0) --- updated-dependencies: - dependency-name: golang.org/x/time dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 29ba4e7) Signed-off-by: Yi Chen <[email protected]> * fix: imagePullPolicy was ignored (#2222) Signed-off-by: xuqingtan <[email protected]> (cherry picked from commit 7fb14e6) Signed-off-by: Yi Chen <[email protected]> * fix: spark-submission failed due to lack of permission by user `spark` (#2223) error: Exception in thread "main" java.io.FileNotFoundException: /home/spark/.ivy2/cache/resolved-org.apache.spark-spark-submit-parent-511288aa-ce7c-4a38-9c8e-4869b71c68fa-1.0.xml (No such file or directory) Signed-off-by: xuqingtan <[email protected]> (cherry picked from commit d07821b) Signed-off-by: Yi Chen <[email protected]> * Bump github.com/aws/aws-sdk-go-v2/config from 1.27.33 to 1.27.42 (#2231) Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.27.33 to 1.27.42. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@config/v1.27.33...config/v1.27.42) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 9be8dce) Signed-off-by: Yi Chen <[email protected]> * Bump github.com/prometheus/client_golang from 1.19.1 to 1.20.4 (#2204) Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.19.1 to 1.20.4. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.19.1...v1.20.4) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit fe833fa) Signed-off-by: Yi Chen <[email protected]> * Remove `cap_net_bind_service` from image (#2216) Signed-off-by: Jacob Salway <[email protected]> (cherry picked from commit ac761ef) Signed-off-by: Yi Chen <[email protected]> * fix: webhook panics due to logging (#2232) Signed-off-by: Yi Chen <[email protected]> (cherry picked from commit 247e834) Signed-off-by: Yi Chen <[email protected]> * Add check for generating manifests and code (#2234) Signed-off-by: Yi Chen <[email protected]> (cherry picked from commit c75d99f) Signed-off-by: Yi Chen <[email protected]> * Spark Operator Official Release v2.0.2 Signed-off-by: Yi Chen <[email protected]> --------- Signed-off-by: ImpSy <[email protected]> Signed-off-by: Yi Chen <[email protected]> Signed-off-by: Jacob Salway <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: xuqingtan <[email protected]> Co-authored-by: Sébastien Maintrot <[email protected]> Co-authored-by: Jacob Salway <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nick Tan <[email protected]>
1 parent 94cdc52 commit ef9a2a1

36 files changed

+531
-303
lines changed

.github/workflows/integration.yaml

Lines changed: 81 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,80 @@ concurrency:
1616
cancel-in-progress: true
1717

1818
jobs:
19-
build-api-docs:
19+
code-check:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout source code
2323
uses: actions/checkout@v4
24+
with:
25+
fetch-depth: 0
2426

2527
- name: Set up Go
2628
uses: actions/setup-go@v5
2729
with:
2830
go-version-file: go.mod
2931

30-
- name: The API documentation hasn't changed
32+
- name: Run go mod tidy
3133
run: |
32-
make build-api-docs
33-
if ! git diff --quiet -- docs/api-docs.md; then
34-
echo "Need to re-run 'make build-api-docs' and commit the changes"
35-
git diff -- docs/api-docs.md;
34+
go mod tidy
35+
if ! git diff --quiet; then
36+
echo "Please run 'go mod tidy' and commit the changes."
37+
git diff
3638
false
3739
fi
3840
39-
build-sparkctl:
41+
- name: Generate code
42+
run: |
43+
make generate
44+
if ! git diff --quiet; then
45+
echo "Need to re-run 'make generate' and commit the changes."
46+
git diff
47+
false
48+
fi
49+
50+
- name: Run go fmt check
51+
run: |
52+
make go-fmt
53+
if ! git diff --quiet; then
54+
echo "Need to re-run 'make go-fmt' and commit the changes."
55+
git diff
56+
false
57+
fi
58+
59+
- name: Run go vet check
60+
run: |
61+
make go-vet
62+
if ! git diff --quiet; then
63+
echo "Need to re-run 'make go-vet' and commit the changes."
64+
git diff
65+
false
66+
fi
67+
68+
- name: Run golangci-lint
69+
run: |
70+
make go-lint
71+
72+
build-api-docs:
4073
runs-on: ubuntu-latest
4174
steps:
4275
- name: Checkout source code
4376
uses: actions/checkout@v4
77+
with:
78+
fetch-depth: 0
4479

4580
- name: Set up Go
4681
uses: actions/setup-go@v5
4782
with:
4883
go-version-file: go.mod
4984

50-
- name: build sparkctl
51-
run: make build-sparkctl
85+
- name: Build API docs
86+
run: |
87+
make build-api-docs
88+
if ! git diff --quiet; then
89+
echo "Need to re-run 'make build-api-docs' and commit the changes."
90+
git diff
91+
false
92+
fi
5293
5394
build-spark-operator:
5495
runs-on: ubuntu-latest
@@ -63,18 +104,28 @@ jobs:
63104
with:
64105
go-version-file: go.mod
65106

66-
- name: Run go fmt check
67-
run: make go-fmt
68-
69-
- name: Run go vet check
70-
run: make go-vet
71-
72-
- name: Run unit tests
107+
- name: Run go unit tests
73108
run: make unit-test
74109

75110
- name: Build Spark operator
76111
run: make build-operator
77112

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+
78129
build-helm-chart:
79130
runs-on: ubuntu-latest
80131
steps:
@@ -103,6 +154,18 @@ jobs:
103154
- name: Set up chart-testing
104155
uses: helm/[email protected]
105156

157+
- name: Generate manifests
158+
run: |
159+
make manifests
160+
if ! git diff --quiet; then
161+
echo "Need to re-run 'make manifests' and commit the changes."
162+
git diff
163+
false
164+
fi
165+
166+
- name: Detect CRDs drift between chart and manifest
167+
run: make detect-crds-drift
168+
106169
- name: Run chart-testing (list-changed)
107170
id: list-changed
108171
env:
@@ -119,22 +182,18 @@ jobs:
119182
BRANCH: ${{ steps.get_branch.outputs.BRANCH }}
120183
run: ct lint --check-version-increment=false --target-branch $BRANCH
121184

122-
- name: Detect CRDs drift between chart and manifest
123-
if: steps.list-changed.outputs.changed == 'true'
124-
run: make detect-crds-drift
125-
126185
- name: Produce the helm documentation
127186
if: steps.list-changed.outputs.changed == 'true'
128187
run: |
129188
make helm-docs
130189
if ! git diff --quiet -- charts/spark-operator-chart/README.md; then
131-
echo "Need to re-run 'make helm-docs' and commit the changes"
190+
echo "Need to re-run 'make helm-docs' and commit the changes."
132191
false
133192
fi
134193
135194
- name: setup minikube
136195
if: steps.list-changed.outputs.changed == 'true'
137-
uses: manusa/actions-setup-minikube@v2.11.0
196+
uses: manusa/actions-setup-minikube@v2.12.0
138197
with:
139198
minikube version: v1.33.0
140199
kubernetes version: v1.30.0

.golangci.yaml

Lines changed: 58 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,66 @@
11
run:
2-
deadline: 5m
2+
# Timeout for analysis, e.g. 30s, 5m.
3+
# Default: 1m
4+
timeout: 1m
35

46
linters:
7+
# Enable specific linters.
8+
# https://golangci-lint.run/usage/linters/#enabled-by-default
59
enable:
6-
- revive
7-
- gci
8-
- depguard
9-
- godot
10-
- testifylint
11-
- unconvert
10+
# Detects places where loop variables are copied.
11+
- copyloopvar
12+
# Checks for duplicate words in the source code.
13+
- dupword
14+
# Tool for detection of FIXME, TODO and other comment keywords.
15+
# - godox
16+
# Check import statements are formatted according to the 'goimport' command.
17+
- goimports
18+
# Enforces consistent import aliases.
19+
- importas
20+
# Find code that shadows one of Go's predeclared identifiers.
21+
- predeclared
22+
# Check that struct tags are well aligned.
23+
- tagalign
24+
# Remove unnecessary type conversions.
25+
- unconvert
26+
# Checks Go code for unused constants, variables, functions and types.
27+
- unused
1228

1329
issues:
14-
exclude-rules:
15-
# Disable errcheck linter for test files.
16-
- path: _test.go
17-
linters:
18-
- errcheck
30+
# Which dirs to exclude: issues from them won't be reported.
31+
# Can use regexp here: `generated.*`, regexp is applied on full path,
32+
# including the path prefix if one is set.
33+
# Default dirs are skipped independently of this option's value (see exclude-dirs-use-default).
34+
# "/" will be replaced by current OS file path separator to properly work on Windows.
35+
# Default: []
36+
exclude-dirs:
37+
- sparkctl
38+
# Maximum issues count per one linter.
39+
# Set to 0 to disable.
40+
# Default: 50
41+
max-issues-per-linter: 50
42+
# Maximum count of issues with the same text.
43+
# Set to 0 to disable.
44+
# Default: 3
45+
max-same-issues: 3
1946

2047
linters-settings:
21-
gci:
22-
sections:
23-
- standard
24-
- default
25-
- prefix(github.com/kubeflow/spark-operator)
26-
depguard:
27-
Main:
28-
files:
29-
- $all
30-
- "!$test"
31-
listMode: Lax
32-
deny:
33-
reflect: Please don't use reflect package
34-
Test:
35-
files:
36-
- $test
37-
listMode: Lax
38-
deny:
39-
reflect: Please don't use reflect package
48+
importas:
49+
# List of aliases
50+
alias:
51+
- pkg: k8s.io/api/admissionregistration/v1
52+
alias: admissionregistrationv1
53+
- pkg: k8s.io/api/apps/v1
54+
alias: appsv1
55+
- pkg: k8s.io/api/batch/v1
56+
alias: batchv1
57+
- pkg: k8s.io/api/core/v1
58+
alias: corev1
59+
- pkg: k8s.io/api/extensions/v1beta1
60+
alias: extensionsv1beta1
61+
- pkg: k8s.io/api/networking/v1
62+
alias: networkingv1
63+
- pkg: k8s.io/apimachinery/pkg/apis/meta/v1
64+
alias: metav1
65+
- pkg: sigs.k8s.io/controller-runtime
66+
alias: ctrl

Dockerfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ FROM golang:1.23.1 AS builder
2020

2121
WORKDIR /workspace
2222

23-
RUN apt-get update \
24-
&& apt-get install -y libcap2-bin \
25-
&& rm -rf /var/lib/apt/lists/*
26-
2723
RUN --mount=type=cache,target=/go/pkg/mod/ \
2824
--mount=type=bind,source=go.mod,target=go.mod \
2925
--mount=type=bind,source=go.sum,target=go.sum \
@@ -36,7 +32,6 @@ ARG TARGETARCH
3632
RUN --mount=type=cache,target=/go/pkg/mod/ \
3733
--mount=type=cache,target="/root/.cache/go-build" \
3834
CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} GO111MODULE=on make build-operator
39-
RUN setcap 'cap_net_bind_service=+ep' /workspace/bin/spark-operator
4035

4136
FROM ${SPARK_IMAGE}
4237

@@ -46,9 +41,9 @@ RUN apt-get update \
4641
&& apt-get install -y tini \
4742
&& rm -rf /var/lib/apt/lists/*
4843

49-
RUN mkdir -p /etc/k8s-webhook-server/serving-certs && \
44+
RUN mkdir -p /etc/k8s-webhook-server/serving-certs /home/spark && \
5045
chmod -R g+rw /etc/k8s-webhook-server/serving-certs && \
51-
chown -R spark /etc/k8s-webhook-server/serving-certs
46+
chown -R spark /etc/k8s-webhook-server/serving-certs /home/spark
5247

5348
USER spark
5449

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ KIND_VERSION ?= v0.23.0
5555
ENVTEST_VERSION ?= release-0.18
5656
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5757
ENVTEST_K8S_VERSION ?= 1.29.3
58-
GOLANGCI_LINT_VERSION ?= v1.57.2
58+
GOLANGCI_LINT_VERSION ?= v1.61.0
5959
GEN_CRD_API_REFERENCE_DOCS_VERSION ?= v0.3.0
6060
HELM_VERSION ?= v3.15.3
6161
HELM_UNITTEST_VERSION ?= 0.5.1
@@ -136,13 +136,13 @@ go-vet: ## Run go vet against code.
136136
@echo "Running go vet..."
137137
go vet ./...
138138

139-
.PHONY: lint
140-
lint: golangci-lint ## Run golangci-lint linter.
139+
.PHONY: go-lint
140+
go-lint: golangci-lint ## Run golangci-lint linter.
141141
@echo "Running golangci-lint run..."
142142
$(GOLANGCI_LINT) run
143143

144-
.PHONY: lint-fix
145-
lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes.
144+
.PHONY: go-lint-fix
145+
go-lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes.
146146
@echo "Running golangci-lint run --fix..."
147147
$(GOLANGCI_LINT) run --fix
148148

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2.0.1
1+
v2.0.2

api/v1beta1/sparkapplication_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ type SparkApplicationSpec struct {
7070
// spark-submit.
7171
// Optional.
7272
SparkConf map[string]string `json:"sparkConf,omitempty"`
73-
// HadoopConf carries user-specified Hadoop configuration properties as they would use the the "--conf" option
74-
// in spark-submit. The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
73+
// HadoopConf carries user-specified Hadoop configuration properties as they would use the "--conf" option
74+
// in spark-submit. The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
7575
// configuration properties.
7676
// Optional.
7777
HadoopConf map[string]string `json:"hadoopConf,omitempty"`

api/v1beta2/defaults.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ func SetSparkApplicationDefaults(app *SparkApplication) {
5454
}
5555

5656
func setDriverSpecDefaults(spec *DriverSpec, sparkConf map[string]string) {
57-
5857
if _, exists := sparkConf["spark.driver.cores"]; !exists && spec.Cores == nil {
5958
spec.Cores = new(int32)
6059
*spec.Cores = 1

api/v1beta2/defaults_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ func TestSetSparkApplicationDefaultsOnFailureRestartPolicyShouldSetDefaultValueF
121121
}
122122

123123
func TestSetSparkApplicationDefaultsDriverSpecDefaults(t *testing.T) {
124-
125124
//Case1: Driver config not set.
126125
app := &SparkApplication{
127126
Spec: SparkApplicationSpec{},

api/v1beta2/doc.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ limitations under the License.
1515
*/
1616

1717
// +k8s:deepcopy-gen=package,register
18-
// go:generate controller-gen crd:trivialVersions=true paths=. output:dir=.
1918

2019
// Package v1beta2 is the v1beta2 version of the API.
2120
// +groupName=sparkoperator.k8s.io

api/v1beta2/sparkapplication_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ type SparkApplicationSpec struct {
7171
// spark-submit.
7272
// +optional
7373
SparkConf map[string]string `json:"sparkConf,omitempty"`
74-
// HadoopConf carries user-specified Hadoop configuration properties as they would use the the "--conf" option
75-
// in spark-submit. The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
74+
// HadoopConf carries user-specified Hadoop configuration properties as they would use the "--conf" option
75+
// in spark-submit. The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
7676
// configuration properties.
7777
// +optional
7878
HadoopConf map[string]string `json:"hadoopConf,omitempty"`

charts/spark-operator-chart/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ name: spark-operator
2020

2121
description: A Helm chart for Spark on Kubernetes operator.
2222

23-
version: 2.0.1
23+
version: 2.0.2
2424

25-
appVersion: 2.0.1
25+
appVersion: 2.0.2
2626

2727
keywords:
2828
- apache spark

0 commit comments

Comments
 (0)