Skip to content

Commit fa364ff

Browse files
authored
updated deployments config for HIS usecase (#2898)
* updated deployments config for HIS usecase * updated values
1 parent 620a3ea commit fa364ff

File tree

5 files changed

+84
-1
lines changed

5 files changed

+84
-1
lines changed

save-cloud-charts/save-cloud/templates/backend-deployment.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,21 @@ spec:
4747
initContainers:
4848
- name: git-cloner
4949
image: alpine/git
50+
env:
51+
{{ if .Values.proxy.enabled }}
52+
{{- with .Values.proxy.extraEnv }}
53+
{{- toYaml . | nindent 12 }}
54+
{{- end }}
55+
{{ end }}
5056
args:
5157
- clone
58+
- --progress
59+
- --verbose
60+
{{ if .Values.proxy.enabled }}
61+
{{- with .Values.proxy.extraArgs }}
62+
{{- toYaml . | nindent 12 }}
63+
{{- end }}
64+
{{ end }}
5265
- --single-branch
5366
- --branch
5467
- {{ .Values.mysql.migrations.branch | default "master" }}
@@ -95,6 +108,11 @@ spec:
95108
secretKeyRef:
96109
name: db-secrets
97110
key: spring.datasource.password
111+
{{ if .Values.proxy.enabled }}
112+
{{- with .Values.proxy.extraEnv }}
113+
{{- toYaml . | nindent 12 }}
114+
{{- end }}
115+
{{ end }}
98116
volumeMounts:
99117
- mountPath: /liquibase/changelog
100118
name: migrations-data
@@ -110,4 +128,4 @@ spec:
110128
secret:
111129
secretName: s3-secrets
112130
- name: migrations-data
113-
emptyDir: {}
131+
emptyDir: {}

save-cloud-charts/save-cloud/templates/demo-deployment.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,21 @@ spec:
6767
initContainers:
6868
- name: git-cloner
6969
image: alpine/git
70+
env:
71+
{{ if .Values.proxy.enabled }}
72+
{{- with .Values.proxy.extraEnv }}
73+
{{- toYaml . | nindent 12 }}
74+
{{- end }}
75+
{{ end }}
7076
args:
7177
- clone
78+
- --progress
79+
- --verbose
80+
{{ if .Values.proxy.enabled }}
81+
{{- with .Values.proxy.extraArgs }}
82+
{{- toYaml . | nindent 12 }}
83+
{{- end }}
84+
{{ end }}
7285
- --single-branch
7386
- --branch
7487
- {{ .Values.mysql.migrations.branch | default "master" }}
@@ -114,6 +127,11 @@ spec:
114127
secretKeyRef:
115128
name: db-secrets
116129
key: spring.datasource.password
130+
{{ if .Values.proxy.enabled }}
131+
{{- with .Values.proxy.extraEnv }}
132+
{{- toYaml . | nindent 12 }}
133+
{{- end }}
134+
{{ end }}
117135
volumeMounts:
118136
- mountPath: /liquibase/changelog
119137
name: migrations-data

save-cloud-charts/save-cloud/templates/gateway-deployment.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,37 @@ spec:
3535
memory: 300M
3636
volumeMounts:
3737
- {{ include "spring-boot.config-volume-mount" . | indent 14 | trim }}
38+
- mountPath: /layers/paketo-buildpacks_bellsoft-liberica/jre/lib/security
39+
name: cacerts
3840
- mountPath: /home/cnb/secrets/oauth
3941
name: oauth-credentials
42+
{{ if .Values.gateway.initCerts.enabled }}
43+
initContainers:
44+
- name: init-cacerts
45+
image: ghcr.io/saveourtool/api-gateway:0.4.0-alpha.0.408-9b56d61
46+
command:
47+
- bash
48+
- -c
49+
- |
50+
cp -R /layers/paketo-buildpacks_bellsoft-liberica/jre/lib/security/* /home/cnb/cacerts
51+
chmod 661 /home/cnb/cacerts/cacerts
52+
find /layers -type f -name keytool -exec {} -import -noprompt -trustcacerts -alias HuaweiITRootCA -file /security/HuaweiITRootCA.pem -keystore /home/cnb/cacerts/cacerts -storepass changeit \;
53+
find /layers -type f -name keytool -exec {} -import -noprompt -trustcacerts -alias HWITEnterpriseCA1 -file /security/HWITEnterpriseCA1.pem -keystore /home/cnb/cacerts/cacerts -storepass changeit \;
54+
volumeMounts:
55+
- mountPath: /home/cnb/cacerts
56+
name: cacerts
57+
- mountPath: /security
58+
name: his-certs
59+
{{ end }}
4060
volumes:
4161
- {{ include "spring-boot.config-volume" (dict "service" .Values.gateway) | indent 10 | trim }}
4262
- name: oauth-credentials
4363
secret:
4464
secretName: oauth-credentials
65+
- name: his-certs
66+
secret:
67+
secretName: his-certs
68+
- name: cacerts
69+
emptyDir: {}
70+
71+

save-cloud-charts/save-cloud/templates/sandbox-deployment.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,21 @@ spec:
6868
initContainers:
6969
- name: git-cloner
7070
image: alpine/git
71+
env:
72+
{{ if .Values.proxy.enabled }}
73+
{{- with .Values.proxy.extraEnv }}
74+
{{- toYaml . | nindent 12 }}
75+
{{- end }}
76+
{{ end }}
7177
args:
7278
- clone
79+
- --progress
80+
- --verbose
81+
{{ if .Values.proxy.enabled }}
82+
{{- with .Values.proxy.extraArgs }}
83+
{{- toYaml . | nindent 12 }}
84+
{{- end }}
85+
{{ end }}
7386
- --single-branch
7487
- --branch
7588
- {{ .Values.mysql.migrations.branch | default "master" }}
@@ -116,6 +129,11 @@ spec:
116129
secretKeyRef:
117130
name: db-secrets
118131
key: spring.datasource.password
132+
{{ if .Values.proxy.enabled }}
133+
{{- with .Values.proxy.extraEnv }}
134+
{{- toYaml . | nindent 12 }}
135+
{{- end }}
136+
{{ end }}
119137
volumeMounts:
120138
- mountPath: /liquibase/changelog
121139
name: migrations-data

save-cloud-charts/save-cloud/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ preprocessor:
4747
# Fixed ClusterIP can be assigned to make it easier to query preprocessor from services outside Kubernetes
4848
clusterIP: null
4949
gateway:
50+
initCerts:
51+
enabled: true
5052
name: gateway
5153
profile: dev,kubernetes
5254
imageName: api-gateway

0 commit comments

Comments
 (0)