Skip to content

Add: Pod affinity #189

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

Open
JPaja wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Add: Pod affinity #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cb29c6
Add: pod affinity
JPaja Jan 4, 2026
9002160
Add: affinity to sample-app.yaml
JPaja Feb 11, 2026
2dad10e
Remove affinity from default values
JPaja Mar 25, 2026
5415cc3
Regenerate chart examples for pod affinity changes
JPaja Apr 3, 2026
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
1 change: 1 addition & 0 deletions examples/app/templates/batch-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ spec:
backoffLimit: {{ .Values.batchJob.backoffLimit }}
template:
spec:
affinity: {{- toYaml .Values.batchJob.affinity | nindent 8 }}
Copy link
Copy Markdown
Owner

@arttor arttor Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can see that affinity was added to myapp deployment and it was correctly templated and added to values.yaml. But why manifests without affinity in soruce were templated?

containers:
- command:
- perl
Expand Down
1 change: 1 addition & 0 deletions examples/app/templates/cron-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ spec:
spec:
template:
spec:
affinity: {{- toYaml .Values.cronJob.affinity | nindent 12 }}
Copy link
Copy Markdown
Owner

@arttor arttor Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can see that affinity was added to myapp deployment and it was correctly templated and added to values.yaml. But why manifests without affinity in soruce were templated?

containers:
- command:
- /bin/sh
Expand Down
1 change: 1 addition & 0 deletions examples/app/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ spec:
name: fluentd-elasticsearch
{{- include "app.selectorLabels" . | nindent 8 }}
spec:
affinity: {{- toYaml .Values.fluentdElasticsearch.affinity | nindent 8 }}
Copy link
Copy Markdown
Owner

@arttor arttor Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can see that affinity was added to myapp deployment and it was correctly templated and added to values.yaml. But why manifests without affinity in soruce were templated?

containers:
- env:
- name: KUBERNETES_CLUSTER_DOMAIN
Expand Down
1 change: 1 addition & 0 deletions examples/app/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ spec:
app: myapp
{{- include "app.selectorLabels" . | nindent 8 }}
spec:
affinity: {{- toYaml .Values.myapp.affinity | nindent 8 }}
containers:
- args: {{- toYaml .Values.myapp.app.args | nindent 8 }}
command:
Expand Down
1 change: 1 addition & 0 deletions examples/app/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ spec:
labels:
app: nginx
spec:
affinity: {{- toYaml .Values.web.affinity | nindent 8 }}
Copy link
Copy Markdown
Owner

@arttor arttor Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can see that affinity was added to myapp deployment and it was correctly templated and added to values.yaml. But why manifests without affinity in soruce were templated?

containers:
- env:
- name: KUBERNETES_CLUSTER_DOMAIN
Expand Down
7 changes: 7 additions & 0 deletions examples/app/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ mySecretVars:
var1: ""
var2: ""
myapp:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: node-role.kubernetes.io/control-plane
operator: Exists
app:
args:
- --health-probe-bind-address=:8081
Expand Down
1 change: 1 addition & 0 deletions examples/operator/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ spec:
control-plane: controller-manager
{{- include "operator.selectorLabels" . | nindent 8 }}
spec:
affinity: {{- toYaml .Values.controllerManager.affinity | nindent 8 }}
containers:
- args: {{- toYaml .Values.controllerManager.kubeRbacProxy.args | nindent 8 }}
env:
Expand Down
16 changes: 16 additions & 0 deletions pkg/processor/pod/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,22 @@ func ProcessSpec(objName string, appMeta helmify.AppMetadata, spec corev1.PodSpe
}
}

// process affinity if presented:
err = unstructured.SetNestedField(specMap, fmt.Sprintf(`{{- toYaml .Values.%s.affinity | nindent %d }}`, objName, nindent), "affinity")
if err != nil {
return nil, nil, err
}
if spec.Affinity != nil {
affinityMap, err := runtime.DefaultUnstructuredConverter.ToUnstructured(spec.Affinity)
if err != nil {
return nil, nil, err
}
err = unstructured.SetNestedField(values, affinityMap, objName, "affinity")
if err != nil {
return nil, nil, err
}
}

