Skip to content

Commit a6bb35d

Browse files
committed
Merge spark deployment of master and history server
1 parent e32f2eb commit a6bb35d

File tree

13 files changed

+150
-160
lines changed

13 files changed

+150
-160
lines changed

docker/playground/Dockerfile

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# syntax=docker/dockerfile:1
22
FROM ghcr.io/fxttr/spark:latest
33

4+
ARG USERNAME=spark
5+
ARG USER_UID=185
6+
7+
USER root
8+
49
RUN apt update && apt upgrade -y && \
510
apt install -y --no-install-recommends \
611
python3 \
@@ -29,8 +34,10 @@ COPY conf/ipython/startup/README /root/.ipython/profile_default/startup
2934
COPY conf/notebook ${BIN_DIR}/notebook
3035
COPY conf/notebook ${BIN_DIR}/pyspark-notebook
3136

32-
RUN chmod u+x ${BIN_DIR}/notebook && chmod u+x ${BIN_DIR}/pyspark-notebook
37+
RUN chown ${USERNAME} ${BIN_DIR}/notebook && chmod u+x ${BIN_DIR}/notebook
38+
RUN chown ${USERNAME} ${BIN_DIR}/pyspark-notebook && chmod u+x ${BIN_DIR}/pyspark-notebook
3339

3440
EXPOSE 8888
3541

42+
USER ${USER_UID}
3643
CMD ["notebook"]

k8s/clickhouse/base/secrets.yaml

