Skip to content

feat: add tolerations and affinity job #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mabdh merged 1 commit into from
Feb 3, 2026
Merged

feat: add tolerations and affinity job #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions modules/dagger/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/goto/entropy/pkg/errors"
"github.com/goto/entropy/pkg/helm"
"github.com/goto/entropy/pkg/kube"
"github.com/goto/entropy/pkg/kube/pod"
)

const (
Expand Down Expand Up @@ -107,7 +108,7 @@ 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"`
NodeAffinityMatchExpressions pod.NodeAffinityMatchExpressions `json:"node_affinity_match_expressions"`
}

type Output struct {
Expand Down Expand Up @@ -234,8 +235,8 @@ func (dd *daggerDriver) getHelmRelease(res resource.Resource, conf Config,
})
}

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

affinityKey := daggerTaintKey
if affinity, ok := kubeOut.Affinities[affinityKey]; ok {
Expand Down
9 changes: 5 additions & 4 deletions modules/firehose/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/goto/entropy/pkg/errors"
"github.com/goto/entropy/pkg/helm"
"github.com/goto/entropy/pkg/kube"
"github.com/goto/entropy/pkg/kube/pod"
)

const (
Expand Down Expand Up @@ -113,7 +114,7 @@ type driverConf struct {

// Tolerations represents the tolerations to be set for the deployment.
// The key in the map is the sink-type in upper case.
Tolerations map[string]kubernetes.Toleration `json:"tolerations"`
Tolerations map[string]pod.Toleration `json:"tolerations"`

EnvVariables map[string]string `json:"env_variables,omitempty"`

Expand All @@ -137,7 +138,7 @@ type driverConf struct {
RequestsAndLimits map[string]RequestsAndLimits `json:"requests_and_limits" validate:"required"`

// NodeAffinityMatchExpressions can be used to set node-affinity for the deployment.
NodeAffinityMatchExpressions kubernetes.NodeAffinityMatchExpressions `json:"node_affinity_match_expressions"`
NodeAffinityMatchExpressions pod.NodeAffinityMatchExpressions `json:"node_affinity_match_expressions"`

// delay between stopping a firehose and making an offset reset request
OffsetResetDelaySeconds int `json:"offset_reset_delay_seconds"`
Expand Down Expand Up @@ -272,8 +273,8 @@ func (fd *firehoseDriver) getHelmRelease(res resource.Resource, conf Config,

mountSecrets := []map[string]any{}

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

var affinityKey = ""
affinityMode := kubeOut.AffinityMode[resourceName]
Expand Down
7 changes: 4 additions & 3 deletions modules/firehose/driver_plan_update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/goto/entropy/modules/kubernetes"
"github.com/goto/entropy/pkg/errors"
"github.com/goto/entropy/pkg/kube"
"github.com/goto/entropy/pkg/kube/pod"
)

func TestFirehoseDriver_Plan_Update(t *testing.T) {
Expand Down Expand Up @@ -65,7 +66,7 @@ func TestFirehoseDriver_Plan_Update(t *testing.T) {
"kube_cluster": {
Kind: "kubernetes",
Output: modules.MustJSON(kubernetes.Output{
Tolerations: map[string][]kubernetes.Toleration{},
Tolerations: map[string][]pod.Toleration{},
}),
},
},
Expand Down Expand Up @@ -175,7 +176,7 @@ func TestFirehoseDriver_Plan_Update(t *testing.T) {
Configs: kube.Config{
Namespace: "overriden-namespace",
},
Tolerations: map[string][]kubernetes.Toleration{},
Tolerations: map[string][]pod.Toleration{},
}),
},
},
Expand Down Expand Up @@ -281,7 +282,7 @@ func TestFirehoseDriver_Plan_Update(t *testing.T) {
"kube_cluster": {
Kind: "kubernetes",
Output: modules.MustJSON(kubernetes.Output{
Tolerations: map[string][]kubernetes.Toleration{},
Tolerations: map[string][]pod.Toleration{},
}),
},
},
Expand Down
33 changes: 17 additions & 16 deletions modules/firehose/driver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/goto/entropy/modules/kubernetes"
"github.com/goto/entropy/pkg/errors"
"github.com/goto/entropy/pkg/helm"
"github.com/goto/entropy/pkg/kube/pod"
)

