Skip to content

Commit e32f2eb

Browse files
committed
Fix ownership in Spark Dockerfile
1 parent faff13d commit e32f2eb

File tree

11 files changed

+115
-100
lines changed

11 files changed

+115
-100
lines changed

dev/kustomization.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ kind: Kustomization
44
namespace: datastack-devel
55
resources:
66
- namespace.yaml
7-
- ../k8s/nessie/dev/
8-
- ../k8s/minio/dev/
7+
#- ../k8s/nessie/dev/
8+
#- ../k8s/minio/dev/
99
#- ../k8s/clickhouse/dev/
10-
- ../k8s/dagster/dev/
11-
- ../k8s/trino/dev/
10+
#- ../k8s/dagster/dev/
11+
#- ../k8s/trino/dev/
1212
- ../k8s/spark/dev/

docker/spark/Dockerfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,12 @@ COPY conf/spark-defaults.conf ${SPARK_HOME}/conf
7878
COPY scripts/entrypoint.sh /opt/entrypoint.sh
7979
COPY scripts/decom.sh /opt/decom.sh
8080

81-
RUN useradd --uid $USER_UID -M -U -s /bin/false $USERNAME
81+
RUN useradd --uid ${USER_UID} -M -U -s /bin/false ${USERNAME}
8282