+17-17
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ metadata:
44
name: clickhouse-operator-secret
55
type: Opaque
66
stringData:
7-
username: ENC[AES256_GCM,data:8jCUAhnVdgxuKLnwKlrg3Xhstg==,iv:II1ngue3DKTRPk0it/Q/Kg9Js/gNzQNL2R57a4Zs7no=,tag:GoR5HHKbNAnUOjaom7dePQ==,type:str]
8-
password: ENC[AES256_GCM,data:Flq2sW9Hvy5ScF9jtKKq8RhOpN9NPlOS3A==,iv:nufP1R/HbMZ30+AhIFSzFVtoZGA5i4xvgmb4p2B0xrk=,tag:rdmRbjBxdyRAUpQRmNXy0g==,type:str]
7+
username: ENC[AES256_GCM,data:X0njqHUNdmV1jDoxHaa1OL3awA==,iv:6MtaR6p/B37sKk4N5CJ5tMGsK3N/q3DreU5gdglQsv4=,tag:16ujsWSTLP+SXNSDbeDjiw==,type:str]
8+
password: ENC[AES256_GCM,data:ID8c1MTkbDfebof2y2U0c9oj/Wm/mw9p8Q==,iv:EaECKCAEiLJIK14Dx5tIC7ImXEBa4nyV8QGmTf6T7wk=,tag:/+7qOiGksmaG7M8WODjqNA==,type:str]
99
sops:
1010
kms: []
1111
gcp_kms: []
@@ -15,14 +15,14 @@ sops:
1515
- recipient: age1dwu9ccy3t86c4tgd4ufs4jkmv572jfflkvdejm5kvjf95r3qsgus847qgd
1616
enc: |
1717
-----BEGIN AGE ENCRYPTED FILE-----
18-
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBySnkvbUFhK25xdURYSHUv
19-
UHZPb0dmbU9VQ083bEJYWngwUG91ZHFUYVdRCm13Y0xmU25Kb2JJOGQzWW9XSDlS
20-
ak82Y0JKYWdHZzBHVmw2L2RQVW9MQnMKLS0tIEx5a3FPYzVGZ3BkeG5DWjRJU1ZN
21-
MU9qOHFYZHFURzV2MkwzZldFY0pWN2sKspB2jhBXZDsQGwma902Z8jtjAiew4Ug8
22-
Hc6ZPrBhHhiqWw4yRDYV2f9wx/YjtA8/vakkEn9SOImjJmIZ7/jlWg==
18+
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhMnBEKzIwSUtvMDkxSzdB
19+
dkM0Z2x1UEE5RStGTDBjSEFjMEhFR0I3M0dFCmZVSzZnb1BxMk9CZk14UHVkclN2
20+
czNpTk1kT0JreWRPSER4MTBJWEhEZE0KLS0tIFhPeFVXeU43QVF6b0h1ZUNpWXZy
21+
MjBYd2ZZYkRqaXJHUmpWN3Q3M2pDcFkKexMvNLMyFLARYxO48Wq04WrIPP+tdp7k
22+
cmGuNAngFm1E3gh4J7TgRtDbKjm+klAGklpaX2q7vSb7MleMYAkyng==
2323
-----END AGE ENCRYPTED FILE-----
24-
lastmodified: "2024-12-14T21:02:24Z"
25-
mac: ENC[AES256_GCM,data:psdLcNIZwVHkSIinyJZf4dhVc0n88iKMvL3neQ37k0OUNuolDjKuKgDnzrIFCaA+lKAj+d2IFWhPj0XhyANqrwP4Qb4CXr6ca8iT8IFsIVzDVaiHiijtOHcoY+H+kyA7TG4NA3d2EIon9HsRe9DnSqpnTRlZIu9e1TGP6agL60g=,iv:CLQDlaSyKSNuaLlIzlhpwakXQmDYUhqj8FBxCveoeTE=,tag:BhpVMCYUwDapGypaU/Fa6Q==,type:str]
24+
lastmodified: "2024-12-14T22:01:43Z"
25+
mac: ENC[AES256_GCM,data:Zj7SEBAvZ/4T2Iga6wGw1bugTYzcmxH+3GhFsropt7O+vtH27vy32aqY/Fa+6IkoPerZBxBh9PzPNQ8wkt7Wh8oBoTR1Cdc1J42YltFbncCrqU+UrOVDMfaBxOpSQ9o1RmEBOvjp3KFmnM9NjlWq165ORs7BYvfSOvWmsCf29Ho=,iv:ED7/+YXkhxr//OwjnGs75VIu+oTujFXwGFTqVxzwUic=,tag:RheBnT30efJw+MqTNtYiSw==,type:str]
2626
pgp: []
2727
encrypted_regex: ^(data|stringData)$
2828
version: 3.9.1
@@ -33,7 +33,7 @@ metadata:
3333
name: clickhouse-user-secret
3434
type: Opaque
3535
data:
36-
password: ENC[AES256_GCM,data:tdoFFmfpIhFj0WPZdXyZAA==,iv:quVnu3XQJrgAXLcg4Hi0KtYKy/3cFMQ3DdnceTgNcIA=,tag:C8UKmCDUC3VHmtw4etTvOg==,type:str]
36+
password: ENC[AES256_GCM,data:6WNJIxoSr7KT2ZUVg+RuIg==,iv:n6dj1LrNrhz/9L1YeDtbi0FD+nUEezzjgGJHRA0qOqk=,tag:2n2/o1lNluGq0J5BzROCUQ==,type:str]
3737
sops:
3838
kms: []
3939
gcp_kms: []
@@ -43,14 +43,14 @@ sops:
4343
- recipient: age1dwu9ccy3t86c4tgd4ufs4jkmv572jfflkvdejm5kvjf95r3qsgus847qgd
4444
enc: |
4545
-----BEGIN AGE ENCRYPTED FILE-----
46-
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBySnkvbUFhK25xdURYSHUv
47-
UHZPb0dmbU9VQ083bEJYWngwUG91ZHFUYVdRCm13Y0xmU25Kb2JJOGQzWW9XSDlS
48-
ak82Y0JKYWdHZzBHVmw2L2RQVW9MQnMKLS0tIEx5a3FPYzVGZ3BkeG5DWjRJU1ZN
49-
MU9qOHFYZHFURzV2MkwzZldFY0pWN2sKspB2jhBXZDsQGwma902Z8jtjAiew4Ug8
50-
Hc6ZPrBhHhiqWw4yRDYV2f9wx/YjtA8/vakkEn9SOImjJmIZ7/jlWg==
46+
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhMnBEKzIwSUtvMDkxSzdB
47+
dkM0Z2x1UEE5RStGTDBjSEFjMEhFR0I3M0dFCmZVSzZnb1BxMk9CZk14UHVkclN2
48+
czNpTk1kT0JreWRPSER4MTBJWEhEZE0KLS0tIFhPeFVXeU43QVF6b0h1ZUNpWXZy
49+
MjBYd2ZZYkRqaXJHUmpWN3Q3M2pDcFkKexMvNLMyFLARYxO48Wq04WrIPP+tdp7k
50+
cmGuNAngFm1E3gh4J7TgRtDbKjm+klAGklpaX2q7vSb7MleMYAkyng==
5151
-----END AGE ENCRYPTED FILE-----
52-
lastmodified: "2024-12-14T21:02:24Z"
53-
mac: ENC[AES256_GCM,data:psdLcNIZwVHkSIinyJZf4dhVc0n88iKMvL3neQ37k0OUNuolDjKuKgDnzrIFCaA+lKAj+d2IFWhPj0XhyANqrwP4Qb4CXr6ca8iT8IFsIVzDVaiHiijtOHcoY+H+kyA7TG4NA3d2EIon9HsRe9DnSqpnTRlZIu9e1TGP6agL60g=,iv:CLQDlaSyKSNuaLlIzlhpwakXQmDYUhqj8FBxCveoeTE=,tag:BhpVMCYUwDapGypaU/Fa6Q==,type:str]
52+
lastmodified: "2024-12-14T22:01:43Z"
53+
mac: ENC[AES256_GCM,data:Zj7SEBAvZ/4T2Iga6wGw1bugTYzcmxH+3GhFsropt7O+vtH27vy32aqY/Fa+6IkoPerZBxBh9PzPNQ8wkt7Wh8oBoTR1Cdc1J42YltFbncCrqU+UrOVDMfaBxOpSQ9o1RmEBOvjp3KFmnM9NjlWq165ORs7BYvfSOvWmsCf29Ho=,iv:ED7/+YXkhxr//OwjnGs75VIu+oTujFXwGFTqVxzwUic=,tag:RheBnT30efJw+MqTNtYiSw==,type:str]
5454
pgp: []
5555
encrypted_regex: ^(data|stringData)$
5656
version: 3.9.1

k8s/dagster/base/secrets.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
app: dagster-database
77
type: Opaque
88
data:
9-
postgresql-password: ENC[AES256_GCM,data:5d+Nso/M+17NUB/dCWS1XpGZjgFRGz1X,iv:mU/gg3F62LXhsMimpuRQDDgJ2vj7Jc1VIeQH1+Q5aYY=,tag:sDRqGDnScdxvHXcwOeoc8Q==,type:str]
9+
postgresql-password: ENC[AES256_GCM,data:KvQ+HpwvZECXqpOgqwal+VC1rH2mG1RL,iv:SYeveUfQSMZKYUBppQAmqYdJt8bP79eXi0cm0stTUo8=,tag:l5kAmVL0kyHEHxZ5jaWgjg==,type:str]
1010
sops:
1111
kms: []
1212
gcp_kms: []
@@ -16,14 +16,14 @@ sops:
1616
- recipient: age1dwu9ccy3t86c4tgd4ufs4jkmv572jfflkvdejm5kvjf95r3qsgus847qgd
1717
enc: |
1818
-----BEGIN AGE ENCRYPTED FILE-----
19-
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJSDY2ZHEzMGYweGRiTUZh
20-
SkZXSHJLUWxZUUh5SFRKV3hpQ0ExNUpvdVNJCm9KeFVhV3p5SmZGMU1kcmZTN1do
21-
dHdJVUZpTWw0WDhjVVZUU1B2TnFtRkkKLS0tIE96QXNlOTBwU01PMTVjOGszc0Nv
22-
cXBvRWg4VVFYZnVGbEt1TGFxZ0ZZVEEKxY4H/xrk4O3T6+1tc79VKEL6AV98eYe3
23-
7AM7kx1INxjG71W9ZGNXqlcM+mNr+EE8EjEVcXgAtZdl6p2RR3afBQ==
19+
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBRDlDTjBFbGhMQ2QzTzFa
20+
N1BhcjUzTVFxbFUxU2lZOFllM2h3S2laeWdzCjRBTzhWdjBzK2p5QkNIdWQwK2N6
21+
SVlveGpzSXFiVGliMDhhQURqVllKWHcKLS0tIGtFTTVuRnI3ZXZka3J3Y3dvZ3FL
22+
SWFhc3kwWXZlOWxOQmtuRTFBaTlHVXcKRJJyap7Osgh+jv+yp+Y0vroKNVEuS8Mo
23+
SVWYbfytqaGD+Rsj8xOv2U9R+QP3c+tjauY6V0OwzVVVeN0or/QT7w==
2424
-----END AGE ENCRYPTED FILE-----
25-
lastmodified: "2024-12-14T21:02:25Z"
26-
mac: ENC[AES256_GCM,data:sOOuanYMLjoOjbO6ff1odRCv4PwaKepd1ilvnQex6AnsxWhSlf8g9u29yW6hZ7NNO9J62CQ+tMotS05oQcXS64TJaCe1aRsluY0IGrRRQcRoTS8tgGppi17gL+hLbO+Oe4VzxJRvwZYEu41KSIsO5gKfZCx0Fnggo/Dyz2Fgr3c=,iv:alBW8LJf6WTJcXy6LIMENXIk8DuZLym+JrOlHXqqjQ0=,tag:8+6deznjAc2lp2Voh+NUpA==,type:str]
25+
lastmodified: "2024-12-14T22:01:43Z"
26+
mac: ENC[AES256_GCM,data:lj8A62GqFpBoXcGg4jJM53Epg7H8B6TF/3jpjIQTjG76ZXBq2R0cO42HWxyBJhrVyVmHIhamxeGP2nbJhOdxaUbfiz3uYFtdWTlMYuWu/ucWVR6Rzjj49zorQv4Xfg1vjOvs6QwmEqIaZchWWcRynoW2rCKKAWDr1aQfSicXi/I=,iv:DkdLnjd/oEO3GQnTa2xPRlqTGrxXJsinW+VYRbdsGUg=,tag:TWI60+wgmsfCSG6U/NlcUw==,type:str]
2727
pgp: []
2828
encrypted_regex: ^(data|stringData)$
2929
version: 3.9.1

k8s/minio/base/secrets.yaml

+17-17
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: storage-configuration
55
type: Opaque
66
stringData:
7-
config.env: ENC[AES256_GCM,data:jc7YoExX/tx4mdLslTJONh53VS9kNAfB+J2i72PhUXTCHCPgTTtmPs3mqT5OnE5HBURyXUg31pxoq/KH/nL/Dt2DyIhN7qtOhcC25XkdkUASiI1ObOko/qmlAH9bYPkmoo6Ch/i9OskiUnOw0wKAVCw3Uttzbg9/sp9qjKa1ktSsvvVYLf+Y1L/WxQQR,iv:yS4stIbr+kSqCgQyhwrlIGBVQHH68EPJEMyKPNvoEms=,tag:xuEscpItwrAQ2WTohm0m4g==,type:str]
7+
config.env: ENC[AES256_GCM,data:v4jpzsTRhlJoegg7fevyEs41alM1/gRnrX9ZvpuQypuIpzmtKKaRDuFSojkA71gxQcjb8/m+fZ3emjgC4noh2EjW8hgCEjRFVnX0OM7LFoAOl2kgNB1o8IkQWQiLClbljr5IqcByf+iDxtiZRFOEPL/lkRTYN1GVQzPH/25+KhA3sNdQcO2/EWjA4MZc,iv:sbVqB14HVZgpppobmENQYR5+y0G48dyxKpHmt/tlKsM=,tag:dFDJgWzwE8vOEbjeCJkRwQ==,type:str]
88
sops:
99
kms: []
1010
gcp_kms: []
@@ -14,14 +14,14 @@ sops:
1414
- recipient: age1dwu9ccy3t86c4tgd4ufs4jkmv572jfflkvdejm5kvjf95r3qsgus847qgd
1515
enc: |
1616
-----BEGIN AGE ENCRYPTED FILE-----
17-
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKY28yY2l2TmJxZUNIMlJy
18-
bzkyOFdlTDdIZ0lrRDBnRjBkL2lCaWFBNkVVCnRUYm8ySE4rM3hWNExpS3Y1TVdh
19-
aC8zN3ZZT3Rac2t3R0VDMzZLT0QyZDQKLS0tIEV3Q2dhTmhSUkJxaytrdW1TWlA3
20-
TXR5SmhOV1lCOHNnV21pR3d4MnB1NlkKZbhrP7nfIAOt5BFZnx2SJvYvegqKqkMK
21-
r4zNkacSIzKxFXqzd1yS6hhvqtZ/FU7I5eR6MZ6EVhNb5iMei1XXGQ==
17+
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0aUtXdHMzME5qTWlOM1NR
18+
Njhlb0tFK0doZElTNVdaR0Z2N3NWbGJrem5BCkE3QTJHU1k4MFpiSlhYYUNqd1JQ
19+
bEtYRFluV0thdHVFcUtVa0pmYTlqb2MKLS0tIFRNckhGUzU3YVRMZ1FndXppTWRZ
20+
bDZCWm5KUVNYQ1c2K25JUnkyOUdxMkUK8YsVu+A50Y33ONDCzO5iRodQcQNMY2e4
21+
JJ0gIhLIejJs/Jb739/h/8uOonC5IwUgOVF7YZKXXkyTNtJ6eAFrcA==
2222
-----END AGE ENCRYPTED FILE-----
23-
lastmodified: "2024-12-14T21:02:25Z"
24-
mac: ENC[AES256_GCM,data:p+DRG3i55HKL+M0yyWB2F8rjjJfIk6RZ4A2YuYBTTSoMTwPxeHK51NOHgnAocKuD769hpIiRugfpc5j2C8aaMhNMBK6i3liAnrEyp99rsyXSN3YuQ32u6QMwkdC1yLRjphTST5/HRgc5Pkz5qWwSI55bMf8+ZsJdDo4FIJ5O+RY=,iv:I4bJrkmGgHLL8imjVT+AUYqc0lE/FGhx9OwTPAWUE6c=,tag:OjpF9+m5HA1gcLtPIaaG7w==,type:str]
23+
lastmodified: "2024-12-14T22:01:43Z"
24+
mac: ENC[AES256_GCM,data:Ovcl1g1UTnJJ3toIDDjTtcpVyIFp7XhcL72xsZWBWpNFaGIpa+7gZ7CHn3NsqPYmaT9ZXcm8BY6Eg6Mk4SKYX9puvrB5swlvEUuCANIkUqM8nPDGt3WQrs0BKTKn8i1ZTbaG21ZbyA2xKj/JspRZo9SAK7IXWdrB+4ZhXuaVlbE=,iv:ZaoZNLQjS/sdtGiwP3s+CAlFUedhTZ33K7roR3vcSrA=,tag:5jLMMEMSk6Fgok+irAnJVQ==,type:str]
2525
pgp: []
2626
encrypted_regex: ^(data|stringData)$
2727
version: 3.9.1
@@ -32,8 +32,8 @@ metadata:
3232
name: storage-user
3333
type: Opaque
3434
data:
35-
CONSOLE_ACCESS_KEY: ENC[AES256_GCM,data:sWVN6j4pYwIfsZ7z,iv:SSa36EN2HlUE5chPKloJ4tat8x+wIinCXF6kADRmgVo=,tag:n6JPNDIwxNEtZFz24Rq/dQ==,type:str]
36-
CONSOLE_SECRET_KEY: ENC[AES256_GCM,data:PlssLY+f4jUQZsrZ5TIgmA==,iv:dv+EDkElpmUhx1EZv4faMrt72TsTmHW2v8OWf7upMBQ=,tag:GfwppQBEf1BH9yxD8NZaEg==,type:str]
35+
CONSOLE_ACCESS_KEY: ENC[AES256_GCM,data:mqG+6jN+WIlTBPlS,iv:er3c5nIAKP3srOm+nP+CcDseHb5yzrMo/9Ia6Wt+UbQ=,tag:rpWi9sEs5B8nxUOhJmnV3A==,type:str]
36+
CONSOLE_SECRET_KEY: ENC[AES256_GCM,data:JG+1z/VorEc8PTDqSLFs5Q==,iv:y6nMi5tju8MLQSos9Zn93N0LMa7fYaBEvXGJivp2N4I=,tag:qOyTF5ayOuFhNNHuKmvhvA==,type:str]
3737
sops:
3838
kms: []
3939
gcp_kms: []
@@ -43,14 +43,14 @@ sops:
4343
- recipient: age1dwu9ccy3t86c4tgd4ufs4jkmv572jfflkvdejm5kvjf95r3qsgus847qgd
4444
enc: |
4545
-----BEGIN AGE ENCRYPTED FILE-----
46-
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKY28yY2l2TmJxZUNIMlJy
47-
bzkyOFdlTDdIZ0lrRDBnRjBkL2lCaWFBNkVVCnRUYm8ySE4rM3hWNExpS3Y1TVdh
48-
aC8zN3ZZT3Rac2t3R0VDMzZLT0QyZDQKLS0tIEV3Q2dhTmhSUkJxaytrdW1TWlA3
49-
TXR5SmhOV1lCOHNnV21pR3d4MnB1NlkKZbhrP7nfIAOt5BFZnx2SJvYvegqKqkMK
50-
r4zNkacSIzKxFXqzd1yS6hhvqtZ/FU7I5eR6MZ6EVhNb5iMei1XXGQ==
46+
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0aUtXdHMzME5qTWlOM1NR
47+
Njhlb0tFK0doZElTNVdaR0Z2N3NWbGJrem5BCkE3QTJHU1k4MFpiSlhYYUNqd1JQ
48+
bEtYRFluV0thdHVFcUtVa0pmYTlqb2MKLS0tIFRNckhGUzU3YVRMZ1FndXppTWRZ
49+
bDZCWm5KUVNYQ1c2K25JUnkyOUdxMkUK8YsVu+A50Y33ONDCzO5iRodQcQNMY2e4
50+
JJ0gIhLIejJs/Jb739/h/8uOonC5IwUgOVF7YZKXXkyTNtJ6eAFrcA==
5151
-----END AGE ENCRYPTED FILE-----
52-
lastmodified: "2024-12-14T21:02:25Z"
53-
mac: ENC[AES256_GCM,data:p+DRG3i55HKL+M0yyWB2F8rjjJfIk6RZ4A2YuYBTTSoMTwPxeHK51NOHgnAocKuD769hpIiRugfpc5j2C8aaMhNMBK6i3liAnrEyp99rsyXSN3YuQ32u6QMwkdC1yLRjphTST5/HRgc5Pkz5qWwSI55bMf8+ZsJdDo4FIJ5O+RY=,iv:I4bJrkmGgHLL8imjVT+AUYqc0lE/FGhx9OwTPAWUE6c=,tag:OjpF9+m5HA1gcLtPIaaG7w==,type:str]
52+
lastmodified: "2024-12-14T22:01:43Z"
53+
mac: ENC[AES256_GCM,data:Ovcl1g1UTnJJ3toIDDjTtcpVyIFp7XhcL72xsZWBWpNFaGIpa+7gZ7CHn3NsqPYmaT9ZXcm8BY6Eg6Mk4SKYX9puvrB5swlvEUuCANIkUqM8nPDGt3WQrs0BKTKn8i1ZTbaG21ZbyA2xKj/JspRZo9SAK7IXWdrB+4ZhXuaVlbE=,iv:ZaoZNLQjS/sdtGiwP3s+CAlFUedhTZ33K7roR3vcSrA=,tag:5jLMMEMSk6Fgok+irAnJVQ==,type:str]
5454
pgp: []
5555
encrypted_regex: ^(data|stringData)$
5656
version: 3.9.1

k8s/nessie/base/secrets.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ metadata:
66
app: nessie-database
77
type: Opaque
88
data:
9-
db: ENC[AES256_GCM,data:fJYr5gT8l/4=,iv:0pxQ1ARQHQoW2WsZkqmH4jgobgCypg01bRsMMctTNoA=,tag:q5WAB3FDD6gzA6cKHl5BnQ==,type:str]
10-
username: ENC[AES256_GCM,data:ds+mPO7eE3Y=,iv:yD1FfYg1J1hgtSfVYMdcTfgUK/mXHlQyCWOGWSq1d68=,tag:YcF4gAfJDyXEZrPQ/fMqWQ==,type:str]
11-
password: ENC[AES256_GCM,data:Hmidu+M1x+KCnTfeb1IsQg==,iv:+i1puk7HMK6ZxXNS8g1K9iPanUabRz9fvy/aW1m2KQ0=,tag:khv6SUIIaDWzihdreGakhA==,type:str]
9+
db: ENC[AES256_GCM,data:XxnMEgqG/yo=,iv:nvhPS88rwT6dHQqpqojs/WgNz6F/xvB7QIuJUndHRvU=,tag:PkNGPcuvzhKT01/bBH6kzA==,type:str]
10+
username: ENC[AES256_GCM,data:Z052Nq/Hipo=,iv:QoD7+ZvzNf4hNRrN+CweA+fupVJvfc0/5p81QzSuKSY=,tag:Ji+tPjH78JnYKPyPL+9WIA==,type:str]
11+
password: ENC[AES256_GCM,data:P058yJLklg5vzUUXL1Sq1g==,iv:LV5Yq4EZ4cnF8HkZTRN2cKn2j2u/KkqYue1n0kXC7hQ=,tag:J8kqkW1wxNO09XazOfO/pA==,type:str]
1212
sops:
1313
kms: []
1414
gcp_kms: []
@@ -18,14 +18,14 @@ sops:
1818
- recipient: age1dwu9ccy3t86c4tgd4ufs4jkmv572jfflkvdejm5kvjf95r3qsgus847qgd
1919
enc: |
2020
-----BEGIN AGE ENCRYPTED FILE-----
21-
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5ejJuOHZ4aE9zc0lNYWJ1
22-
TmZWVnJ5QzJEdHIwZmFmd1AvM3ZIY0tvZmcwCnl1NFFITUJCL2E0NlRLYnRqeUV1
23-
QUh6cVNJVzNDbStRS3ozWnhmcmdxUDgKLS0tIDhFOEMwWitxWDNLUDZxZ05QZEFF
24-
RlVva0FTcUFMYUlaUkJRd3BIK241aFUK6p9nf0OJTPjXnMegtHfYaJJhrKryZ3In
25-
LWq4PWcrP/VA3TmogeBs/5w/zAXHCeZrkIsfqiOC7VNu+nvMP5L2Xw==
21+
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKRmp4NUthY0R2L0FIT2hU
22+
cHBWL085KyttOU92ZEozQjV5anFDZ000V3g0CldXcjlieGpFcnRMVTVNbmZJbnJu
23+
eU1yOFNYZy9SdG9uZnVaMVRzeUN3Q0kKLS0tIHV4SU14SklVV3M5NjhtVWgwcGlj
24+
bnJGakd0dEw5QmlWSUkvalFqSU0rMnMKZED/lMQMIPlBZfcr8neLgiD69QP92JYl
25+
D2BDmiaJ6sbB1AWsyJ9Z048ct/+EfVLaO3cy8s9TZBVbg0wK3NTfpg==
2626
-----END AGE ENCRYPTED FILE-----
27-
lastmodified: "2024-12-14T21:02:25Z"
28-
mac: ENC[AES256_GCM,data:+JRiWREXdL69uWP9iittTQENPWKSEyFy3dou2oRKbSE3AzP8syursf9QrOdqV3BryRSoXPf5jw2nAiZT13LvcUY4mUBsPKxF2Fo/r0aO3aoadJEwEOGQHp87P73b7teHnAggkzuPC77SiTL3OaXqfXFQ42rkjLfVoeSQU+VupvA=,iv:fRCcnsuT6PBTLD8rcTJZFGwirYxmO/UedB3zS9+atFI=,tag:9NV6TGYTq5D6PSIubZocaQ==,type:str]
27+
lastmodified: "2024-12-14T22:01:43Z"
28+
mac: ENC[AES256_GCM,data:XoDzfvXQvTRfAkfu9EOMunFOm8pKeBnWf1RgLILG68O1h8b/GoZwHISgMHGa/q5Sq9uRp074h9juuCmk6wCC236QSY7lfq7ijwBVFxqElq3fxM4/N3DCiycrfS0hxBQnoZbmmUwf4WBFdfp8pGlvaOR0no00EB0e0y7rmLZkcgs=,iv:3LLQMKxR4glCT+moS5272JDRCWVCEq0MdJKZLkwuNo4=,tag:WBCNirCz3beOImhZ34T5gg==,type:str]
2929
pgp: []
3030
encrypted_regex: ^(data|stringData)$
3131
version: 3.9.1

k8s/spark/base/history-server-deployment.yaml

-53
This file was deleted.

k8s/spark/base/history-server-service.yaml

-14
This file was deleted.

k8s/spark/base/kustomization.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@ resources:
99
- master-service.yaml
1010
- worker-deployment.yaml
1111
- worker-service.yaml
12-
- history-server-deployment.yaml
13-
- history-server-service.yaml
1412
- secrets.yaml

k8s/spark/base/master-deployment.yaml

+41
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ spec:
2020
serviceAccountName: spark
2121
imagePullSecrets:
2222
- name: dockerconfigjson
23+
securityContext:
24+
runAsNonRoot: true
25+
runAsUser: 185
26+
runAsGroup: 185
27+
seccompProfile:
28+
type: "RuntimeDefault"
2329
containers:
2430
- name: spark-master
2531
image: ghcr.io/fxttr/spark:latest
@@ -54,6 +60,41 @@ spec:
5460
volumeMounts:
5561
- mountPath: /opt/spark/logs
5662
name: spark-logs
63+
securityContext:
64+
allowPrivilegeEscalation: false
65+
capabilities:
66+
drop: ["ALL"]
67+
- name: spark-history-server
68+
image: ghcr.io/fxttr/spark:latest
69+
imagePullPolicy: Always
70+
command:
71+
- "start-history-server.sh"
72+
ports:
73+
- containerPort: 18080
74+
env:
75+
- name: SPARK_MODE
76+
value: "history-server"
77+
- name: SPARK_NO_DAEMONIZE
78+
value: "true"
79+
- name: SPARK_HISTORY_OPTS
80+
value: "-Dspark.history.fs.logDirectory=/opt/spark/logs -Dspark.history.ui.port=18080"
81+
envFrom:
82+
- secretRef:
83+
name: spark-env
84+
resources:
85+
requests:
86+
memory: "1Gi"
87+
cpu: "1"
88+
limits:
89+
memory: "4Gi"
90+
cpu: "2"
91+
volumeMounts:
92+
- mountPath: /opt/spark/logs
93+
name: spark-logs
94+
securityContext:
95+
allowPrivilegeEscalation: false
96+
capabilities:
97+
drop: ["ALL"]
5798
volumes:
5899
- name: spark-logs
59100
emptyDir: {}

k8s/spark/base/master-service.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ spec:
1010
name: spark-master
1111
- port: 8080
1212
name: spark-ui
13+
- port: 18080
14+
name: history-server-ui
1315
selector:
1416
app: spark
1517
component: master
16-
clusterIP: None # Headless service for easier resolution

0 commit comments

Comments
 (0)