func TestFirehoseDriver(t *testing.T) {
Expand Down Expand Up @@ -57,7 +58,7 @@ func TestFirehoseDriver(t *testing.T) {
},
},
kubeOutput: kubernetes.Output{
Tolerations: map[string][]kubernetes.Toleration{
Tolerations: map[string][]pod.Toleration{
"firehose_LOG": {
{
Key: "key1",
Expand Down Expand Up @@ -149,10 +150,10 @@ func TestFirehoseDriver(t *testing.T) {
},
},
"nodeAffinityMatchExpressions": map[string]any{
"preferredDuringSchedulingIgnoredDuringExecution": []kubernetes.WeightedPreference{
"preferredDuringSchedulingIgnoredDuringExecution": []pod.WeightedPreference{
{
Weight: 1,
Preference: []kubernetes.Preference{
Preference: []pod.Preference{
{
Key: "another-node-label-key",
Operator: "In",
Expand All @@ -161,7 +162,7 @@ func TestFirehoseDriver(t *testing.T) {
},
},
},
"requiredDuringSchedulingIgnoredDuringExecution": []kubernetes.Preference{
"requiredDuringSchedulingIgnoredDuringExecution": []pod.Preference{
{
Key: "topology.kubernetes.io/zone",
Operator: "In",
Expand Down Expand Up @@ -234,7 +235,7 @@ func TestFirehoseDriver(t *testing.T) {
},
},
kubeOutput: kubernetes.Output{
Tolerations: map[string][]kubernetes.Toleration{
Tolerations: map[string][]pod.Toleration{
"firehose_LOG": {
{
Key: "key1",
Expand Down Expand Up @@ -326,10 +327,10 @@ func TestFirehoseDriver(t *testing.T) {
},
},
"nodeAffinityMatchExpressions": map[string]any{
"preferredDuringSchedulingIgnoredDuringExecution": []kubernetes.WeightedPreference{
"preferredDuringSchedulingIgnoredDuringExecution": []pod.WeightedPreference{
{
Weight: 1,
Preference: []kubernetes.Preference{
Preference: []pod.Preference{
{
Key: "another-node-label-key",
Operator: "In",
Expand All @@ -338,7 +339,7 @@ func TestFirehoseDriver(t *testing.T) {
},
},
},
"requiredDuringSchedulingIgnoredDuringExecution": []kubernetes.Preference{
"requiredDuringSchedulingIgnoredDuringExecution": []pod.Preference{
{
Key: "topology.kubernetes.io/zone",
Operator: "In",
Expand Down Expand Up @@ -411,7 +412,7 @@ func TestFirehoseDriver(t *testing.T) {
},
},
kubeOutput: kubernetes.Output{
Tolerations: map[string][]kubernetes.Toleration{
Tolerations: map[string][]pod.Toleration{
"firehose_LOG": {
{
Key: "key1",
Expand Down Expand Up @@ -511,10 +512,10 @@ func TestFirehoseDriver(t *testing.T) {
},
},
"nodeAffinityMatchExpressions": map[string]any{
"preferredDuringSchedulingIgnoredDuringExecution": []kubernetes.WeightedPreference{
"preferredDuringSchedulingIgnoredDuringExecution": []pod.WeightedPreference{
{
Weight: 1,
Preference: []kubernetes.Preference{
Preference: []pod.Preference{
{
Key: "another-node-label-key",
Operator: "In",
Expand All @@ -523,7 +524,7 @@ func TestFirehoseDriver(t *testing.T) {
},
},
},
"requiredDuringSchedulingIgnoredDuringExecution": []kubernetes.Preference{
"requiredDuringSchedulingIgnoredDuringExecution": []pod.Preference{
{
Key: "topology.kubernetes.io/zone",
Operator: "In",
Expand Down Expand Up @@ -597,18 +598,18 @@ func TestFirehoseDriver(t *testing.T) {
func firehoseDriverConf() driverConf {
return driverConf{
KubeDeployTimeout: 60,
NodeAffinityMatchExpressions: kubernetes.NodeAffinityMatchExpressions{
RequiredDuringSchedulingIgnoredDuringExecution: []kubernetes.Preference{
NodeAffinityMatchExpressions: pod.NodeAffinityMatchExpressions{
RequiredDuringSchedulingIgnoredDuringExecution: []pod.Preference{
{
Key: "topology.kubernetes.io/zone",
Operator: "In",
Values: []string{"antarctica-east1", "antarctica-west1"},
},
},
PreferredDuringSchedulingIgnoredDuringExecution: []kubernetes.WeightedPreference{
PreferredDuringSchedulingIgnoredDuringExecution: []pod.WeightedPreference{
{
Weight: 1,
Preference: []kubernetes.Preference{
Preference: []pod.Preference{
{
Key: "another-node-label-key",
Operator: "In",
Expand Down
Loading
Loading