Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated deployments config for HIS usecase #2898

Merged
merged 2 commits into from
Dec 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion save-cloud-charts/save-cloud/templates/backend-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,21 @@ spec:
initContainers:
- name: git-cloner
image: alpine/git
env:
{{ if .Values.proxy.enabled }}
{{- with .Values.proxy.extraEnv }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{ end }}
args:
- clone
- --progress
- --verbose
{{ if .Values.proxy.enabled }}
{{- with .Values.proxy.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{ end }}
- --single-branch
- --branch
- {{ .Values.mysql.migrations.branch | default "master" }}
Expand Down Expand Up @@ -95,6 +108,11 @@ spec:
secretKeyRef:
name: db-secrets
key: spring.datasource.password
{{ if .Values.proxy.enabled }}
{{- with .Values.proxy.extraEnv }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{ end }}
volumeMounts:
- mountPath: /liquibase/changelog
name: migrations-data
Expand All @@ -110,4 +128,4 @@ spec:
secret:
secretName: s3-secrets
- name: migrations-data
emptyDir: {}
emptyDir: {}
18 changes: 18 additions & 0 deletions save-cloud-charts/save-cloud/templates/demo-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,21 @@ spec:
initContainers:
- name: git-cloner
image: alpine/git
env:
{{ if .Values.proxy.enabled }}
{{- with .Values.proxy.extraEnv }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{ end }}
args:
- clone
- --progress
- --verbose
{{ if .Values.proxy.enabled }}
{{- with .Values.proxy.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{ end }}
- --single-branch
- --branch
- {{ .Values.mysql.migrations.branch | default "master" }}
Expand Down Expand Up @@ -114,6 +127,11 @@ spec:
secretKeyRef:
name: db-secrets
key: spring.datasource.password
{{ if .Values.proxy.enabled }}
{{- with .Values.proxy.extraEnv }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{ end }}
volumeMounts:
- mountPath: /liquibase/changelog
name: migrations-data
Expand Down
27 changes: 27 additions & 0 deletions save-cloud-charts/save-cloud/templates/gateway-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,37 @@ spec:
memory: 300M
volumeMounts:
- {{ include "spring-boot.config-volume-mount" . | indent 14 | trim }}
- mountPath: /layers/paketo-buildpacks_bellsoft-liberica/jre/lib/security
name: cacerts
- mountPath: /home/cnb/secrets/oauth
name: oauth-credentials
{{ if .Values.gateway.initCerts.enabled }}
initContainers:
- name: init-cacerts
image: ghcr.io/saveourtool/api-gateway:0.4.0-alpha.0.408-9b56d61
command:
- bash
- -c
- |
cp -R /layers/paketo-buildpacks_bellsoft-liberica/jre/lib/security/* /home/cnb/cacerts
chmod 661 /home/cnb/cacerts/cacerts
find /layers -type f -name keytool -exec {} -import -noprompt -trustcacerts -alias HuaweiITRootCA -file /security/HuaweiITRootCA.pem -keystore /home/cnb/cacerts/cacerts -storepass changeit \;
find /layers -type f -name keytool -exec {} -import -noprompt -trustcacerts -alias HWITEnterpriseCA1 -file /security/HWITEnterpriseCA1.pem -keystore /home/cnb/cacerts/cacerts -storepass changeit \;
volumeMounts:
- mountPath: /home/cnb/cacerts
name: cacerts
- mountPath: /security
name: his-certs
{{ end }}
volumes:
- {{ include "spring-boot.config-volume" (dict "service" .Values.gateway) | indent 10 | trim }}
- name: oauth-credentials
secret:
secretName: oauth-credentials
- name: his-certs
secret:
secretName: his-certs
- name: cacerts
emptyDir: {}


18 changes: 18 additions & 0 deletions save-cloud-charts/save-cloud/templates/sandbox-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,21 @@ spec:
initContainers:
- name: git-cloner
image: alpine/git
env:
{{ if .Values.proxy.enabled }}
{{- with .Values.proxy.extraEnv }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{ end }}
args:
- clone
- --progress
- --verbose
{{ if .Values.proxy.enabled }}
{{- with .Values.proxy.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{ end }}
- --single-branch
- --branch
- {{ .Values.mysql.migrations.branch | default "master" }}
Expand Down Expand Up @@ -116,6 +129,11 @@ spec:
secretKeyRef:
name: db-secrets
key: spring.datasource.password
{{ if .Values.proxy.enabled }}
{{- with .Values.proxy.extraEnv }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{ end }}
volumeMounts:
- mountPath: /liquibase/changelog
name: migrations-data
Expand Down
2 changes: 2 additions & 0 deletions save-cloud-charts/save-cloud/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ preprocessor:
# Fixed ClusterIP can be assigned to make it easier to query preprocessor from services outside Kubernetes
clusterIP: null
gateway:
initCerts:
enabled: true
name: gateway
profile: dev,kubernetes
imageName: api-gateway
Expand Down