Skip to content

Commit fedf814

Browse files
committed
chore: Remove hardcoded uid and gid
1 parent 8f42276 commit fedf814

File tree

4 files changed

+2
-9
lines changed

4 files changed

+2
-9
lines changed

rust/operator-binary/src/connect/server.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ use crate::{
4848
constants::{
4949
JVM_SECURITY_PROPERTIES_FILE, LISTENER_VOLUME_DIR, LISTENER_VOLUME_NAME,
5050
LOG4J2_CONFIG_FILE, MAX_SPARK_LOG_FILES_SIZE, METRICS_PROPERTIES_FILE,
51-
POD_TEMPLATE_FILE, SPARK_DEFAULTS_FILE_NAME, SPARK_UID, VOLUME_MOUNT_NAME_CONFIG,
51+
POD_TEMPLATE_FILE, SPARK_DEFAULTS_FILE_NAME, VOLUME_MOUNT_NAME_CONFIG,
5252
VOLUME_MOUNT_NAME_LOG, VOLUME_MOUNT_NAME_LOG_CONFIG, VOLUME_MOUNT_PATH_CONFIG,
5353
VOLUME_MOUNT_PATH_LOG, VOLUME_MOUNT_PATH_LOG_CONFIG,
5454
},
@@ -246,8 +246,6 @@ pub(crate) fn build_stateful_set(
246246
)
247247
.context(AddVolumeSnafu)?
248248
.security_context(PodSecurityContext {
249-
run_as_user: Some(SPARK_UID),
250-
run_as_group: Some(0),
251249
fs_group: Some(1000),
252250
..PodSecurityContext::default()
253251
});

rust/operator-binary/src/crd/constants.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ pub const SPARK_DEFAULTS_FILE_NAME: &str = "spark-defaults.conf";
8686
pub const SPARK_ENV_SH_FILE_NAME: &str = "spark-env.sh";
8787

8888
pub const SPARK_CLUSTER_ROLE: &str = "spark-k8s-clusterrole";
89-
pub const SPARK_UID: i64 = 1000;
9089
pub const METRICS_PORT: u16 = 18081;
9190
pub const HISTORY_UI_PORT: u16 = 18080;
9291

rust/operator-binary/src/history/history_controller.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ use crate::{
5858
HISTORY_UI_PORT, JVM_SECURITY_PROPERTIES_FILE, LISTENER_VOLUME_DIR,
5959
LISTENER_VOLUME_NAME, MAX_SPARK_LOG_FILES_SIZE, METRICS_PORT, OPERATOR_NAME,
6060
SECRET_ACCESS_KEY, SPARK_DEFAULTS_FILE_NAME, SPARK_ENV_SH_FILE_NAME,
61-
SPARK_IMAGE_BASE_NAME, SPARK_UID, STACKABLE_TRUST_STORE, VOLUME_MOUNT_NAME_CONFIG,
61+
SPARK_IMAGE_BASE_NAME, STACKABLE_TRUST_STORE, VOLUME_MOUNT_NAME_CONFIG,
6262
VOLUME_MOUNT_NAME_LOG, VOLUME_MOUNT_NAME_LOG_CONFIG, VOLUME_MOUNT_PATH_CONFIG,
6363
VOLUME_MOUNT_PATH_LOG, VOLUME_MOUNT_PATH_LOG_CONFIG,
6464
},
@@ -544,8 +544,6 @@ fn build_stateful_set(
544544
)
545545
.context(AddVolumeSnafu)?
546546
.security_context(PodSecurityContext {
547-
run_as_user: Some(SPARK_UID),
548-
run_as_group: Some(0),
549547
fs_group: Some(1000),
550548
..PodSecurityContext::default()
551549
});

rust/operator-binary/src/spark_k8s_controller.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,8 +1023,6 @@ fn build_spark_role_serviceaccount(
10231023

10241024
fn security_context() -> PodSecurityContext {
10251025
PodSecurityContext {
1026-
run_as_user: Some(SPARK_UID),
1027-
run_as_group: Some(0),
10281026
fs_group: Some(1000),
10291027
..PodSecurityContext::default()
10301028
}

0 commit comments

Comments
 (0)