Skip to content

Commit

Permalink
Fix/centralledgerhost2conf (#120)
Browse files Browse the repository at this point in the history
* changed docker container versions

* central ledger service into centraleventprocessor; version bumped to 4.1.1

* small fixes
  • Loading branch information
vgenev authored and Sam committed Dec 10, 2018
1 parent 188a68d commit b1b4233
Show file tree
Hide file tree
Showing 12 changed files with 109 additions and 78 deletions.
2 changes: 1 addition & 1 deletion central/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
description: Central Helm chart for Kubernetes
name: central
version: 4.1.0
version: 4.1.1
home: http://mojaloop.io
icon: http://mojaloop.io/images/logo.png
sources:
Expand Down
4 changes: 2 additions & 2 deletions central/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ dependencies:
repository: "file://../centralsettlement"
condition: centralsettlement.enabled
- name: centraleventprocessor
version: 4.1.0
version: 4.1.1
repository: "file://../centraleventprocessor"
condition: centraleventprocessor.enabled
- name: emailnotifier
version: 4.1.0
version: 4.1.1
repository: "file://../emailnotifier"
condition: emailnotifier.enabled
54 changes: 32 additions & 22 deletions central/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6006,7 +6006,7 @@ emailnotifier:
replicaCount: 1
image:
repository: mojaloop/email-notifier
tag: v4.1.0
tag: v4.1.1
pullPolicy: Always
init:
enabled: true
Expand Down Expand Up @@ -6035,11 +6035,26 @@ emailnotifier:
user: '[email protected]'
pass: 'pass'
ciphers: 'SSLv3'
healthCheckPort: 3081
PORT: 3081
## App Configuration Template
# default_json config for nodejs. The following variables will be injected by the helm chart (see config.yaml): $service_api_port, $service_admin_port, $ingress_host, $forensicloggingsidecar_host, $forensicloggingsidecar_port, $kafka_host, $kafka_port
default_json: |
{
"emailSettings": {
"smtpConfig": {
"host": "$email_host",
"port": $email_port,
"secureConnection": false,
"tls": {
"ciphers": "$email_tls_ciphers"
},
"auth": {
"user": "$email_user",
"pass": "$email_pass"
}
}
},
"PORT": $port,
"KAFKA": {
"TOPIC_TEMPLATES": {
"NOTIFICATION_TOPIC_TEMPLATE": {
Expand Down Expand Up @@ -6114,22 +6129,7 @@ emailnotifier:
}
}
}
},
"emailSettings": {
"smtpConfig": {
"host": "$email_host",
"port": $email_port,
"secureConnection": false,
"tls": {
"ciphers": "$email_tls_ciphers"
},
"auth": {
"user": "$email_user",
"pass": "$email_pass"
}
}
},
"healthCheckPort": $port
}
}
init:
Expand Down Expand Up @@ -6204,7 +6204,7 @@ centraleventprocessor:
replicaCount: 1
image:
repository: mojaloop/central-event-processor
tag: v4.1.0
tag: v4.1.1
pullPolicy: Always

init:
Expand Down Expand Up @@ -6299,12 +6299,16 @@ centraleventprocessor:
# this can be set if the dependency chart for kafka is disabled. If 'kafka_host' is commented out, then the name of the dependency chart will be used.
kafka_host: '$release_name-kafka'
kafka_port: 9092
healthCheckPort: 3080
PORT: 3080
mongo_host: '$release_name-mongodb'
mongo_port: 27017
mongo_username: mojaloop
mongo_database: mojaloop
mongo_password: password
central_ledger_admin_host: 'centralledger-service'
central_ledger_admin_port: 3001
central_ledger_api_host: 'centralledger-service'
central_ledger_api_port: 3000
## App Configuration Template
# default_json config for nodejs. The following variables will be injected by the helm chart (see config.yaml): $service_api_port, $service_admin_port, $ingress_host, $forensicloggingsidecar_host, $forensicloggingsidecar_port, $kafka_host, $kafka_port

