From 91bf0ab76840c073938a121c4c6732a4566f0004 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.de>
Date: Tue, 18 Jul 2023 10:24:25 +0000
Subject: [PATCH] fix: Typo in executor cpu limit property (#263)

# Description

Introduced in https://github.com/stackabletech/spark-k8s-operator/pull/256
---
 CHANGELOG.md                                         | 12 +++++++-----
 rust/crd/src/lib.rs                                  |  4 ++--
 tests/templates/kuttl/resources/10-assert.yaml.j2    |  4 ++--
 .../kuttl/resources/10-deploy-spark-app.yaml.j2      |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 662158ba..a72e97ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
@@ -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
 
diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs
index 17ca743e..46545cc9 100644
--- a/rust/crd/src/lib.rs
+++ b/rust/crd/src/lib.rs
@@ -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 {
@@ -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(),
             ),
         ]
diff --git a/tests/templates/kuttl/resources/10-assert.yaml.j2 b/tests/templates/kuttl/resources/10-assert.yaml.j2
index 2471489b..99d08dbc 100644
--- a/tests/templates/kuttl/resources/10-assert.yaml.j2
+++ b/tests/templates/kuttl/resources/10-assert.yaml.j2
@@ -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
diff --git a/tests/templates/kuttl/resources/10-deploy-spark-app.yaml.j2 b/tests/templates/kuttl/resources/10-deploy-spark-app.yaml.j2
index c98918b2..90e458ec 100644
--- a/tests/templates/kuttl/resources/10-deploy-spark-app.yaml.j2
+++ b/tests/templates/kuttl/resources/10-deploy-spark-app.yaml.j2
@@ -31,7 +31,7 @@ spec:
     resources:
       cpu:
         min: 200m
-        max: 1000m
+        max: 1200m
       memory:
         limit: 1024Mi
   executor: