Skip to content

Commit

Permalink
deployments: bad idents
Browse files Browse the repository at this point in the history
Signed-off-by: Élyse Viard <[email protected]>
  • Loading branch information
ElysaSrc committed Oct 25, 2024
1 parent 340fb7e commit 96d0e98
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
12 changes: 6 additions & 6 deletions templates/editoast/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,27 +70,27 @@ spec:

- name: OSRD_MQ_URL
{{- $amqp := .Values.endpoints.amqp.url }}
{{- if eq (typeOf $amqp) "map" }}
{{- if eq (kindOf $amqp) "map" }}
valueFrom:
{{- toYaml $amqp.valueFrom | nindent 6 }}
{{- toYaml $amqp.valueFrom | nindent 16 }}
{{- else }}
value: "{{ $amqp }}"
{{- end }}

- name: DATABASE_URL
{{- $postgresql := .Values.endpoints.postgresql }}
{{- if eq (typeOf $postgresql) "map" }}
{{- if eq (kindOf $postgresql) "map" }}
valueFrom:
{{- toYaml $postgresql.valueFrom | nindent 6 }}
{{- toYaml $postgresql.valueFrom | nindent 16 }}
{{- else }}
value: "{{ $postgresql }}"
{{- end }}

- name: VALKEY_URL
{{- $redis := .Values.endpoints.redis }}
{{- if eq (typeOf $redis) "map" }}
{{- if eq (kindOf $redis) "map" }}
valueFrom:
{{- toYaml $redis.valueFrom | nindent 6 }}
{{- toYaml $redis.valueFrom | nindent 16 }}
{{- else }}
value: "{{ $redis }}"
{{- end }}
Expand Down
12 changes: 6 additions & 6 deletions templates/editoast/migration_job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,27 @@ spec:

- name: OSRD_MQ_URL
{{- $amqp := .Values.endpoints.amqp.url }}
{{- if eq (typeOf $amqp) "map" }}
{{- if eq (kindOf $amqp) "map" }}
valueFrom:
{{- toYaml $amqp.valueFrom | nindent 6 }}
{{- toYaml $amqp.valueFrom | nindent 16 }}
{{- else }}
value: "{{ $amqp }}"
{{- end }}

- name: DATABASE_URL
{{- $postgresql := .Values.endpoints.postgresql }}
{{- if eq (typeOf $postgresql) "map" }}
{{- if eq (kindOf $postgresql) "map" }}
valueFrom:
{{- toYaml $postgresql.valueFrom | nindent 6 }}
{{- toYaml $postgresql.valueFrom | nindent 16 }}
{{- else }}
value: "{{ $postgresql }}"
{{- end }}

- name: VALKEY_URL
{{- $redis := .Values.endpoints.redis }}
{{- if eq (typeOf $redis) "map" }}
{{- if eq (kindOf $redis) "map" }}
valueFrom:
{{- toYaml $redis.valueFrom | nindent 6 }}
{{- toYaml $redis.valueFrom | nindent 16 }}
{{- else }}
value: "{{ $redis }}"
{{- end }}
Expand Down
12 changes: 6 additions & 6 deletions templates/osrdyne/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,28 +65,28 @@ spec:
env:
- name: OSRDYNE__AMQP_URI
{{- $amqp := .Values.endpoints.amqp.url }}
{{- if eq (typeOf $amqp) "map" }}
{{- if eq (kindOf $amqp) "map" }}
valueFrom:
{{- toYaml $amqp.valueFrom | nindent 6 }}
{{- toYaml $amqp.valueFrom | nindent 16 }}
{{- else }}
value: "{{ $amqp }}"
{{- end }}

- name: OSRDYNE__MANAGEMENT_URI
{{- $amqpManagement := .Values.endpoints.amqp.management }}
{{- if eq (typeOf $amqpManagement) "map" }}
{{- if eq (kindOf $amqpManagement) "map" }}
valueFrom:
{{- toYaml $amqpManagement.valueFrom | nindent 6 }}
{{- toYaml $amqpManagement.valueFrom | nindent 16 }}
{{- else }}
value: "{{ $amqpManagement }}"
{{- end }}

{{- if (eq .Values.services.core.autoscaling.type "Keda") }}
- name: OSRDYNE__WORKER_DRIVER__AUTOSCALING__AMQP_HOST
{{- $amqpManagementWithVhost := .Values.endpoints.amqp.managementWithVhost }}
{{- if eq (typeOf $amqpManagementWithVhost) "map" }}
{{- if eq (kindOf $amqpManagementWithVhost) "map" }}
valueFrom:
{{- toYaml $amqpManagementWithVhost.valueFrom | nindent 6 }}
{{- toYaml $amqpManagementWithVhost.valueFrom | nindent 16 }}
{{- else }}
value: "{{ $amqpManagementWithVhost }}"
{{- end }}
Expand Down
12 changes: 6 additions & 6 deletions templates/stateful_editoast/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,27 +69,27 @@ spec:

- name: OSRD_MQ_URL
{{- $amqp := .Values.endpoints.amqp.url }}
{{- if eq (typeOf $amqp) "map" }}
{{- if eq (kindOf $amqp) "map" }}
valueFrom:
{{- toYaml $amqp.valueFrom | nindent 6 }}
{{- toYaml $amqp.valueFrom | nindent 16 }}
{{- else }}
value: "{{ $amqp }}"
{{- end }}

- name: DATABASE_URL
{{- $postgresql := .Values.endpoints.postgresql }}
{{- if eq (typeOf $postgresql) "map" }}
{{- if eq (kindOf $postgresql) "map" }}
valueFrom:
{{- toYaml $postgresql.valueFrom | nindent 6 }}
{{- toYaml $postgresql.valueFrom | nindent 16 }}
{{- else }}
value: "{{ $postgresql }}"
{{- end }}

- name: VALKEY_URL
{{- $redis := .Values.endpoints.redis }}
{{- if eq (typeOf $redis) "map" }}
{{- if eq (kindOf $redis) "map" }}
valueFrom:
{{- toYaml $redis.valueFrom | nindent 6 }}
{{- toYaml $redis.valueFrom | nindent 16 }}
{{- else }}
value: "{{ $redis }}"
{{- end }}
Expand Down

0 comments on commit 96d0e98

Please sign in to comment.