Skip to content

add nodeSelector, tolerations and nodeAffinity template values #8

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
vigneshrajsb merged 1 commit into from
Aug 18, 2025
Merged

add nodeSelector, tolerations and nodeAffinity template values #8

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
12 changes: 12 additions & 0 deletions helm/chart/templates/g2krelay-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@ spec:
labels:
app: g2krelay
spec:
{{- with .Values.g2krelay.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.g2krelay.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.g2krelay.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: g2krelay
image: {{ include "g2k.g2krelay.image" . | quote }}
Expand Down
12 changes: 12 additions & 0 deletions helm/chart/templates/g2krepeater-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,18 @@ spec:
app: g2krepeater
instance: {{ $name }}
spec:
{{- with $config.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with $config.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with $config.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: g2krepeater
image: {{ include "g2k.g2krepeater.image" (dict "imageConfig" $config.image "chartAppVersion" $.Chart.AppVersion) | quote }}
Expand Down
96 changes: 95 additions & 1 deletion helm/chart/tests/g2krelay-deployment_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,98 @@ tests:
g2krelay.enabled: false
asserts:
- hasDocuments:
count: 0
count: 0

- it: should include nodeSelector when specified
set:
g2krelay.enabled: true
g2krelay.envVars:
WEBHOOK_SECRET: "my-secret-key"
g2krelay.nodeSelector:
node-type: worker
environment: production
asserts:
- equal:
path: spec.template.spec.nodeSelector
value:
node-type: worker
environment: production

- it: should include affinity when specified
set:
g2krelay.enabled: true
g2krelay.envVars:
WEBHOOK_SECRET: "my-secret-key"
g2krelay.affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/arch
operator: In
values:
- amd64
asserts:
- equal:
path: spec.template.spec.affinity
value:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/arch
operator: In
values:
- amd64

- it: should include tolerations when specified
set:
g2krelay.enabled: true
g2krelay.envVars:
WEBHOOK_SECRET: "my-secret-key"
g2krelay.tolerations:
- key: "node-group"
operator: "Equal"
value: "g2k-nodes"
effect: "NoSchedule"
- key: "special"
operator: "Exists"
effect: "NoExecute"
asserts:
- equal:
path: spec.template.spec.tolerations
value:
- key: "node-group"
operator: "Equal"
value: "g2k-nodes"
effect: "NoSchedule"
- key: "special"
operator: "Exists"
effect: "NoExecute"

- it: should not include nodeSelector when not specified
set:
g2krelay.enabled: true
g2krelay.envVars:
WEBHOOK_SECRET: "my-secret-key"
asserts:
- isNull:
path: spec.template.spec.nodeSelector

- it: should not include affinity when not specified
set:
g2krelay.enabled: true
g2krelay.envVars:
WEBHOOK_SECRET: "my-secret-key"
asserts:
- isNull:
path: spec.template.spec.affinity

- it: should not include tolerations when not specified
set:
g2krelay.enabled: true
g2krelay.envVars:
WEBHOOK_SECRET: "my-secret-key"
asserts:
- isNull:
path: spec.template.spec.tolerations
195 changes: 195 additions & 0 deletions helm/chart/tests/g2krepeater-deployment_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
suite: test g2krepeater deployment
templates:
- g2krepeater-deployment.yaml
tests:
- it: should include nodeSelector when specified for single instance
set:
g2krepeaters:
default:
enabled: true
replicas: 1
envVars:
KAFKA_GROUP_ID: "default-group"
nodeSelector:
node-type: worker
environment: production
asserts:
- equal:
path: spec.template.spec.nodeSelector
value:
node-type: worker
environment: production

- it: should include affinity when specified for single instance
set:
g2krepeaters:
default:
enabled: true
replicas: 1
envVars:
KAFKA_GROUP_ID: "default-group"
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/arch
operator: In
values:
- amd64
asserts:
- equal:
path: spec.template.spec.affinity
value:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/arch
operator: In
values:
- amd64

- it: should include tolerations when specified for single instance
set:
g2krepeaters:
default:
enabled: true
replicas: 1
envVars:
KAFKA_GROUP_ID: "default-group"
tolerations:
- key: "node-group"
operator: "Equal"
value: "g2k-nodes"
effect: "NoSchedule"
- key: "special"
operator: "Exists"
effect: "NoExecute"
asserts:
- equal:
path: spec.template.spec.tolerations
value:
- key: "node-group"
operator: "Equal"
value: "g2k-nodes"
effect: "NoSchedule"
- key: "special"
operator: "Exists"
effect: "NoExecute"

- it: should not include nodeSelector when not specified
set:
g2krepeaters:
default:
enabled: true
replicas: 1
envVars:
KAFKA_GROUP_ID: "default-group"
asserts:
- isNull:
path: spec.template.spec.nodeSelector

- it: should not include affinity when not specified
set:
g2krepeaters:
default:
enabled: true
replicas: 1
envVars:
KAFKA_GROUP_ID: "default-group"
asserts:
- isNull:
path: spec.template.spec.affinity

- it: should not include tolerations when not specified
set:
g2krepeaters:
default:
enabled: true
replicas: 1
envVars:
KAFKA_GROUP_ID: "default-group"
asserts:
- isNull:
path: spec.template.spec.tolerations

- it: should handle multiple instances with different node scheduling configs
set:
g2krepeaters:
instance1:
enabled: true
replicas: 1
envVars:
KAFKA_GROUP_ID: "group1"
nodeSelector:
node-type: worker
instance2:
enabled: true
replicas: 2
envVars:
KAFKA_GROUP_ID: "group2"
tolerations:
- key: "dedicated"
operator: "Equal"
value: "g2k"
effect: "NoSchedule"
asserts:
- hasDocuments:
count: 2
- equal:
path: spec.template.spec.nodeSelector
value:
node-type: worker
documentIndex: 0
- isNull:
path: spec.template.spec.nodeSelector
documentIndex: 1
- equal:
path: spec.template.spec.tolerations
value:
- key: "dedicated"
operator: "Equal"
value: "g2k"
effect: "NoSchedule"
documentIndex: 1
- isNull:
path: spec.template.spec.tolerations
documentIndex: 0

- it: should not render when no g2krepeaters are enabled
set:
g2krepeaters: {}
asserts:
- hasDocuments:
count: 0

- it: should support backward compatibility with legacy g2krepeater config
set:
g2krepeater:
enabled: true
replicas: 1
envVars:
KAFKA_GROUP_ID: "legacy-group"
nodeSelector:
legacy: "true"
tolerations:
- key: "legacy"
operator: "Exists"
effect: "NoSchedule"
asserts:
- hasDocuments:
count: 1
- equal:
path: metadata.name
value: g2krepeater-default
- equal:
path: spec.template.spec.nodeSelector
value:
legacy: "true"
- equal:
path: spec.template.spec.tolerations
value:
- key: "legacy"
operator: "Exists"
effect: "NoSchedule"