Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions modules/dagger/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ type driverConf struct {

// timeout value for a kube deployment run
KubeDeployTimeout int `json:"kube_deploy_timeout_seconds"`

NodeAffinityMatchExpressions kubernetes.NodeAffinityMatchExpressions `json:"node_affinity_match_expressions"`
}

type Output struct {
Expand Down Expand Up @@ -218,6 +220,35 @@ func (dd *daggerDriver) getHelmRelease(res resource.Resource, conf Config,
formatted := fmt.Sprintf("[%s]", strings.Join(programArgs, ","))
encodedProgramArgs := base64.StdEncoding.EncodeToString([]byte(formatted))

tolerationKey := "firehose_autoscaler"
tolerations := []map[string]any{}

for _, t := range kubeOut.Tolerations[tolerationKey] {
tolerations = append(tolerations, map[string]any{
"key": t.Key,
"value": t.Value,
"effect": t.Effect,
"operator": t.Operator,
})
}

requiredDuringSchedulingIgnoredDuringExecution := []kubernetes.Preference{}
preferredDuringSchedulingIgnoredDuringExecution := []kubernetes.WeightedPreference{}

affinityKey := "firehose_autoscaler"
if affinity, ok := kubeOut.Affinities[affinityKey]; ok {
requiredDuringSchedulingIgnoredDuringExecution = affinity.RequiredDuringSchedulingIgnoredDuringExecution
preferredDuringSchedulingIgnoredDuringExecution = affinity.PreferredDuringSchedulingIgnoredDuringExecution
}

if dd.conf.NodeAffinityMatchExpressions.RequiredDuringSchedulingIgnoredDuringExecution != nil {
requiredDuringSchedulingIgnoredDuringExecution = dd.conf.NodeAffinityMatchExpressions.RequiredDuringSchedulingIgnoredDuringExecution
}

if dd.conf.NodeAffinityMatchExpressions.PreferredDuringSchedulingIgnoredDuringExecution != nil {
preferredDuringSchedulingIgnoredDuringExecution = dd.conf.NodeAffinityMatchExpressions.PreferredDuringSchedulingIgnoredDuringExecution
}

rc.Values = map[string]any{
labelsConfKey: modules.CloneAndMergeMaps(deploymentLabels, entropyLabels),
"image": imageRepository,
Expand Down Expand Up @@ -250,6 +281,11 @@ func (dd *daggerDriver) getHelmRelease(res resource.Resource, conf Config,
"dagger_k8s_ha_url": conf.DaggerK8sHAURL,
"cloud_provider": conf.CloudProvider,
"fs_oss_endpoint": conf.FSOSSEndpoint,
"tolerations": tolerations,
"nodeAffinityMatchExpressions": map[string]any{
"requiredDuringSchedulingIgnoredDuringExecution": requiredDuringSchedulingIgnoredDuringExecution,
"preferredDuringSchedulingIgnoredDuringExecution": preferredDuringSchedulingIgnoredDuringExecution,
},
}

return rc, nil
Expand Down
Loading