Skip to content

Commit 5adeac1

Browse files
committed
fix: Update ConfigMap template and related code
Signed-off-by: Liam Beckman <lbeckman314@gmail.com>
1 parent 818a6a5 commit 5adeac1

2 files changed

Lines changed: 17 additions & 0 deletions

File tree

compute/kubernetes/backend.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,15 @@ func (b *Backend) createResources(ctx context.Context, task *tes.Task, config *c
198198
// blocks below (ConfigMap, ServiceAccount, Role, RoleBinding, Job).
199199
var err error
200200

201+
if config.Kubernetes.ConfigMapTemplate != "" {
202+
b.log.Debug("creating Worker ConfigMap", "taskID", task.Id)
203+
err = resources.CreateConfigMap(timeoutCtx, task.Id, config, b.client, b.log)
204+
if err != nil {
205+
_ = b.Cancel(context.Background(), task.Id)
206+
return fmt.Errorf("creating Worker ConfigMap: %w", err)
207+
}
208+
}
209+
201210
if config.Kubernetes.ServiceAccountTemplate != "" {
202211
saName := fmt.Sprintf("funnel-worker-sa-%s-%s", config.Kubernetes.JobsNamespace, task.Id)
203212
if _, exists := task.Tags["_WORKER_SA"]; exists {

compute/kubernetes/backend_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@ spec:
5252
memory: "{{.RamGb}}Gi"
5353
ephemeral-storage: "{{.DiskGb}}Gi"
5454
`
55+
conf.Kubernetes.ConfigMapTemplate = `apiVersion: v1
56+
kind: ConfigMap
57+
metadata:
58+
name: funnel-worker-config-{{.TaskId}}
59+
namespace: {{.Namespace}}
60+
data:
61+
config.yaml: "placeholder"
62+
`
5563

5664
// Create a logger
5765
log := logger.NewLogger("test", logger.DefaultConfig())

0 commit comments

Comments
 (0)