make test-transaction stateless (#203)

* make test-transaction stateless

* delete unused values

* delete gatewayService config as it's not used in stateless service template

* fix adding file to configMap

* change liveness and readyness probes

* delete create test shop logic

* fix nginx image and log files

* bump stateless chart version

* fix ipv4 logic and delete default nginx config

* helmfile deps

* change containerPort to port

* remove protocol
This commit is contained in:
ilyatrub 2021-08-26 17:42:07 +03:00 committed by GitHub
parent c61d10e004
commit 49679b7aea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 144 additions and 60 deletions

View File

@ -1,3 +1,67 @@
{{- if .Values.services.global.ipv6only }}
useIPv4: false
{{- end }}
image:
repository: docker.io/nginx
tag: latest
pullPolicy: IfNotPresent
imagePullSecrets: []
replicaCount: 1
nameOverride: ""
fullnameOverride: ""
service:
ports:
- name: api
port: 80
livenessProbe:
httpGet:
port: api
path: /
readinessProbe:
httpGet:
port: api
path: /
volumeMounts:
- name: config-volume
mountPath: /etc/nginx/conf.d/virtualhost.conf
subPath: virtualhost.conf
readOnly: true
volumes:
- name: config-volume
configMap:
name: {{ .Release.Name }}
items:
- key: virtualhost.conf
path: virtualhost.conf
serviceAccount:
create: true
annotations: {}
name: ""
cronjob:
enabled: true
image:
repository: docker.io/rbkmoney/test_transaction_v2
tag: d00bb62cb1b685fc5227cdce224174bf21ef333f
pullPolicy: IfNotPresent
schedule: "*/1 * * * *"
args:
- "http://keycloak-http"
- "demo_merchant"
- "Parolec0"
- http://{{ .Release.Name }}
{{- if eq .Values.services.global.ipv6only false }}
- "-4"
{{- end }}
- --create-test-shop
configMap:
data:
virtualhost.conf: |
{{- tpl (readFile "virtualhost.conf") . | nindent 6 }}

View File

@ -0,0 +1,24 @@
server {
listen [::]:80 default_server;
listen 80 default_server;
access_log /var/log/nginx/access.log main;
error_log /var/log/nginx/error.log;
resolver kube-dns.kube-system.svc.cluster.local valid=20s;
location =/v1/processing/payment-resources {
set $capipciv1 capi-pcidss-v1.{{ .Release.Namespace | default "default" }}.svc.cluster.local;
proxy_pass http://$capipciv1:8080/v1/processing/payment-resources;
}
location =/v2/processing/payment-resources {
set $capipciv2 capi-pcidss-v2.{{ .Release.Namespace | default "default" }}.svc.cluster.local;
proxy_pass http://$capipciv2:8080/v2/processing/payment-resources;
}
location /v1 {
set $capiv1 capi-v1.{{ .Release.Namespace | default "default" }}.svc.cluster.local;
proxy_pass http://$capiv1:8080;
}
location /v2 {
set $capiv2 capi-v2.{{ .Release.Namespace | default "default" }}.svc.cluster.local;
proxy_pass http://$capiv2:8080;
}
}

View File

@ -1,16 +1,13 @@
version: v0.139.9
version: v0.140.0
dependencies:
- name: cert-manager
repository: https://charts.jetstack.io
version: v1.5.0
- name: elk
repository: https://rbkmoney.github.io/charts
version: 0.1.1
version: 0.1.5
- name: ingress-nginx
repository: https://kubernetes.github.io/ingress-nginx
version: 3.35.0
version: 4.0.1
- name: netpolicy
repository: https://rbkmoney.github.io/charts
version: 0.1.14
digest: sha256:664bf95cb978802954cbb1e648533f2dbd7f2c2e8309fe9a9693452a20b72420
generated: "2021-08-12T11:34:46.641593+03:00"
digest: sha256:e2548803992017dd694868336da9a3993b4ae205ac029e041d220df6779ec2ee
generated: "2021-08-25T17:06:29.154322+03:00"

View File

@ -1,8 +1,8 @@
version: v0.139.9
version: v0.140.0
dependencies:
- name: consul
repository: https://helm.releases.hashicorp.com
version: 0.32.1
version: 0.33.0
- name: elasticsearch
repository: https://helm.elastic.co
version: 7.14.0
@ -29,132 +29,132 @@ dependencies:
version: 0.1.21
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.16
- name: test-transaction
version: 0.1.18
- name: stateless
repository: https://rbkmoney.github.io/charts
version: 0.1.5
version: 0.1.18
- name: vault
repository: https://helm.releases.hashicorp.com
version: 0.11.0
digest: sha256:d2faf12c99cbd70512e4e5e50aa70dac87acf5324140285d42db8ff955296248
generated: "2021-08-12T11:35:10.086545+03:00"
digest: sha256:aec6606f1b3dd5e6ad764b5827f9e3b914bf2576b4ca5c73c66fbd251396882b
generated: "2021-08-25T17:10:36.554803+03:00"

View File

@ -162,8 +162,7 @@ releases:
- name: payform
<<: *generic_stateless
- name: test-transaction
<<: *default
chart: rbkmoney/test-transaction
<<: *generic_stateless
needs:
- {{ .Namespace | default "default" }}/shumway
- {{ .Namespace | default "default" }}/dominant