Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add the PATCH method for the monitoring API"
[pti/o2.git]
/
charts
/
templates
/
deployment.yaml
diff --git
a/charts/templates/deployment.yaml
b/charts/templates/deployment.yaml
index
d912a06
..
962c1d5
100644
(file)
--- a/
charts/templates/deployment.yaml
+++ b/
charts/templates/deployment.yaml
@@
-1,4
+1,4
@@
-# Copyright (C) 2021 Wind River Systems, Inc.
+# Copyright (C) 2021
-2023
Wind River Systems, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-29,6
+29,13
@@
spec:
metadata:
labels:
app: o2api
metadata:
labels:
app: o2api
+ {{- with .Values.podLabels }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ annotations:
+ {{- with .Values.podAnnotations }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
spec:
serviceAccountName: {{ .Values.o2ims.serviceaccountname }}
{{- if .Values.imagePullSecrets }}
spec:
serviceAccountName: {{ .Values.o2ims.serviceaccountname }}
{{- if .Values.imagePullSecrets }}
@@
-117,6
+124,12
@@
spec:
value: "1"
- name: REDIS_HOST
value: localhost
value: "1"
- name: REDIS_HOST
value: localhost
+ {{- if default false .Values.o2ims.useHostCert }}
+ - name: REQUESTS_CA_BUNDLE
+ value: /etc/ssl/custom-cert.pem
+ {{- end }}
+ - name: CGTS_INSECURE_SSL
+ value: {{ ternary "1" "0" (default false .Values.o2ims.cgtsInsecureSSL) | quote }}
volumeMounts:
- name: scripts
mountPath: /opt
volumeMounts:
- name: scripts
mountPath: /opt
@@
-124,6
+137,11
@@
spec:
mountPath: /configs/o2app.conf
subPath: config.json
readOnly: true
mountPath: /configs/o2app.conf
subPath: config.json
readOnly: true
+ {{- if default false .Values.o2ims.useHostCert }}
+ - name: ca-certs
+ mountPath: /etc/ssl/custom-cert.pem
+ readOnly: true
+ {{- end }}
- name: o2api
image: "{{ .Values.o2ims.images.tags.o2service }}"
ports:
- name: o2api
image: "{{ .Values.o2ims.images.tags.o2service }}"
ports:
@@
-156,8
+174,10
@@
spec:
volumeMounts:
- name: scripts
mountPath: /opt
volumeMounts:
- name: scripts
mountPath: /opt
- # - name: configs
- # mountPath: /configs
+ {{- if .Values.o2dms.helm_cli_enable }}
+ - name: share
+ mountPath: /share
+ {{- end }}
- name: applicationconfig
mountPath: /configs/o2app.conf
subPath: config.json
- name: applicationconfig
mountPath: /configs/o2app.conf
subPath: config.json
@@
-170,6
+190,9
@@
spec:
mountPath: /configs/server.key
subPath: config.json
readOnly: true
mountPath: /configs/server.key
subPath: config.json
readOnly: true
+ - name: smocacrt
+ mountPath: /configs/smoca.crt
+ subPath: config.json
{{- if .Values.o2dms.helm_cli_enable }}
- name: helmcli
image: "{{ .Values.o2ims.images.tags.o2service }}"
{{- if .Values.o2dms.helm_cli_enable }}
- name: helmcli
image: "{{ .Values.o2ims.images.tags.o2service }}"
@@
-184,13
+207,17
@@
spec:
volumeMounts:
- name: scripts
mountPath: /opt
volumeMounts:
- name: scripts
mountPath: /opt
+ - name: share
+ mountPath: /share
{{- end }}
volumes:
- name: scripts
configMap:
name: {{ .Chart.Name }}-scripts-configmap
{{- end }}
volumes:
- name: scripts
configMap:
name: {{ .Chart.Name }}-scripts-configmap
- # - name: configs
- # emptyDir: {}
+ {{- if .Values.o2dms.helm_cli_enable }}
+ - name: share
+ emptyDir: {}
+ {{- end }}
- configMap:
name: {{ .Chart.Name }}-application-config
name: applicationconfig
- configMap:
name: {{ .Chart.Name }}-application-config
name: applicationconfig
@@
-206,4
+233,10
@@
spec:
- name: db-pv
persistentVolumeClaim:
claimName: {{ .Chart.Name }}-db-pv
- name: db-pv
persistentVolumeClaim:
claimName: {{ .Chart.Name }}-db-pv
+ {{- if default false .Values.o2ims.useHostCert }}
+ - name: ca-certs
+ hostPath:
+ path: {{ .Values.o2ims.hostCertPath | quote }}
+ type: File
+ {{- end }}
---
---