Expand All @@ -6321,6 +6325,13 @@ centraleventprocessor:
},
"expanded": "full"
},
"PORT": $port,
"centralLedgerAPI": {
"adminHost": "$central_ledger_admin_host",
"adminPort": $central_ledger_admin_port,
"apiHost": "$central_ledger_api_host",
"apiPort": $central_ledger_api_port
},
"mongo": {
"uri": "$mongo_host:$mongo_port",
"database": "$mongo_database",
Expand Down Expand Up @@ -6407,8 +6418,7 @@ centraleventprocessor:
}
}
}
},
"healthCheckPort": $port
}
}
mongodb:
Expand Down
2 changes: 1 addition & 1 deletion centraleventprocessor/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
description: Central Event Processor for Mojaloop
name: centraleventprocessor
version: 4.1.0
version: 4.1.1
home: http://mojaloop.io
icon: http://mojaloop.io/images/logo.png
sources:
Expand Down
6 changes: 3 additions & 3 deletions centraleventprocessor/templates/config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{{- $kafkaHost := ( .Values.config.kafka_host | replace "$release_name" .Release.Name ) -}}
{{- $mongodbHost := ( .Values.config.mongo_host | replace "$release_name" .Release.Name ) -}}
{{- $centralLedgerAdminHost := printf "%s-%s" .Release.Name .Values.config.central_ledger_admin_host -}}
{{- $centralLedgerApiHost := printf "%s-%s" .Release.Name .Values.config.central_ledger_api_host -}}

apiVersion: v1
kind: ConfigMap
Expand All @@ -11,6 +13,4 @@ metadata:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
data:
default.json: {{ .Values.config.default_json | replace "$ingress_host" .Values.ingress.hosts.api | replace "$kafka_host" (default .Values.config.kafka_host $kafkaHost) | replace "$kafka_port" (printf "%.0f" .Values.config.kafka_port) | replace "$mongo_host" (default .Values.config.mongo_host $mongodbHost) | replace "$mongo_port" (printf "%.0f" .Values.config.mongo_port) | replace "$mongo_database" .Values.config.mongo_database | replace "$mongo_username" .Values.config.mongo_username |replace "$mongo_password" .Values.config.mongo_password | replace "$port" (printf "%.0f" .Values.config.healthCheckPort) | quote}}


default.json: {{ .Values.config.default_json | replace "$ingress_host" .Values.ingress.hosts.api | replace "$kafka_host" (default .Values.config.kafka_host $kafkaHost) | replace "$kafka_port" (printf "%.0f" .Values.config.kafka_port) | replace "$mongo_host" (default .Values.config.mongo_host $mongodbHost) | replace "$mongo_port" (printf "%.0f" .Values.config.mongo_port) | replace "$mongo_database" .Values.config.mongo_database | replace "$mongo_username" .Values.config.mongo_username |replace "$mongo_password" .Values.config.mongo_password | replace "$port" (printf "%.0f" .Values.config.PORT) | replace "$central_ledger_admin_host" $centralLedgerAdminHost | replace "$central_ledger_admin_port" (printf "%.0f" .Values.config.central_ledger_admin_port) | replace "$central_ledger_api_host" $centralLedgerApiHost | replace "$central_ledger_api_port" (printf "%.0f" .Values.config.central_ledger_api_port)| quote}}
18 changes: 14 additions & 4 deletions centraleventprocessor/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ global:
replicaCount: 1
image:
repository: mojaloop/central-event-processor
tag: v4.1.0
tag: v4.1.1
pullPolicy: Always

init:
Expand Down Expand Up @@ -117,12 +117,16 @@ config:
# this can be set if the dependency chart for kafka is disabled. If 'kafka_host' is commented out, then the name of the dependency chart will be used.
kafka_host: '$release_name-kafka'
kafka_port: 9092
healthCheckPort: 3080
PORT: 3080
mongo_host: '$release_name-mongodb'
mongo_port: 27017
mongo_username: mojaloop
mongo_database: mojaloop
mongo_password: password
central_ledger_admin_host: 'centralledger-service'
central_ledger_admin_port: 3001
central_ledger_api_host: 'centralledger-service'
central_ledger_api_port: 3000
## App Configuration Template
# default_json config for nodejs. The following variables will be injected by the helm chart (see config.yaml): $service_api_port, $service_admin_port, $ingress_host, $forensicloggingsidecar_host, $forensicloggingsidecar_port, $kafka_host, $kafka_port

