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 "[SDC] Bring back sdc onboarding volume mount permissions"
[oom.git]
/
kubernetes
/
multicloud
/
charts
/
multicloud-pike
/
templates
/
deployment.yaml
diff --git
a/kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml
b/kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml
index
518ce8a
..
bfcacb8
100644
(file)
--- a/
kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml
+++ b/
kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml
@@
-14,7
+14,7
@@
# limitations under the License.
*/}}
# 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" . }}
@@
-22,7
+22,7
@@
metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
@@
-33,13
+33,15
@@
spec:
metadata:
labels:
app: {{ include "common.name" . }}
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
name: {{ include "common.name" . }}
annotations:
sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
spec:
containers:
- env:
name: {{ include "common.name" . }}
annotations:
sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
spec:
containers:
- env:
+ - name: MSB_PROTO
+ value: {{ .Values.config.msbprotocol }}
- name: MSB_ADDR
value: "{{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}"
- name: MSB_PORT
- name: MSB_ADDR
value: "{{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}"
- name: MSB_PORT
@@
-54,6
+56,8
@@
spec:
value: "{{ .Values.config.aai.username }}"
- name: AAI_PASSWORD
value: "{{ .Values.config.aai.password }}"
value: "{{ .Values.config.aai.username }}"
- name: AAI_PASSWORD
value: "{{ .Values.config.aai.password }}"
+ - name: SSL_ENABLED
+ value: "{{ .Values.config.ssl_enabled }}"
name: {{ include "common.name" . }}
volumeMounts:
- mountPath: /var/log/onap
name: {{ include "common.name" . }}
volumeMounts:
- mountPath: /var/log/onap
@@
-92,7
+96,7
@@
spec:
- mountPath: /var/log/onap
name: pike-log
- mountPath: /usr/share/filebeat/data
- mountPath: /var/log/onap
name: pike-log
- mountPath: /usr/share/filebeat/data
- name: pike-
pike
-filebeat
+ name: pike-
data
-filebeat
volumes:
- name: pike-log
volumes:
- name: pike-log