Skip to content

add nodeselector/affinity/tolerations/capabilities to separate r10k deployment #10

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
ke5C2Fin wants to merge 7 commits into
base: main
Choose a base branch
from
Open

add nodeselector/affinity/tolerations/capabilities to separate r10k deployment #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
890ace7
add affinity/tolerations/capabilities to r10k deployment, fix | spaci…
ke5C2Fin Sep 3, 2025
af08ba0
nodeSelector typo
ke5C2Fin Sep 3, 2025
5ef511d
missing {
ke5C2Fin Sep 3, 2025
608f937
spacing
ke5C2Fin Jan 15, 2026
fa97406
spacing
ke5C2Fin Jan 15, 2026
1ed9017
changelog
ke5C2Fin Jan 15, 2026
009e960
Merge branch 'main' into affinity
anthonysomerset Mar 18, 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
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,18 @@

[Full Changelog](https://github.com/OpenVoxProject/openvox-helm-chart/compare/v10.0.1...HEAD)

<<<<<<< affinity
## [v10.1.0](https://github.com/OpenVoxProject/openvox-helm-chart/tree/v10.1.0) (2026-01-15)
- Feat: Add affinity, nodeSelector, tolerations, and priorityClassName to r10k deployment
- Fix: Change puppetmaster deplyoment affinity to use template which includes antiaffinity rules for multimasters
- Fix: Cosmetic whitespace fixes

## [v10.0.0](https://github.com/OpenVoxProject/openvox-helm-chart/tree/v10.0.0) (2025-03-19)
- Feat: Switch to OpenVox Containers
- Feat: Default to Openvox v8 of OpenVox-server and OpenVoxDB
=======
**Fixed bugs:**
>>>>>>> main

- \[Bug\]: CI tests failing due to bitnami image removals [\#14](https://github.com/OpenVoxProject/openvox-helm-chart/issues/14)

Expand Down
21 changes: 18 additions & 3 deletions templates/puppet-r10k-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
command:
{{- range .Values.r10k.code.command }}
- {{ . | quote }}
{{- end}}
{{- end }}
args:
{{- range .Values.r10k.code.args }}
- {{ . | quote }}
Expand Down Expand Up @@ -164,7 +164,7 @@ spec:
- name: r10k-hiera-volume
mountPath: /etc/puppetlabs/puppet/r10k_hiera.yaml
subPath: r10k_hiera.yaml
{{- if and (or (.Values.hiera.eyaml.existingMap) (.Values.hiera.eyaml.existingSecret)) (not .Values.hiera.eyaml.public_key) (not .Values.hiera.eyaml.private_key) }}
{{- if and (or (.Values.hiera.eyaml.existingMap) (.Values.hiera.eyaml.existingSecret)) (not .Values.hiera.eyaml.public_key) (not .Values.hiera.eyaml.private_key) }}
- name: eyaml-volume
mountPath: /etc/puppetlabs/puppet/eyaml/keys
{{- end }}
Expand Down Expand Up @@ -265,7 +265,7 @@ spec:
- name: eyamlpriv-volume
secret:
secretName: {{ template "puppetserver.hiera.privateSecret" . }}
{{- else if .Values.hiera.eyaml.existingMap }}
{{- else if .Values.hiera.eyaml.existingMap }}
- name: eyaml-volume
configMap:
name: {{ .Values.hiera.eyaml.existingMap }}
Expand All @@ -276,4 +276,19 @@ spec:
secret:
secretName: {{ $extraSecret.name }}
{{- end }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | nindent 10 }}
{{- end }}
{{- if .Values.affinity }}
affinity:
{{ toYaml .Values.affinity | nindent 10 }}
{{- end }}
{{- if .Values.tolerations }}
tolerations:
{{ toYaml .Values.tolerations | nindent 10 }}
{{- end }}
{{- if and (.Capabilities.APIVersions.Has "scheduling.k8s.io/v1beta1") (.Values.priorityClassName) }}
priorityClassName: {{ .Values.priorityClassName }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion templates/puppetdb-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ spec:
{{- end }}
{{- if .Values.tolerations }}
tolerations:
{{ toYaml .Values.tolerations| nindent 10 }}
{{ toYaml .Values.tolerations | nindent 10 }}
{{- end }}
{{- if and (.Capabilities.APIVersions.Has "scheduling.k8s.io/v1beta1") (.Values.priorityClassName) }}
priorityClassName: {{ .Values.priorityClassName }}
Expand Down
2 changes: 1 addition & 1 deletion templates/puppetserver-deployment-compilers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ spec:
{{ template "puppetserver.compilers.affinity" . }}
{{- if .Values.tolerations }}
tolerations:
{{ toYaml .Values.tolerations| nindent 10 }}
{{ toYaml .Values.tolerations | nindent 10 }}
{{- end }}
{{- if and (.Capabilities.APIVersions.Has "scheduling.k8s.io/v1beta1") (.Values.priorityClassName) }}
priorityClassName: {{ .Values.priorityClassName }}
Expand Down
7 changes: 2 additions & 5 deletions templates/puppetserver-deployment-masters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,13 +756,10 @@ spec:
nodeSelector:
{{ toYaml .Values.nodeSelector | nindent 10 }}
{{- end }}
{{- if .Values.affinity }}
affinity:
{{ toYaml .Values.affinity | nindent 10 }}
{{- end }}
{{ template "puppetserver.masters.affinity" . }}
{{- if .Values.tolerations }}
tolerations:
{{ toYaml .Values.tolerations| nindent 10 }}
{{ toYaml .Values.tolerations | nindent 10 }}
{{- end }}
{{- if and (.Capabilities.APIVersions.Has "scheduling.k8s.io/v1beta1") (.Values.priorityClassName) }}
priorityClassName: {{ .Values.priorityClassName }}
Expand Down
Loading