Skip to content

Commit ab22dc4

Browse files
committed
add cluster roles for connect and history apps and update more labels
1 parent 63858fa commit ab22dc4

File tree

4 files changed

+98
-5
lines changed

4 files changed

+98
-5
lines changed

deploy/helm/spark-k8s-operator/templates/roles.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@ rules:
1818
resources:
1919
- persistentvolumeclaims
2020
verbs:
21+
- create
22+
- delete
23+
- deletecollection
24+
- get
2125
- list
26+
- patch
27+
- update
28+
- watch
2229
- apiGroups:
2330
- ""
2431
resources:
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
kind: ClusterRole
4+
metadata:
5+
name: spark-connect-clusterrole
6+
labels:
7+
{{- include "operator.labels" . | nindent 4 }}
8+
rules:
9+
- apiGroups:
10+
- ""
11+
resources:
12+
- configmaps
13+
- persistentvolumeclaims
14+
- pods
15+
- secrets
16+
- serviceaccounts
17+
- services
18+
verbs:
19+
- create
20+
- delete
21+
- deletecollection
22+
- get
23+
- list
24+
- patch
25+
- update
26+
- watch
27+
- apiGroups:
28+
- events.k8s.io
29+
resources:
30+
- events
31+
verbs:
32+
- create
33+
{{ if .Capabilities.APIVersions.Has "security.openshift.io/v1" }}
34+
- apiGroups:
35+
- security.openshift.io
36+
resources:
37+
- securitycontextconstraints
38+
resourceNames:
39+
- nonroot-v2
40+
verbs:
41+
- use
42+
{{ end }}
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
kind: ClusterRole
4+
metadata:
5+
name: spark-history-clusterrole
6+
labels:
7+
{{- include "operator.labels" . | nindent 4 }}
8+
rules:
9+
- apiGroups:
10+
- ""
11+
resources:
12+
- configmaps
13+
- persistentvolumeclaims
14+
- pods
15+
- secrets
16+
- serviceaccounts
17+
- services
18+
verbs:
19+
- create
20+
- delete
21+
- deletecollection
22+
- get
23+
- list
24+
- patch
25+
- update
26+
- watch
27+
- apiGroups:
28+
- events.k8s.io
29+
resources:
30+
- events
31+
verbs:
32+
- create
33+
{{ if .Capabilities.APIVersions.Has "security.openshift.io/v1" }}
34+
- apiGroups:
35+
- security.openshift.io
36+
resources:
37+
- securitycontextconstraints
38+
resourceNames:
39+
- nonroot-v2
40+
verbs:
41+
- use
42+
{{ end }}

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ use stackable_operator::{
3535
role_utils::RoleGroupRef,
3636
};
3737

38+
use super::crd::CONNECT_APP_NAME;
3839
use crate::{
3940
connect::{
4041
common::{self, SparkConnectRole, object_name},
@@ -45,7 +46,7 @@ use crate::{
4546
},
4647
crd::{
4748
constants::{
48-
APP_NAME, JVM_SECURITY_PROPERTIES_FILE, LISTENER_VOLUME_DIR, LISTENER_VOLUME_NAME,
49+
JVM_SECURITY_PROPERTIES_FILE, LISTENER_VOLUME_DIR, LISTENER_VOLUME_NAME,
4950
LOG4J2_CONFIG_FILE, MAX_SPARK_LOG_FILES_SIZE, METRICS_PROPERTIES_FILE,
5051
POD_TEMPLATE_FILE, SPARK_DEFAULTS_FILE_NAME, SPARK_UID, VOLUME_MOUNT_NAME_CONFIG,
5152
VOLUME_MOUNT_NAME_LOG, VOLUME_MOUNT_NAME_LOG_CONFIG, VOLUME_MOUNT_PATH_CONFIG,
@@ -370,7 +371,7 @@ pub(crate) fn build_stateful_set(
370371
match_labels: Some(
371372
Labels::role_group_selector(
372373
scs,
373-
APP_NAME,
374+
CONNECT_APP_NAME,
374375
&SparkConnectRole::Server.to_string(),
375376
DUMMY_SPARK_CONNECT_GROUP_NAME,
376377
)
@@ -393,9 +394,10 @@ pub(crate) fn build_internal_service(
393394
) -> Result<Service, Error> {
394395
let service_name = object_name(&scs.name_any(), SparkConnectRole::Server);
395396

396-
let selector = Labels::role_selector(scs, APP_NAME, &SparkConnectRole::Server.to_string())
397-
.context(LabelBuildSnafu)?
398-
.into();
397+
let selector =
398+
Labels::role_selector(scs, CONNECT_APP_NAME, &SparkConnectRole::Server.to_string())
399+
.context(LabelBuildSnafu)?
400+
.into();
399401

400402
Ok(Service {
401403
metadata: ObjectMetaBuilder::new()

0 commit comments

Comments
 (0)