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 1 commit 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
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
21 changes: 21 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,27 @@ 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
}
} else {
err = unstructured.SetNestedField(values, map[string]interface{}{}, 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
95 changes: 95 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 All @@ -188,6 +218,7 @@ func Test_pod_Process(t *testing.T) {
"nodeSelector": map[string]interface{}{},
"tolerations": []interface{}{},
"topologySpreadConstraints": []interface{}{},
"affinity": map[string]interface{}{},
},
}, tmpl)
})
Expand Down Expand Up @@ -221,6 +252,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 @@ -234,6 +266,7 @@ func Test_pod_Process(t *testing.T) {
"nodeSelector": map[string]interface{}{},
"tolerations": []interface{}{},
"topologySpreadConstraints": []interface{}{},
"affinity": map[string]interface{}{},
},
}, tmpl)
})
Expand Down Expand Up @@ -267,6 +300,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 @@ -280,6 +314,7 @@ func Test_pod_Process(t *testing.T) {
"nodeSelector": map[string]interface{}{},
"tolerations": []interface{}{},
"topologySpreadConstraints": []interface{}{},
"affinity": map[string]interface{}{},
},
}, tmpl)
})
Expand Down Expand Up @@ -313,6 +348,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 @@ -326,6 +362,7 @@ func Test_pod_Process(t *testing.T) {
"nodeSelector": map[string]interface{}{},
"tolerations": []interface{}{},
"topologySpreadConstraints": []interface{}{},
"affinity": map[string]interface{}{},
},
}, tmpl)
})
Expand Down Expand Up @@ -354,6 +391,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 @@ -373,8 +411,65 @@ func Test_pod_Process(t *testing.T) {
"nodeSelector": map[string]interface{}{},
"tolerations": []interface{}{},
"topologySpreadConstraints": []interface{}{},
"affinity": map[string]interface{}{},
},
}, 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)
})
}