Expand All @@ -139,6 +143,13 @@ config:
},
"expanded": "full"
},
"PORT": $port,
"centralLedgerAPI": {
"adminHost": "$central_ledger_admin_host",
"adminPort": $central_ledger_admin_port,
"apiHost": "$central_ledger_api_host",
"apiPort": $central_ledger_api_port
},
"mongo": {
"uri": "$mongo_host:$mongo_port",
"database": "$mongo_database",
Expand Down Expand Up @@ -225,8 +236,7 @@ config:
}
}
}
},
"healthCheckPort": $port
}
}
# kafka:
Expand Down
2 changes: 1 addition & 1 deletion emailnotifier/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
description: Email Notifier For Mojaloop
name: emailnotifier
version: 4.1.0
version: 4.1.1
home: http://mojaloop.io
icon: http://mojaloop.io/images/logo.png
sources:
Expand Down
2 changes: 1 addition & 1 deletion emailnotifier/templates/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ metadata:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
data:
default.json: {{.Values.config.default_json | replace "$ingress_host" .Values.ingress.hosts.api | replace "$kafka_host" (default .Values.config.kafka_host $kafkaHost) | replace "$kafka_port" (printf "%.0f" .Values.config.kafka_port) | replace "$email_pass" (.Values.config.email.pass) | replace "$email_user" (.Values.config.email.user) | replace "$email_tls_ciphers" (.Values.config.email.ciphers) | replace "$email_port" (printf "%.0f" .Values.config.email.port) | replace "$port" (printf "%.0f" .Values.config.healthCheckPort) | quote }}
default.json: {{.Values.config.default_json | replace "$ingress_host" .Values.ingress.hosts.api | replace "$kafka_host" (default .Values.config.kafka_host $kafkaHost) | replace "$kafka_port" (printf "%.0f" .Values.config.kafka_port) | replace "$email_pass" (.Values.config.email.pass) | replace "$email_user" (.Values.config.email.user) | replace "$email_tls_ciphers" (.Values.config.email.ciphers) | replace "$email_port" (printf "%.0f" .Values.config.email.port) | replace "$port" (printf "%.0f" .Values.config.PORT) | quote }}
36 changes: 18 additions & 18 deletions emailnotifier/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ global:
replicaCount: 1
image:
repository: mojaloop/email-notifier
tag: v4.1.0
tag: v4.1.1
pullPolicy: Always

init:
Expand Down Expand Up @@ -117,11 +117,26 @@ config:
user: '[email protected]'
pass: 'pass'
ciphers: 'SSLv3'
healthCheckPort: 3081
PORT: 3081
## App Configuration Template
# default_json config for nodejs. The following variables will be injected by the helm chart (see config.yaml): $service_api_port, $service_admin_port, $ingress_host, $forensicloggingsidecar_host, $forensicloggingsidecar_port, $kafka_host, $kafka_port
default_json: |
{
"emailSettings": {
"smtpConfig": {
"host": "$email_host",
"port": $email_port,
"secureConnection": false,
"tls": {
"ciphers": "$email_tls_ciphers"
},
"auth": {
"user": "$email_user",
"pass": "$email_pass"
}
}
},
"PORT": $port,
"KAFKA": {
"TOPIC_TEMPLATES": {
"NOTIFICATION_TOPIC_TEMPLATE": {
Expand Down Expand Up @@ -196,22 +211,7 @@ config:
}
}
}
},
"emailSettings": {
"smtpConfig": {
"host": "$email_host",
"port": $email_port,
"secureConnection": false,
"tls": {
"ciphers": "$email_tls_ciphers"
},
"auth": {
"user": "$email_user",
"pass": "$email_pass"
}
}
},
"healthCheckPort": $port
}
}
# kafka:
Expand Down
2 changes: 1 addition & 1 deletion mojaloop/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
description: Mojaloop Helm chart for Kubernetes
name: mojaloop
version: 4.1.0
version: 4.1.1
home: http://mojaloop.io
icon: http://mojaloop.io/images/logo.png
sources:
Expand Down
2 changes: 1 addition & 1 deletion mojaloop/requirements.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# requirements.yaml
dependencies:
- name: central
version: 4.1.0
version: 4.1.1
repository: "file://../central"
condition: central.enabled
- name: interop-switch
Expand Down
Loading

0 comments on commit b1b4233

Please sign in to comment.