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 1 commit into
base: main
Choose a base branch
from
+22 −10
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
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: 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 @@ -413,7 +413,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