Hooker - fix properties, bump images (#177)

This commit is contained in:
Anatoly Karlov 2021-03-05 23:05:19 +07:00 committed by GitHub
parent c6a7e5314f
commit 12e1ebc243
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 23 deletions

View File

@ -25,7 +25,13 @@ java \
--kafka.client-id=hooker \
--kafka.consumer.group-id=Hooker-Invoicing \
--kafka.consumer.max-poll-records=500 \
--spring.application.name=hooker-kafka \
--kafka.ssl.enabled=false \
--kafka.ssl.key-store-location=/opt/hooker/kafka-keystore.p12 \
--kafka.ssl.key-store-password=test \
--kafka.ssl.trust-store-location=/opt/hooker/kafka-truststore.p12 \
--kafka.ssl.trust-store-password=test \
--kafka.ssl.key-password=test \
--spring.application.name=hooker \
--logging.level.com.rbkmoney.hooker.scheduler.MessageScheduler=DEBUG \
${@} \
--spring.config.additional-location=/vault/secrets/application.properties \

View File

@ -4,7 +4,7 @@ replicaCount: 1
image:
repository: docker.io/rbkmoney/hooker
tag: dc15f448d473c03b7c379a9f0338e8210bc1606a
tag: aeffeedb13a8f5125962bfe3e0e734ba4104d876
pullPolicy: IfNotPresent
runopts:
@ -68,16 +68,6 @@ podAnnotations:
spring.flyway.url=jdbc:postgresql://postgres-postgresql:5432/hooker?sslmode=disable
spring.flyway.user={{ .Data.username }}
spring.flyway.password={{ .Data.password }}
{{- /*
{% if kafka.ssl.get('enable', False) %}
--kafka.ssl.enabled={{ kafka.ssl.enable }}
--kafka.ssl.key-store-location=/opt/{{ service_name }}/kafka-keystore.p12
--kafka.ssl.key-store-password="{{ service.keystore.pass }}"
--kafka.ssl.key-password="{{ service.keystore.pass }}"
--kafka.ssl.trust-store-location=/opt/{{ service_name }}/kafka-truststore.p12
--kafka.ssl.trust-store-password="{{ kafka.truststore.java.pass }}"
{% endif %}
*/ -}}
{{- end }}`}}
metrics:
@ -97,11 +87,6 @@ ciliumPolicies:
type: TCP
name: postgres
namespace: {{ .Release.Namespace }}
- filters:
- port: 8200
type: TCP
name: vault
namespace: {{ .Release.Namespace }}
- filters:
- port: 9092
rules:
@ -113,6 +98,11 @@ ciliumPolicies:
type: TCP
name: kafka
namespace: {{ .Release.Namespace }}
- filters:
- port: 8200
type: TCP
name: vault
namespace: {{ .Release.Namespace }}
- filters:
- port: 8022
type: TCP

View File

@ -4,7 +4,7 @@ replicaCount: 1
image:
repository: docker.io/rbkmoney/shumway
tag: 13ad29447e8d8057b28d15905fad77b3299655c2
tag: d5b74714437b1a1b11689a38297fd2a6c08e0db2
pullPolicy: IfNotPresent
runopts:

View File

@ -85,15 +85,15 @@ releases:
- name: shumway
<<: *generic_stateless_json
needs:
- {{ .Namespace | default "default" }}/vault
- {{ .Namespace | default "default" }}/vault
wait: true
- name: hooker
<<: *generic_stateless
needs:
- {{ .Namespace | default "default" }}/vault
- {{ .Namespace | default "default" }}/kafka
- {{ .Namespace | default "default" }}/hellgate
# - {{ .Namespace | default "default" }}/fault-detector
- {{ .Namespace | default "default" }}/vault
- {{ .Namespace | default "default" }}/kafka
- {{ .Namespace | default "default" }}/hellgate
# - {{ .Namespace | default "default" }}/fault-detector
- name: dominant
<<: *generic_stateless_json
needs: