Skip to content
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.

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

Add affinity support #436

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions reportportal/templates/service-api/api-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ spec:
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
{{- with .Values.serviceapi.affinity }}
affinity:
{{ toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.serviceapi.hostAliases }}
hostAliases:
{{- range . }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ spec:
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
{{- with .Values.uat.affinity }}
affinity:
{{ toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.uat.hostAliases }}
hostAliases:
{{- range . }}
Expand Down
4 changes: 4 additions & 0 deletions reportportal/templates/service-index/index-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ spec:
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
{{- with .Values.serviceindex.affinity }}
affinity:
{{ toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.global.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
Expand Down
4 changes: 4 additions & 0 deletions reportportal/templates/service-jobs/jobs-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ spec:
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
{{- with .Values.servicejobs.affinity }}
affinity:
{{ toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.global.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
Expand Down
4 changes: 4 additions & 0 deletions reportportal/templates/service-migrations/migrations-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ spec:
{{- end }}
spec:
restartPolicy: OnFailure
{{- with .Values.migrations.affinity }}
affinity:
{{ toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.global.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
Expand Down
4 changes: 4 additions & 0 deletions reportportal/templates/service-ui/ui-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ spec:
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
{{- with .Values.serviceui.affinity }}
affinity:
{{ toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.global.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ spec:
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
{{- with .Values.serviceanalyzer.affinity }}
affinity:
{{ toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.global.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ spec:
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
{{- with .Values.serviceanalyzertrain.affinity }}
affinity:
{{ toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.global.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ spec:
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
{{- with .Values.metricsgatherer.affinity }}
affinity:
{{ toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.global.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
Expand Down
11 changes: 10 additions & 1 deletion reportportal/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ serviceindex:
## Use disktype: "ssd" for specific disk type.
##
nodeSelector: {}
affinity: {}
service:
type: ""
portName: ""
Expand Down Expand Up @@ -95,8 +96,9 @@ serviceui:
# - name: extra-volume
# mountPath: /path/to/mount
# readOnly: true

podLabels: {}
affinity: {}
podAnnotations: {}
securityContext: {}
## @param serviceui.nodeSelector define which Nodes the Pods are scheduled on.
Expand Down Expand Up @@ -227,6 +229,7 @@ serviceapi:
# secretKeyRef:
# name: "additional-credentials"
# key: username
affinity: {}
podLabels: {}
podAnnotations: {}
securityContext: {}
Expand Down Expand Up @@ -347,6 +350,7 @@ uat:
## Use kubernetes.io/arch: "ARCHITECTURE" for specific GKE Autopilot CPU architecture.
##
nodeSelector: {}
affinity: {}
serviceAccountName: ""

## @param uat.secret define the secret configuration
Expand Down Expand Up @@ -467,6 +471,7 @@ servicejobs:
## Use kubernetes.io/arch: ARCHITECTURE for specific GKE Autopilot CPU architecture.
##
nodeSelector: {}
affinity: {}
serviceAccountName: ""

service:
Expand Down Expand Up @@ -525,6 +530,7 @@ serviceanalyzer:
## Use kubernetes.io/arch: "ARCHITECTURE" for specific GKE Autopilot CPU architecture.
##
nodeSelector: {}
affinity: {}
serviceAccountName: ""
service:
type: ""
Expand Down Expand Up @@ -578,6 +584,7 @@ serviceanalyzertrain:
## Use kubernetes.io/arch: "ARCHITECTURE" for specific GKE Autopilot CPU architecture.
##
nodeSelector: {}
affinity: {}
serviceAccountName: ""
service:
type: ""
Expand Down Expand Up @@ -632,6 +639,7 @@ metricsgatherer:
## Use kubernetes.io/arch: "ARCHITECTURE" for specific GKE Autopilot CPU architecture.
##
nodeSelector: {}
affinity: {}
serviceAccountName: ""
service:
type: ""
Expand All @@ -652,6 +660,7 @@ migrations:
cpu: 100m
memory: 128Mi
pullPolicy: Always
affinity: {}
podLabels: {}
podAnnotations: {}
securityContext: {}
Expand Down