Commit 384bf9f9 authored by Morris Estepa's avatar Morris Estepa
Browse files

Merge branch 'master' into master-dev-merge

parents 2ea1c929 194a94ce
Pipeline #103899 failed with stages
in 63 minutes and 9 seconds
...@@ -27,6 +27,10 @@ spec: ...@@ -27,6 +27,10 @@ spec:
{{- if .Values.conf.on_prem_enabled }} {{- if .Values.conf.on_prem_enabled }}
- secretRef: - secretRef:
name: "{{ .Values.conf.secret_name }}" name: "{{ .Values.conf.secret_name }}"
- secretRef:
name: "{{ .Values.conf.rabbitmq_secret_name }}"
- secretRef:
name: "{{ .Values.conf.workflow_postgres_secret_name }}"
# FIXME # FIXME
env: env:
- name: OSDU_AIRFLOW_PASSWORD - name: OSDU_AIRFLOW_PASSWORD
......
...@@ -7,7 +7,7 @@ data: ...@@ -7,7 +7,7 @@ data:
requests_memory: "2816M" requests_memory: "2816M"
limits_cpu: "1" limits_cpu: "1"
limits_memory: "3G" limits_memory: "3G"
serviceAccountName: "" serviceAccountName: "workflow"
image: "" image: ""
imagePullPolicy: "IfNotPresent" imagePullPolicy: "IfNotPresent"
...@@ -15,4 +15,6 @@ conf: ...@@ -15,4 +15,6 @@ conf:
configmap: "workflow-config" configmap: "workflow-config"
app_name: "workflow" app_name: "workflow"
secret_name: "airflow-workflow-secret" secret_name: "airflow-workflow-secret"
workflow_postgres_secret_name: "workflow-postgres-secret"
rabbitmq_secret_name: "rabbitmq-secret"
on_prem_enabled: false on_prem_enabled: false
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment