Skip to content

[Merged by Bors] - fix: Typo in executor cpu limit property #263

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.

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

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,21 @@ All notable changes to this project will be documented in this file.
- Add support for using custom certificates when accessing S3 with TLS ([#247]).
- Use bitnami charts for testing S3 access with TLS ([#247]).
- Set explicit resources on all containers ([#249]).
- Support pod overrides ([#256])
- Support pod overrides ([#256]).

### Changed

- `operator-rs` `0.38.0` -> `0.44.0` ([#235], [#259]).
- Use 0.0.0-dev product images for testing ([#236])
- Use testing-tools 0.2.0 ([#236])
- Use 0.0.0-dev product images for testing ([#236]).
- Use testing-tools 0.2.0 ([#236]).
- Run as root group ([#241]).
- Added kuttl test suites ([#252])
- Added kuttl test suites ([#252]).

### Fixed

- Fix quoting issues when spark config values contain spaces ([#243]).
- Increase the size limit of log volumes (#[259])
- Increase the size limit of log volumes ([#259]).
- Typo in executor cpu limit property ([#263]).

[#235]: https://github.com/stackabletech/spark-k8s-operator/pull/235
[#236]: https://github.com/stackabletech/spark-k8s-operator/pull/236
Expand All @@ -38,6 +39,7 @@ All notable changes to this project will be documented in this file.
[#249]: https://github.com/stackabletech/spark-k8s-operator/pull/249
[#256]: https://github.com/stackabletech/spark-k8s-operator/pull/256
[#259]: https://github.com/stackabletech/spark-k8s-operator/pull/259
[#263]: https://github.com/stackabletech/spark-k8s-operator/pull/263

## [23.4.0] - 2023-04-17

Expand Down
4 changes: 2 additions & 2 deletions rust/crd/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ fn resources_to_executor_props(
"spark.kubernetes.executor.request.cores".to_string(),
cores.clone(),
);
props.insert("spark.kubernetes.executors.limit.cores".to_string(), cores);
props.insert("spark.kubernetes.executor.limit.cores".to_string(), cores);
}

if let Resources {
Expand Down Expand Up @@ -1532,7 +1532,7 @@ spec:
"512m".to_string(),
),
(
"spark.kubernetes.executors.limit.cores".to_string(),
"spark.kubernetes.executor.limit.cores".to_string(),
"2".to_string(),
),
]
Expand Down
4 changes: 2 additions & 2 deletions tests/templates/kuttl/resources/10-assert.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ spec:
resources:
# these resources are set via Spark submit properties like "spark.driver.cores"
limits:
cpu: "1"
cpu: "2"
memory: 1Gi
requests:
cpu: "1"
cpu: "2"
memory: 1Gi
---
apiVersion: v1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
resources:
cpu:
min: 200m
max: 1000m
max: 1200m
memory:
limit: 1024Mi
executor:
Expand Down