83-
RUN chmod g+w ${SPARK_HOME}
83+
RUN chown -R ${USERNAME} ${SPARK_HOME}
84+
RUN chmod -R u+rwx ${SPARK_HOME}
8485
RUN chmod a+x /opt/decom.sh
8586
RUN chmod a+x /opt/entrypoint.sh
86-
RUN chmod a+x ${SPARK_HOME}/*
87-
RUN chmod a+x ${SPARK_HOME}/bin/*
8887

8988
ENTRYPOINT [ "/opt/entrypoint.sh" ]
9089

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:bp2/VjjT6k0s2BxpXc4aFXcd0g==,iv:3penxj7+sS3VChifQgcJ5jBJBbqzn8N4MWtFihs9+rM=,tag:fQuwaJRuOn/ipY8Ijt26AQ==,type:str]
8-
password: ENC[AES256_GCM,data:Q6wlDwAma1UXyT66katWMoGtApa7nyT2vA==,iv:eUZIapIbmmiHmiwV15QarJ0geVDIGRIn4aXrkQt6YdA=,tag:fqVOZTXMvK6FL/ljN/bAcg==,type:str]
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]
99
sops:
1010
kms: []
1111
gcp_kms: []
@@ -15,14 +15,14 @@ sops:
1515
- recipient: age1dwu9ccy3t86c4tgd4ufs4jkmv572jfflkvdejm5kvjf95r3qsgus847qgd
1616
enc: |
1717
-----BEGIN AGE ENCRYPTED FILE-----
18-
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNZlRLNEo0dTE5cEZ1YTVj
19-
VHFmczZpK1E5NDkydGZNbkJwR3pDSFhHYzNVCmxrclJXYVFOSEVNaUdXcGc1VVUz
20-
NHJaNml5d0tFMUZza0QvSnE1WlNYdUEKLS0tIDFTVVBQaGl4Wlk2Y3plSmtzUFl6
21-
QWpFd0NvUUM1WG1kaUpNaHlhU3BkRUEKPANnxJ2hYAMWcKAf5aKZTJ2ib3bv5+7u
22-
08LW6cU+v6tq8fuGrYHQ6CzP3Ll4m5V8TSozP8Rg/6xIwsivUsM19A==
18+
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBySnkvbUFhK25xdURYSHUv
19+
UHZPb0dmbU9VQ083bEJYWngwUG91ZHFUYVdRCm13Y0xmU25Kb2JJOGQzWW9XSDlS
20+
ak82Y0JKYWdHZzBHVmw2L2RQVW9MQnMKLS0tIEx5a3FPYzVGZ3BkeG5DWjRJU1ZN
21+
MU9qOHFYZHFURzV2MkwzZldFY0pWN2sKspB2jhBXZDsQGwma902Z8jtjAiew4Ug8
22+
Hc6ZPrBhHhiqWw4yRDYV2f9wx/YjtA8/vakkEn9SOImjJmIZ7/jlWg==
2323
-----END AGE ENCRYPTED FILE-----
24-
lastmodified: "2024-12-13T18:23:13Z"
25-
mac: ENC[AES256_GCM,data:oDXi9AxjyOaHJw4kA21Bx2Falw/PIfPZ0cDJaL+DnXSduhWQJMICiWyMFrFsLzMMNyJxsRcfnChnANzyvqhlouvvQ9OvbcZ1c/d+/S+l6DtJVkr6jdkKJ/ACl68RQteyIr+KvgQiz3hj/zyUTiyfJ1HJ06WYjYkeqNJvsgthqH8=,iv:ycyV8mgHLacekSg53PiFG0Koa2ycQmKpinUdP38h66w=,tag:uX01/cXStFow+Uqo6BNkIA==,type:str]
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]
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:yawxqtxGaTgjbAt04yPxJA==,iv:wxhmKkiHZdeSyWqDG4k7++WZeOG0rsEfxZ24SAzZ98I=,tag:PR+PJY95QFUaqAaPqTUzlA==,type:str]
36+
password: ENC[AES256_GCM,data:tdoFFmfpIhFj0WPZdXyZAA==,iv:quVnu3XQJrgAXLcg4Hi0KtYKy/3cFMQ3DdnceTgNcIA=,tag:C8UKmCDUC3VHmtw4etTvOg==,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+IFgyNTUxOSBNZlRLNEo0dTE5cEZ1YTVj
47-
VHFmczZpK1E5NDkydGZNbkJwR3pDSFhHYzNVCmxrclJXYVFOSEVNaUdXcGc1VVUz
48-
NHJaNml5d0tFMUZza0QvSnE1WlNYdUEKLS0tIDFTVVBQaGl4Wlk2Y3plSmtzUFl6
49-
QWpFd0NvUUM1WG1kaUpNaHlhU3BkRUEKPANnxJ2hYAMWcKAf5aKZTJ2ib3bv5+7u
50-
08LW6cU+v6tq8fuGrYHQ6CzP3Ll4m5V8TSozP8Rg/6xIwsivUsM19A==
46+
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBySnkvbUFhK25xdURYSHUv
47+
UHZPb0dmbU9VQ083bEJYWngwUG91ZHFUYVdRCm13Y0xmU25Kb2JJOGQzWW9XSDlS
48+
ak82Y0JKYWdHZzBHVmw2L2RQVW9MQnMKLS0tIEx5a3FPYzVGZ3BkeG5DWjRJU1ZN
49+
MU9qOHFYZHFURzV2MkwzZldFY0pWN2sKspB2jhBXZDsQGwma902Z8jtjAiew4Ug8
50+
Hc6ZPrBhHhiqWw4yRDYV2f9wx/YjtA8/vakkEn9SOImjJmIZ7/jlWg==
5151
-----END AGE ENCRYPTED FILE-----
52-
lastmodified: "2024-12-13T18:23:13Z"
53-
mac: ENC[AES256_GCM,data:oDXi9AxjyOaHJw4kA21Bx2Falw/PIfPZ0cDJaL+DnXSduhWQJMICiWyMFrFsLzMMNyJxsRcfnChnANzyvqhlouvvQ9OvbcZ1c/d+/S+l6DtJVkr6jdkKJ/ACl68RQteyIr+KvgQiz3hj/zyUTiyfJ1HJ06WYjYkeqNJvsgthqH8=,iv:ycyV8mgHLacekSg53PiFG0Koa2ycQmKpinUdP38h66w=,tag:uX01/cXStFow+Uqo6BNkIA==,type:str]
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]
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:P6ndJPFSoDi88+h6tBY0s2814H1gS/XP,iv:O8puMo0Q4eg+Iv/Oqti0tfG68+qiKKEEy3tgEJFiL1I=,tag:kgSLv6zC0hj9Mq8y/Egdag==,type:str]
9+
postgresql-password: ENC[AES256_GCM,data:5d+Nso/M+17NUB/dCWS1XpGZjgFRGz1X,iv:mU/gg3F62LXhsMimpuRQDDgJ2vj7Jc1VIeQH1+Q5aYY=,tag:sDRqGDnScdxvHXcwOeoc8Q==,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+IFgyNTUxOSBsdHhXOEp5WGpzSDAvQzNP
20-
WjBlL0NrLzZlR3B4NU5Zdkl1Tys3TDdhQmdvCjBBaU5LSk9CcFVxSnZoWXlEWTFo
21-
UHZzb20xdnZzV0JlczVpb1ZuaEl5ZzQKLS0tIGk5SzN1d2FpbFlCS01EV3JUZ3o4
22-
WXdLRzM5UmpiVW9lcEhIbVRLWnlGdE0KcDsU/UpQ1d8fHSb+9S1VAeqU7ZAuP+q5
23-
NvNpRO1gyoxyzSj2WVk8yWaQF8NNUE0q8bEEKdqaM+wCt70TKR5Z5w==
19+
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJSDY2ZHEzMGYweGRiTUZh
20+
SkZXSHJLUWxZUUh5SFRKV3hpQ0ExNUpvdVNJCm9KeFVhV3p5SmZGMU1kcmZTN1do
21+
dHdJVUZpTWw0WDhjVVZUU1B2TnFtRkkKLS0tIE96QXNlOTBwU01PMTVjOGszc0Nv
22+
cXBvRWg4VVFYZnVGbEt1TGFxZ0ZZVEEKxY4H/xrk4O3T6+1tc79VKEL6AV98eYe3
23+
7AM7kx1INxjG71W9ZGNXqlcM+mNr+EE8EjEVcXgAtZdl6p2RR3afBQ==
2424
-----END AGE ENCRYPTED FILE-----
25-
lastmodified: "2024-12-13T18:23:13Z"
26-
mac: ENC[AES256_GCM,data:QpwT+WCNPeX+7hPiacWz2aVEinpDDr/Vkk+ezQvLQOD18GucCJPd8P3XhtliByzBcZYtl4tDMzOXW7VO+9N47SHRr7MrNwTK3MVDi6PtlCaVRlXlpe3kyovvfRY5wR58b1Th76eHpBqu/A4q4usA2DPsf3PQ+TWzZ+aXpPByIts=,iv:3kk9X+6dVlb6zbIc5mMU9S9z0EIrVaAP8wdzIHNgs4Y=,tag:WwfDZs2l7VLde85fjn+trQ==,type:str]
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]
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:69eVo2UYaRKn3rfBKEssfM8KsgtERsntmkS7BnWk1s0bUnRZ3m940DLjxq3jTnMAwP+2XBFN36PSHUivU+hRn4NSvCZDuHGqPf0pXmK9wfDd08GoJcfHQ1nlqYxM1XrQKiXzBkITw2fN845a3hSyIArQvh67+4mwOQgI+pMHSJNb4+I1+5s1WyYCMNjV,iv:0L/tywt8tNhywrDOYezv9sb9LCPKnRbPHDSICRwrk28=,tag:1+VyDqdd6jceEwwGTQAq+A==,type:str]
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]
88
sops:
99
kms: []
1010
gcp_kms: []
@@ -14,14 +14,14 @@ sops:
1414
- recipient: age1dwu9ccy3t86c4tgd4ufs4jkmv572jfflkvdejm5kvjf95r3qsgus847qgd
1515
enc: |
1616
-----BEGIN AGE ENCRYPTED FILE-----
17-
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHMUoyRnFaUE1wb1VoQXcw
18-
YVBkR3l1bVVBU0syT1M3TDRlaVZYbkNXdlJrCnM4TkExYnlaTWFwU2sxTnFXMnBx
19-
bWNvQTAwb0VxM09jWW5jdEQ5TDRJT2cKLS0tIFdJaW93NjF3bnFZT3lpQTR3cFFz
20-
WEhWU2h5dW9Zbm1sSjVUMi83M1htUWsK+M8z+X07lNJoNLCkBXBjMpUAno8ZJDUV
21-
6cFk04BAkDQh7i7/9wbBqpwDoflPQZTPg+1BDFeDNTvPsusIMWqBKw==
17+
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKY28yY2l2TmJxZUNIMlJy
18+
bzkyOFdlTDdIZ0lrRDBnRjBkL2lCaWFBNkVVCnRUYm8ySE4rM3hWNExpS3Y1TVdh
19+
aC8zN3ZZT3Rac2t3R0VDMzZLT0QyZDQKLS0tIEV3Q2dhTmhSUkJxaytrdW1TWlA3
20+
TXR5SmhOV1lCOHNnV21pR3d4MnB1NlkKZbhrP7nfIAOt5BFZnx2SJvYvegqKqkMK
21+
r4zNkacSIzKxFXqzd1yS6hhvqtZ/FU7I5eR6MZ6EVhNb5iMei1XXGQ==
2222
-----END AGE ENCRYPTED FILE-----
23-
lastmodified: "2024-12-13T18:23:13Z"
24-
mac: ENC[AES256_GCM,data:mKegFhOcUI2Dl/C+11tvmMbWYYZKjQgRoJQkvbSkoHSY/bzlYxbw0/dltO2OMvpVpWpaL06pARjKHdqb5HTua/aNlxb06XrW//91PSXQd8DdmpVz2EMbr8b0HWX9ODBZ8Wp1Tyze/al+FbrMJICrM+HOtrAxgB+trYo06H11gZc=,iv:GSewhknOxCGxkrhZEwE14H/SuvQ94kmAHD1hO42ipqk=,tag:oo96NnI8OrvNVTFEjMpgdA==,type:str]
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]
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:fNdyEXwgwClPt0ti,iv:orbO0aG7e/ZokgQ/elw0RvhmetRl7W/75ldWAGW1mso=,tag:+FOBdqZMF6ARD3mzTJUBLw==,type:str]
36-
CONSOLE_SECRET_KEY: ENC[AES256_GCM,data:kvY+zAXHf6Nidx+0ppsubw==,iv:N9ZbeX7grtXIZYdjwybYVbWsHi5LYVUBlY9Q7wEcc7o=,tag:ob21i0YIZmkmA/GuQ3dcAA==,type:str]
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]
3737
sops:
3838
kms: []
3939
gcp_kms: []
@@ -43,14 +43,14 @@ sops:
4343
- recipient: age1dwu9ccy3t86c4tgd4ufs4jkmv572jfflkvdejm5kvjf95r3qsgus847qgd
4444
enc: |
4545
-----BEGIN AGE ENCRYPTED FILE-----
46-
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHMUoyRnFaUE1wb1VoQXcw
47-
YVBkR3l1bVVBU0syT1M3TDRlaVZYbkNXdlJrCnM4TkExYnlaTWFwU2sxTnFXMnBx
48-
bWNvQTAwb0VxM09jWW5jdEQ5TDRJT2cKLS0tIFdJaW93NjF3bnFZT3lpQTR3cFFz
49-
WEhWU2h5dW9Zbm1sSjVUMi83M1htUWsK+M8z+X07lNJoNLCkBXBjMpUAno8ZJDUV
50-
6cFk04BAkDQh7i7/9wbBqpwDoflPQZTPg+1BDFeDNTvPsusIMWqBKw==
46+
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKY28yY2l2TmJxZUNIMlJy
47+
bzkyOFdlTDdIZ0lrRDBnRjBkL2lCaWFBNkVVCnRUYm8ySE4rM3hWNExpS3Y1TVdh
48+
aC8zN3ZZT3Rac2t3R0VDMzZLT0QyZDQKLS0tIEV3Q2dhTmhSUkJxaytrdW1TWlA3
49+
TXR5SmhOV1lCOHNnV21pR3d4MnB1NlkKZbhrP7nfIAOt5BFZnx2SJvYvegqKqkMK
50+
r4zNkacSIzKxFXqzd1yS6hhvqtZ/FU7I5eR6MZ6EVhNb5iMei1XXGQ==
5151
-----END AGE ENCRYPTED FILE-----
52-
lastmodified: "2024-12-13T18:23:13Z"
53-
mac: ENC[AES256_GCM,data:mKegFhOcUI2Dl/C+11tvmMbWYYZKjQgRoJQkvbSkoHSY/bzlYxbw0/dltO2OMvpVpWpaL06pARjKHdqb5HTua/aNlxb06XrW//91PSXQd8DdmpVz2EMbr8b0HWX9ODBZ8Wp1Tyze/al+FbrMJICrM+HOtrAxgB+trYo06H11gZc=,iv:GSewhknOxCGxkrhZEwE14H/SuvQ94kmAHD1hO42ipqk=,tag:oo96NnI8OrvNVTFEjMpgdA==,type:str]
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]
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:ZQPcEFCcKkY=,iv:Ch3SIicgBJxSV6E9zkUifzVggriYU3sHM77Dl5VEjJI=,tag:FDnoEh9bN0smI5j0z+Zdkw==,type:str]
10-
username: ENC[AES256_GCM,data:UZj0zYIZglE=,iv:rkkfL2g3o5PqgrVc3Rtum67u1O58k6MamMSvFcK9nCM=,tag:20tRK/xm7HK+QNpcU0BLew==,type:str]
11-
password: ENC[AES256_GCM,data:bmA/5yQcJkAM7b0XZPCoFg==,iv:jpuc44HuLCEwuFTmNtt34t3g9QlYOYa/+x1402tB8xg=,tag:xQHSPENHCvsmqFhv6Vxjrw==,type:str]
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]
1212
sops:
1313
kms: []
1414
gcp_kms: []
@@ -18,14 +18,14 @@ sops:
1818
- recipient: age1dwu9ccy3t86c4tgd4ufs4jkmv572jfflkvdejm5kvjf95r3qsgus847qgd
1919
enc: |
2020
-----BEGIN AGE ENCRYPTED FILE-----
21-
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBydkJvY2luaTI2dDcvU2xC
22-
QVBpMWh0Z1ppcjBlaUM3dzlEWXA5TUNFbkc4CkJyS1BGSDE0bnRiV0txa0x5MHVB
23-
dUZCTTJmMUJ2aEg3SmR0YUlOSmN5VWMKLS0tIHp5WlNKMktLNDRtVVFBMyttSHRv
24-
VDFNaVkxQXFaR2hqWDJHdzRtUHlhbEkK7wY8xKJxmwkS9uWzkt2nvE2LFaPgk0Oc
25-
P8iZvzPVxqUrPUCtsWlQaoJzST0Z+VNO/q/Oyq0PSc242Zuwzb8UIQ==
21+
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5ejJuOHZ4aE9zc0lNYWJ1
22+
TmZWVnJ5QzJEdHIwZmFmd1AvM3ZIY0tvZmcwCnl1NFFITUJCL2E0NlRLYnRqeUV1
23+
QUh6cVNJVzNDbStRS3ozWnhmcmdxUDgKLS0tIDhFOEMwWitxWDNLUDZxZ05QZEFF
24+
RlVva0FTcUFMYUlaUkJRd3BIK241aFUK6p9nf0OJTPjXnMegtHfYaJJhrKryZ3In
25+
LWq4PWcrP/VA3TmogeBs/5w/zAXHCeZrkIsfqiOC7VNu+nvMP5L2Xw==
2626
-----END AGE ENCRYPTED FILE-----
27-
lastmodified: "2024-12-13T18:23:13Z"
28-
mac: ENC[AES256_GCM,data:h/XMW9c/2dEb41+1P805ti5sMOt+YQFO8zDLx0wsRzUfvxedxBvoYaDbFe1IvnFakwKC/VmKaNIvAPlgHxmIpdW1/msOAPhcgtINu0pI+1LElXu85WeL8zkc+gQIJU9xIzX53YtlOVfX/gf/ZxyohniJeAfw/9lCnZZBaICl+Y0=,iv:fjcDPZVEMuLEO23QxrFHj3rnpdQTNZHCh/OGrdPFwMk=,tag:CYKimUNgmCNaNz+0E5cJrA==,type:str]
27+
lastmodified: "2024-12-14T21:02:25Z"
28+
mac: ENC[AES256_GCM,data:+JRiWREXdL69uWP9iittTQENPWKSEyFy3dou2oRKbSE3AzP8syursf9QrOdqV3BryRSoXPf5jw2nAiZT13LvcUY4mUBsPKxF2Fo/r0aO3aoadJEwEOGQHp87P73b7teHnAggkzuPC77SiTL3OaXqfXFQ42rkjLfVoeSQU+VupvA=,iv:fRCcnsuT6PBTLD8rcTJZFGwirYxmO/UedB3zS9+atFI=,tag:9NV6TGYTq5D6PSIubZocaQ==,type:str]
2929
pgp: []
3030
encrypted_regex: ^(data|stringData)$
3131
version: 3.9.1

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

+4
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@ spec:
2424
- name: spark-history-server
2525
image: ghcr.io/fxttr/spark:latest
2626
imagePullPolicy: Always
27+
command:
28+
- "start-history-server.sh"
2729
ports:
2830
- containerPort: 18080
2931
env:
3032
- name: SPARK_MODE
3133
value: "history-server"
34+
- name: SPARK_NO_DAEMONIZE
35+
value: "true"
3236
- name: SPARK_HISTORY_OPTS
3337
value: "-Dspark.history.fs.logDirectory=/opt/spark/logs -Dspark.history.ui.port=18080"
3438
envFrom:

k8s/spark/base/master-deployment.yaml

+7-3
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,21 @@ spec:
2424
- name: spark-master
2525
image: ghcr.io/fxttr/spark:latest
2626
imagePullPolicy: Always
27-
#command: ["start-master.sh"]
28-
command: [ "/bin/bash", "-c", "--" ]
29-
args: [ "while true; do sleep 30; done;" ]
27+
command: ["start-master.sh"]
3028
ports:
3129
- containerPort: 7077
30+
protocol: TCP
3231
- containerPort: 8080
32+
protocol: TCP
3333
env:
3434
- name: SPARK_MODE
3535
value: "master"
36+
- name: SPARK_WORKLOAD
37+
value: "master"
3638
- name: SPARK_MASTER_PORT
3739
value: "7077"
40+
- name: SPARK_NO_DAEMONIZE
41+
value: "true"
3842
- name: SPARK_MASTER_WEBUI_PORT
3943
value: "8080"
4044
envFrom:

0 commit comments

Comments
 (0)