// process tolerations if presented:
err = unstructured.SetNestedField(specMap, fmt.Sprintf(`{{- toYaml .Values.%s.tolerations | nindent %d }}`, objName, nindent), "tolerations")
if err != nil {
Expand Down
90 changes: 90 additions & 0 deletions pkg/processor/pod/pod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,35 @@ spec:
runAsNonRoot: true
runAsUser: 65532

`
strDeploymentWithAffinity = `
apiVersion: apps/v1
kind: Deployment
metadata:
name: nginx-deployment
labels:
app: nginx
spec:
replicas: 3
selector:
matchLabels:
app: nginx
template:
metadata:
labels:
app: nginx
spec:
containers:
- name: nginx
image: localhost:6001/my_project:latest
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: node-role.kubernetes.io/control-plane
operator: Exists

`
)

Expand Down Expand Up @@ -171,6 +200,7 @@ func Test_pod_Process(t *testing.T) {
"topologySpreadConstraints": "{{- toYaml .Values.nginx.topologySpreadConstraints | nindent 8 }}",
"nodeSelector": "{{- toYaml .Values.nginx.nodeSelector | nindent 8 }}",
"serviceAccountName": `{{ include ".serviceAccountName" . }}`,
"affinity": "{{- toYaml .Values.nginx.affinity | nindent 8 }}",
}, specMap)

assert.Equal(t, helmify.Values{
Expand Down Expand Up @@ -221,6 +251,7 @@ func Test_pod_Process(t *testing.T) {
"serviceAccountName": `{{ include ".serviceAccountName" . }}`,
"tolerations": "{{- toYaml .Values.nginx.tolerations | nindent 8 }}",
"topologySpreadConstraints": "{{- toYaml .Values.nginx.topologySpreadConstraints | nindent 8 }}",
"affinity": "{{- toYaml .Values.nginx.affinity | nindent 8 }}",
}, specMap)

assert.Equal(t, helmify.Values{
Expand Down Expand Up @@ -267,6 +298,7 @@ func Test_pod_Process(t *testing.T) {
"serviceAccountName": `{{ include ".serviceAccountName" . }}`,
"tolerations": "{{- toYaml .Values.nginx.tolerations | nindent 8 }}",
"topologySpreadConstraints": "{{- toYaml .Values.nginx.topologySpreadConstraints | nindent 8 }}",
"affinity": "{{- toYaml .Values.nginx.affinity | nindent 8 }}",
}, specMap)

assert.Equal(t, helmify.Values{
Expand Down Expand Up @@ -313,6 +345,7 @@ func Test_pod_Process(t *testing.T) {
"serviceAccountName": `{{ include ".serviceAccountName" . }}`,
"tolerations": "{{- toYaml .Values.nginx.tolerations | nindent 8 }}",
"topologySpreadConstraints": "{{- toYaml .Values.nginx.topologySpreadConstraints | nindent 8 }}",
"affinity": "{{- toYaml .Values.nginx.affinity | nindent 8 }}",
}, specMap)

assert.Equal(t, helmify.Values{
Expand Down Expand Up @@ -354,6 +387,7 @@ func Test_pod_Process(t *testing.T) {
"serviceAccountName": `{{ include ".serviceAccountName" . }}`,
"tolerations": "{{- toYaml .Values.nginx.tolerations | nindent 8 }}",
"topologySpreadConstraints": "{{- toYaml .Values.nginx.topologySpreadConstraints | nindent 8 }}",
"affinity": "{{- toYaml .Values.nginx.affinity | nindent 8 }}",
}, specMap)

assert.Equal(t, helmify.Values{
Expand All @@ -376,5 +410,61 @@ func Test_pod_Process(t *testing.T) {
},
}, tmpl)
})
t.Run("deployment with affinity", func(t *testing.T) {
var deploy appsv1.Deployment
obj := internal.GenerateObj(strDeploymentWithAffinity)
err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, &deploy)
specMap, tmpl, err := ProcessSpec("nginx", &metadata.Service{}, deploy.Spec.Template.Spec, 0)
assert.NoError(t, err)
assert.Equal(t, map[string]interface{}{
"containers": []interface{}{
map[string]interface{}{
"env": []interface{}{
map[string]interface{}{
"name": "KUBERNETES_CLUSTER_DOMAIN",
"value": "{{ quote .Values.kubernetesClusterDomain }}",
},
},
"image": "{{ .Values.nginx.nginx.image.repository }}:{{ .Values.nginx.nginx.image.tag | default .Chart.AppVersion }}",
"name": "nginx",
"resources": map[string]interface{}{},
},
},
"nodeSelector": "{{- toYaml .Values.nginx.nodeSelector | nindent 8 }}",
"serviceAccountName": `{{ include ".serviceAccountName" . }}`,
"tolerations": "{{- toYaml .Values.nginx.tolerations | nindent 8 }}",
"topologySpreadConstraints": "{{- toYaml .Values.nginx.topologySpreadConstraints | nindent 8 }}",
"affinity": "{{- toYaml .Values.nginx.affinity | nindent 8 }}",
}, specMap)

assert.Equal(t, helmify.Values{
"nginx": map[string]interface{}{
"affinity": map[string]interface{}{
"nodeAffinity": map[string]interface{}{
"requiredDuringSchedulingIgnoredDuringExecution": map[string]interface{}{
"nodeSelectorTerms": []interface{}{
map[string]interface{}{
"matchExpressions": []interface{}{
map[string]interface{}{
"key": "node-role.kubernetes.io/control-plane",
"operator": "Exists",
},
},
},
},
},
},
},
"nginx": map[string]interface{}{
"image": map[string]interface{}{
"repository": "localhost:6001/my_project",
"tag": "latest",
},
},
"nodeSelector": map[string]interface{}{},
"tolerations": []interface{}{},
"topologySpreadConstraints": []interface{}{},
},
}, tmpl)
})
}
9 changes: 8 additions & 1 deletion test_data/sample-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@ spec:
nodeSelector:
region: east
type: user-node
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: node-role.kubernetes.io/control-plane
operator: Exists
terminationGracePeriodSeconds: 10
volumes:
- configMap:
Expand Down Expand Up @@ -166,7 +173,7 @@ metadata:
spec:
ipFamilyPolicy: SingleStack
ipFamilies:
- IPv4
- IPv4
ports:
- name: https
port: 8443
Expand Down
Loading