Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[VFC]Refactor environment variables of VFC
[oom.git]
/
kubernetes
/
vfc
/
charts
/
vfc-vnfmgr
/
templates
/
deployment.yaml
diff --git
a/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml
b/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml
index
c4c070d
..
bd0b377
100644
(file)
--- a/
kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml
+++ b/
kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml
@@
-12,7
+12,7
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion:
extensions/v1beta
1
+apiVersion:
apps/v
1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
@@
-23,6
+23,9
@@
metadata:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
+ selector:
+ matchLabels:
+ app: {{ include "common.name" . }}
replicas: {{ .Values.replicaCount }}
template:
metadata:
replicas: {{ .Values.replicaCount }}
template:
metadata:
@@
-34,7
+37,7
@@
spec:
spec:
initContainers:
- command:
spec:
initContainers:
- command:
- - /
root
/ready.py
+ - /
app
/ready.py
args:
- --container-name
- {{ .Values.config.mariadbService }}
args:
- --container-name
- {{ .Values.config.mariadbService }}
@@
-44,7
+47,7
@@
spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: "{{
.Values.global.readinessRepository
}}/{{ .Values.global.readinessImage }}"
+ image: "{{
include "common.repository" .
}}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
containers:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
containers:
@@
-73,21
+76,22
@@
spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- - name: MSB_
PROTO
- value: "{{ .Values.global.config.msbprotocol }}"
+ - name: MSB_
HOST
+ value: "{{ .Values.global.config.msbprotocol }}
://{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}
"
- name: SSL_ENABLED
value: "{{ .Values.global.config.ssl_enabled }}"
- name: SSL_ENABLED
value: "{{ .Values.global.config.ssl_enabled }}"
- - name: MSB_ADDR
- value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
- name: MYSQL_ADDR
value: "{{ .Values.config.mariadbService }}:{{ .Values.config.mariadbPort }}"
- name: MYSQL_ADDR
value: "{{ .Values.config.mariadbService }}:{{ .Values.config.mariadbPort }}"
- - name: REDIS_ADDR
- value: "{{ .Values.global.config.redisServiceName }}:{{ .Values.global.config.redisPort }}"
+ - name: REDIS_HOST
+ value: "{{ .Values.global.config.redisServiceName }}"
+ - name: REDIS_PORT
+ value: "{{ .Values.global.config.redisPort }}"
- name: MYSQL_ROOT_USER
value: "{{ .Values.global.config.mariadb_admin }}"
- name: MYSQL_ROOT_PASSWORD
- name: MYSQL_ROOT_USER
value: "{{ .Values.global.config.mariadb_admin }}"
- name: MYSQL_ROOT_PASSWORD
- {{- include "common.secret.envFromSecret" (dict "global" . "uid" "db-root-pass" "key" "password") | indent 14}}
-
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-root-pass" "key" "password") | indent 14}}
+ - name: REG_TO_MSB_WHEN_START
+ value: "{{ .Values.global.config.reg_to_msb_when_start }}"
volumeMounts:
- name: {{ include "common.fullname" . }}-localtime
mountPath: /etc/localtime
volumeMounts:
- name: {{ include "common.fullname" . }}-localtime
mountPath: /etc/localtime