Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[CONSUL] Add limits to consul chart."
[oom.git]
/
kubernetes
/
nbi
/
templates
/
deployment.yaml
diff --git
a/kubernetes/nbi/templates/deployment.yaml
b/kubernetes/nbi/templates/deployment.yaml
index
22dd4a1
..
6d5b2d5
100644
(file)
--- a/
kubernetes/nbi/templates/deployment.yaml
+++ b/
kubernetes/nbi/templates/deployment.yaml
@@
-1,5
+1,7
@@
+{{/*
# Copyright © 2018 Orange
# Modifications Copyright © 2018 Amdocs, Bell Canada
# Copyright © 2018 Orange
# Modifications Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2020 Nokia
#
# 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.
@@
-12,8
+14,9
@@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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" . }}
@@
-24,6
+27,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:
@@
-45,7
+51,7
@@
spec:
# so K8s doesn't restart unresponsive container
{{- if .Values.global.aafEnabled }}
command:
# so K8s doesn't restart unresponsive container
{{- if .Values.global.aafEnabled }}
command:
- -
ba
sh
+ - sh
args:
- -c
- |
args:
- -c
- |
@@
-94,6
+100,10
@@
spec:
value: {{ .Values.config.openStackVNFTenantId | quote }}
- name: ONAP_CLOUDOWNER
value: {{ .Values.config.cloudOwner }}
value: {{ .Values.config.openStackVNFTenantId | quote }}
- name: ONAP_CLOUDOWNER
value: {{ .Values.config.cloudOwner }}
+ - name: ONAP_K8SCLOUDREGIONID
+ value: {{ .Values.config.k8sCloudRegionId }}
+ - name: ONAP_K8SCLOUDOWNER
+ value: {{ .Values.config.k8sCloudOwner }}
- name: NBI_URL
value: "https://nbi.{{ include "common.namespace" . }}:8443/nbi/api/v4"
- name: SDC_HOST
- name: NBI_URL
value: "https://nbi.{{ include "common.namespace" . }}:8443/nbi/api/v4"
- name: SDC_HOST