Commit 24968d05 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch 'refactor-config' into 'main' 

use single value for Pulsar configuration

See merge request !5
parents 4734c45c 818561fd

pulsar/Chart.yaml

+2 −2
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ type: application 
# This is the chart version. This version number should be incremented each time you make changes

# to the chart and its templates, including the app version.

# Versions are expected to follow Semantic Versioning (https://semver.org/)

version: 0.6.0

version: 0.7.0



# This is the version number of the application being deployed. This version number should be

# incremented each time you make changes to the application. Versions are not expected to

# follow Semantic Versioning. They should reflect the version the application is using.

# It is recommended to use it with quotes.

appVersion: "0.14.13"
 
appVersion: "0.15.3.dev5.ornl.0"

pulsar/templates/config_app.yaml

+1 −18
Original line number Diff line number Diff line
@@ -6,21 +6,4 @@ metadata: 
    {{- include "pulsar.labels" . | nindent 4 }}

data:

  app.yml: |-

    managers:

{{- .Values.pulsar.managers | toYaml | nindent 6 }}

    user_auth:

{{- .Values.pulsar.user_auth | toYaml | nindent 6 }}

    job_directory_mode: "0777"

    ignore_umask: True

    send_stdout_update: {{ .Values.pulsar.sendStdoutUpdate }}

    stdout_update_interval: {{ .Values.pulsar.stdoutUpdateInterval }}

    staging_directory: {{ .Values.pulsar.stagingDirectory }}

    persistence_directory: {{ .Values.pulsar.persistenceDirectory }}



{{- if .Values.pulsar.enableRabbitMq  }}

    message_queue_url: amqp://{{ .Values.pulsar.rabbitMqUser }}:{{ .Values.pulsar.rabbitMqPassword }}@{{ .Values.pulsar.rabbitMqUrl }}

{{- end }}

{{- if .Values.pulsar.object_store_config }}

    object_store_config:

{{- .Values.pulsar.object_store_config | toYaml | nindent 6 }}

{{- end }}
 
{{- .Values.pulsar | toYaml | nindent 4 }}

pulsar/values.yaml

+8 −9
Original line number Diff line number Diff line
@@ -15,18 +15,17 @@ pulsar: 
      - type: allow_all

    authorization:

      - type: allow_all

  enableRabbitMq: false

  rabbitMqUser: guest

  rabbitMqUrl: localhost:5672

  rabbitMqPassword: guest

  stagingDirectory: "/pulsar/files/staging"

  persistenceDirectory: "/pulsar/files/persistent"

  sendStdoutUpdate: false

  stdoutUpdateInterval: 5

  object_store_config:

  message_queue_url: amqp://guest:guest@localhost:5672

  staging_directory: "/pulsar/files/staging"

  persistence_directory: "/pulsar/files/persistent"

  send_stdout_update: false

  stdout_update_interval: 5

  job_directory_mode: "0777"

  ignore_umask: True



rucio:

  url: http://localhost

  username: root

  password: changeme

  account: root