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.

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

daemons, ui, webui: add policy package support #236

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

daemons, ui, webui: add policy package support #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3ea057
ui: add policy package support
rdimaio Feb 24, 2025
eaf518e
webui: add policy package support
rdimaio Feb 24, 2025
c4355cc
daemons: add policy package support
rdimaio Feb 24, 2025
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
2 changes: 1 addition & 1 deletion charts/rucio-daemons/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: rucio-daemons
version: 36.0.4
version: 36.0.5
apiVersion: v1
description: A Helm chart to deploy daemons for Rucio
keywords:
Expand Down
16 changes: 16 additions & 0 deletions charts/rucio-daemons/templates/abacus-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ spec:
- name: config-component
secret:
secretName: {{ template "rucio.fullname" . }}.config.{{ .rucio_daemon }}
{{- if .Values.policyPackages.enabled }}
- name: policy-package-volume
persistentVolumeClaim:
claimName: policy-package-volume
{{- end }}
{{- if .Values.useDeprecatedImplicitSecrets }}
- name: proxy-volume
secret:
Expand Down Expand Up @@ -103,6 +108,9 @@ spec:
path: {{ $val.hostPath }}
{{- end}}
{{- end}}
{{- if .Values.policyPackages.enabled }}
{{ include "rucio-daemons.policy-package-init-container" . | indent 6 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce (.component_values.image | default dict).tag .Values.image.tag }}"
Expand All @@ -120,6 +128,10 @@ spec:
- name: config-component
mountPath: /opt/rucio/etc/conf.d/20_component.json
subPath: component.json
{{- if .Values.policyPackages.enabled }}
- name: policy-package-volume
mountPath: {{ .Values.policyPackages.mountPath }}
{{- end }}
{{- range $collection := tuple (coalesce .component_values.secretMounts .Values.secretMounts) .component_values.extraSecretMounts }}
{{- range $key, $val := $collection }}
- name: {{ coalesce $val.volumeName $val.secretName $val.secretFullName }}
Expand Down Expand Up @@ -155,6 +167,10 @@ spec:
value: "{{ .rucio_daemon }}"
- name: RUCIO_DAEMON_ARGS
value: "{{ .daemon_args }}"
{{- if .Values.policyPackages.enabled}}
- name: PYTHONPATH
value: {{.Values.policyPackages.mountPath}}:${PYTHONPATH}
{{- end}}
{{- with .component_values.additionalEnvs }}
{{ toYaml . | indent 12 }}
{{- end}}
Expand Down
16 changes: 16 additions & 0 deletions charts/rucio-daemons/templates/automatix-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ spec:
- name: config-component
secret:
secretName: {{ template "rucio.fullname" . }}.config.{{ $rucio_daemon }}
{{- if .Values.policyPackages.enabled }}
- name: policy-package-volume
persistentVolumeClaim:
claimName: policy-package-volume
{{- end }}
{{- if .Values.useDeprecatedImplicitSecrets }}
- name: proxy-volume
secret:
Expand Down Expand Up @@ -108,6 +113,9 @@ spec:
path: {{ $val.hostPath }}
{{- end}}
{{- end}}
{{- if .Values.policyPackages.enabled }}
{{ include "rucio-daemons.policy-package-init-container" . | indent 6 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
Expand All @@ -127,6 +135,10 @@ spec:
- name: config-component
mountPath: /opt/rucio/etc/conf.d/20_component.json
subPath: component.json
{{- if .Values.policyPackages.enabled }}
- name: policy-package-volume
mountPath: {{ .Values.policyPackages.mountPath }}
{{- end }}
{{- range $collection := tuple (coalesce $component_values.secretMounts .Values.secretMounts) $component_values.extraSecretMounts }}
{{- range $key, $val := $collection }}
- name: {{ coalesce $val.volumeName $val.secretName $val.secretFullName }}
Expand Down Expand Up @@ -166,6 +178,10 @@ spec:
- name: X509_USER_PROXY
value: "/opt/proxy/x509up"
{{- end }}
{{- if .Values.policyPackages.enabled}}
- name: PYTHONPATH
value: {{.Values.policyPackages.mountPath}}:${PYTHONPATH}
{{- end}}
{{- with $component_values.additionalEnvs }}
{{ toYaml . | indent 12 }}
{{- end}}
Expand Down
16 changes: 16 additions & 0 deletions charts/rucio-daemons/templates/cache-consumer-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ spec:
- name: config-component
secret:
secretName: {{ template "rucio.fullname" . }}.config.{{ $rucio_daemon }}
{{- if .Values.policyPackages.enabled }}
- name: policy-package-volume
persistentVolumeClaim:
claimName: policy-package-volume
{{- end }}
{{- range $collection := tuple (coalesce $component_values.secretMounts .Values.secretMounts) $component_values.extraSecretMounts }}
{{- range $key, $val := $collection }}
- name: {{ coalesce $val.volumeName $val.secretName $val.secretFullName }}
Expand All @@ -97,6 +102,9 @@ spec:
path: {{ $val.hostPath }}
{{- end}}
{{- end}}
{{- if .Values.policyPackages.enabled }}
{{ include "rucio-daemons.policy-package-init-container" . | indent 6 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
Expand All @@ -108,6 +116,10 @@ spec:
- name: config-component
mountPath: /opt/rucio/etc/conf.d/20_component.json
subPath: component.json
{{- if .Values.policyPackages.enabled }}
- name: policy-package-volume
mountPath: {{ .Values.policyPackages.mountPath }}
{{- end }}
{{- range $collection := tuple (coalesce $component_values.secretMounts .Values.secretMounts) $component_values.extraSecretMounts }}
{{- range $key, $val := $collection }}
- name: {{ coalesce $val.volumeName $val.secretName $val.secretFullName }}
Expand Down Expand Up @@ -143,6 +155,10 @@ spec:
value: "{{ $rucio_daemon }}"
- name: RUCIO_DAEMON_ARGS
value: "{{- if $component_values.threads }} --num-thread {{ $component_values.threads }} {{ end }}"
{{- if .Values.policyPackages.enabled}}
- name: PYTHONPATH
value: {{.Values.policyPackages.mountPath}}:${PYTHONPATH}
{{- end}}
{{- with $component_values.additionalEnvs }}
{{ toYaml . | indent 12 }}
{{- end}}
Expand Down
16 changes: 16 additions & 0 deletions charts/rucio-daemons/templates/conveyor-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ spec:
- name: config-component
secret:
secretName: {{ template "rucio.fullname" . }}.config.{{ .rucio_daemon }}
{{- if .Values.policyPackages.enabled }}
- name: policy-package-volume
persistentVolumeClaim:
claimName: policy-package-volume
{{- end }}
{{- if .Values.useDeprecatedImplicitSecrets }}
- name: proxy-volume
secret:
Expand Down Expand Up @@ -103,6 +108,9 @@ spec:
path: {{ $val.hostPath }}
{{- end}}
{{- end}}
{{- if .Values.policyPackages.enabled }}
{{ include "rucio-daemons.policy-package-init-container" . | indent 6 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce (.component_values.image | default dict).tag .Values.image.tag }}"
Expand All @@ -120,6 +128,10 @@ spec:
- name: config-component
mountPath: /opt/rucio/etc/conf.d/20_component.json
subPath: component.json
{{- if .Values.policyPackages.enabled }}
- name: policy-package-volume
mountPath: {{ .Values.policyPackages.mountPath }}
{{- end }}
{{- range $collection := tuple (coalesce .component_values.secretMounts .Values.secretMounts) .component_values.extraSecretMounts }}
{{- range $key, $val := $collection }}
- name: {{ coalesce $val.volumeName $val.secretName $val.secretFullName }}
Expand Down Expand Up @@ -155,6 +167,10 @@ spec:
value: "{{ .rucio_daemon }}"
- name: RUCIO_DAEMON_ARGS
value: "{{ .daemon_args }}"
{{- if .Values.policyPackages.enabled}}
- name: PYTHONPATH
value: {{.Values.policyPackages.mountPath}}:${PYTHONPATH}
{{- end}}
{{- with .component_values.additionalEnvs }}
{{ toYaml . | indent 12 }}
{{- end}}
Expand Down
16 changes: 16 additions & 0 deletions charts/rucio-daemons/templates/dark-reaper-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ spec:
- name: config-component
secret:
secretName: {{ template "rucio.fullname" . }}.config.{{ $rucio_daemon }}
{{- if .Values.policyPackages.enabled }}
- name: policy-package-volume
persistentVolumeClaim:
claimName: policy-package-volume
{{- end }}
{{- if .Values.useDeprecatedImplicitSecrets }}
- name: proxy-volume
secret:
Expand Down Expand Up @@ -105,6 +110,9 @@ spec:
path: {{ $val.hostPath }}
{{- end}}
{{- end}}
{{- if .Values.policyPackages.enabled }}
{{ include "rucio-daemons.policy-package-init-container" . | indent 6 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
Expand All @@ -122,6 +130,10 @@ spec:
- name: config-component
mountPath: /opt/rucio/etc/conf.d/20_component.json
subPath: component.json
{{- if .Values.policyPackages.enabled }}
- name: policy-package-volume
mountPath: {{ .Values.policyPackages.mountPath }}
{{- end }}
{{- range $collection := tuple (coalesce $component_values.secretMounts .Values.secretMounts) $component_values.extraSecretMounts }}
{{- range $key, $val := $collection }}
- name: {{ coalesce $val.volumeName $val.secretName $val.secretFullName }}
Expand Down Expand Up @@ -165,6 +177,10 @@ spec:
- name: X509_USER_PROXY
value: "/opt/proxy/x509up"
{{- end }}
{{- if .Values.policyPackages.enabled}}
- name: PYTHONPATH
value: {{.Values.policyPackages.mountPath}}:${PYTHONPATH}
{{- end}}
{{- with $component_values.additionalEnvs }}
{{ toYaml . | indent 12 }}
{{- end}}
Expand Down
16 changes: 16 additions & 0 deletions charts/rucio-daemons/templates/hermes-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ spec:
- name: config-component
secret:
secretName: {{ template "rucio.fullname" . }}.config.{{ $rucio_daemon }}
{{- if .Values.policyPackages.enabled }}
- name: policy-package-volume
persistentVolumeClaim:
claimName: policy-package-volume
{{- end }}
{{ if $component_values.useSSL }}
- name: usercert
secret:
Expand Down Expand Up @@ -105,6 +110,9 @@ spec:
path: {{ $val.hostPath }}
{{- end}}
{{- end}}
{{- if .Values.policyPackages.enabled }}
{{ include "rucio-daemons.policy-package-init-container" . | indent 6 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
Expand All @@ -122,6 +130,10 @@ spec:
- name: config-component
mountPath: /opt/rucio/etc/conf.d/20_component.json
subPath: component.json
{{- if .Values.policyPackages.enabled }}
- name: policy-package-volume
mountPath: {{ .Values.policyPackages.mountPath }}
{{- end }}
{{- range $collection := tuple (coalesce $component_values.secretMounts .Values.secretMounts) $component_values.extraSecretMounts }}
{{- range $key, $val := $collection }}
- name: {{ coalesce $val.volumeName $val.secretName $val.secretFullName }}
Expand Down Expand Up @@ -157,6 +169,10 @@ spec:
value: "{{ $rucio_daemon }}"
- name: RUCIO_DAEMON_ARGS
value: "{{- if $component_values.threads }} --threads {{ $component_values.threads }}{{ end }} {{ if $component_values.bulk }} --bulk {{ $component_values.bulk }}{{ end }}"
{{- if .Values.policyPackages.enabled}}
- name: PYTHONPATH
value: {{.Values.policyPackages.mountPath}}:${PYTHONPATH}
{{- end}}
{{- with $component_values.additionalEnvs }}
{{ toYaml . | indent 12 }}
{{- end}}
Expand Down
16 changes: 16 additions & 0 deletions charts/rucio-daemons/templates/hermes-legacy-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ spec:
- name: config-component
secret:
secretName: {{ template "rucio.fullname" . }}.config.{{ $rucio_daemon }}
{{- if .Values.policyPackages.enabled }}
- name: policy-package-volume
persistentVolumeClaim:
claimName: policy-package-volume
{{- end }}
{{ if $component_values.useSSL }}
- name: usercert
secret:
Expand Down Expand Up @@ -105,6 +110,9 @@ spec:
path: {{ $val.hostPath }}
{{- end}}
{{- end}}
{{- if .Values.policyPackages.enabled }}
{{ include "rucio-daemons.policy-package-init-container" . | indent 6 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
Expand All @@ -122,6 +130,10 @@ spec:
- name: config-component
mountPath: /opt/rucio/etc/conf.d/20_component.json
subPath: component.json
{{- if .Values.policyPackages.enabled }}
- name: policy-package-volume
mountPath: {{ .Values.policyPackages.mountPath }}
{{- end }}
{{- range $collection := tuple (coalesce $component_values.secretMounts .Values.secretMounts) $component_values.extraSecretMounts }}
{{- range $key, $val := $collection }}
- name: {{ coalesce $val.volumeName $val.secretName $val.secretFullName }}
Expand Down Expand Up @@ -157,6 +169,10 @@ spec:
value: "{{ $rucio_daemon }}"
- name: RUCIO_DAEMON_ARGS
value: "{{- if $component_values.threads }} --threads {{ $component_values.threads }}{{ end }} {{- if $component_values.bulk }} --bulk {{ $component_values.bulk }}{{ end }} {{- if $component_values.sleepTime }} --sleep-time {{ $component_values.sleepTime }}{{ end }} {{- if $component_values.brokerTimeout }} --broker-timeout {{ $component_values.brokerTimeout }}{{ end }} {{- if $component_values.brokerRetry }} --broker-retry {{ $component_values.brokerRetry }}{{ end }}"
{{- if .Values.policyPackages.enabled}}
- name: PYTHONPATH
value: {{.Values.policyPackages.mountPath}}:${PYTHONPATH}
{{- end}}
{{- with $component_values.additionalEnvs }}
{{ toYaml . | indent 12 }}
{{- end}}
Expand Down
16 changes: 16 additions & 0 deletions charts/rucio-daemons/templates/judge-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ spec:
- name: config-component
secret:
secretName: {{ template "rucio.fullname" . }}.config.{{ .rucio_daemon }}
{{- if .Values.policyPackages.enabled }}
- name: policy-package-volume
persistentVolumeClaim:
claimName: policy-package-volume
{{- end }}
{{- if .Values.useDeprecatedImplicitSecrets }}
- name: proxy-volume
secret:
Expand Down Expand Up @@ -103,6 +108,9 @@ spec:
path: {{ $val.hostPath }}
{{- end}}
{{- end}}
{{- if .Values.policyPackages.enabled }}
{{ include "rucio-daemons.policy-package-init-container" . | indent 6 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce (.component_values.image | default dict).tag .Values.image.tag }}"
Expand All @@ -120,6 +128,10 @@ spec:
- name: config-component
mountPath: /opt/rucio/etc/conf.d/20_component.json
subPath: component.json
{{- if .Values.policyPackages.enabled }}
- name: policy-package-volume
mountPath: {{ .Values.policyPackages.mountPath }}
{{- end }}
{{- range $collection := tuple (coalesce .component_values.secretMounts .Values.secretMounts) .component_values.extraSecretMounts }}
{{- range $key, $val := $collection }}
- name: {{ coalesce $val.volumeName $val.secretName $val.secretFullName }}
Expand Down Expand Up @@ -155,6 +167,10 @@ spec:
value: "{{ .rucio_daemon }}"
- name: RUCIO_DAEMON_ARGS
value: "{{ .daemon_args }}"
{{- if .Values.policyPackages.enabled}}
- name: PYTHONPATH
value: {{.Values.policyPackages.mountPath}}:${PYTHONPATH}
{{- end}}
{{- with .component_values.additionalEnvs }}
{{ toYaml . | indent 12 }}
{{- end}}
Expand Down
Loading
Loading