Skip to content

Commit e0ee676

Browse files
committed
Improve helm script bundling
1 parent c6b8f52 commit e0ee676

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed

apps/faf-legacy-deployment/templates/deploy-coop.yaml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ data:
88
PATCH_VERSION: "66"
99
DATABASE_HOST: "mariadb"
1010
DATABASE_NAME: "faf_lobby"
11-
"build.gradle.kts": |-
12-
{{ tpl ( .Files.Get "scripts/build.gradle.kts" ) . | indent 4 }}
13-
"CoopDeployer.kt": |-
14-
{{ tpl ( .Files.Get "scripts/CoopDeployer.kt" ) . | indent 4 }}
1511

1612
---
1713

@@ -39,29 +35,26 @@ spec:
3935
containers:
4036
- image: gradle:9.2-jdk21
4137
imagePullPolicy: Always
42-
name: faf-coop-deployment
38+
name: faf-deploy-coop
4339
workingDir: /workspace
4440
envFrom:
4541
- configMapRef:
4642
name: faf-deploy-coop
4743
- secretRef:
4844
name: faf-legacy-deployment
49-
command: [ "gradle", "run" ]
45+
command: [ "sh", "-c", "ls -lah /workspace && gradle run" ]
46+
#command: [ "gradle", "run" ]
5047
volumeMounts:
51-
- mountPath: /workspace/build.gradle.kts
52-
name: faf-deploy-coop
53-
subPath: "build.gradle.kts"
54-
- mountPath: /workspace/CoopDeployer.kt
55-
name: faf-deploy-coop
56-
subPath: "CoopDeployer.kt"
48+
- mountPath: /workspace
49+
name: faf-deploy-scripts
5750
- mountPath: /workspace/legacy-featured-mod-files
5851
name: faf-featured-mods
5952
restartPolicy: Never
6053
volumes:
61-
- name: faf-deploy-coop
54+
- name: faf-deploy-scripts
6255
configMap:
63-
name: "faf-deploy-coop"
56+
name: "faf-deploy-scripts"
6457
- name: faf-featured-mods
6558
hostPath:
6659
path: /opt/faf/data/legacy-featured-mod-files
67-
type: Directory
60+
type: Directory
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
name: faf-deploy-scripts
5+
labels:
6+
app: faf-deploy-coop
7+
data:
8+
# Loop through all files in the 'scripts' directory
9+
{{- range $path, $bytes := .Files.Glob "scripts/*" }}
10+
{{- $file := base $path }}
11+
{{ $file }}: |-
12+
{{ tpl ($bytes | toString) $ | indent 4 }}
13+
{{- end }}

0 commit comments

Comments
 (0)