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 "Fix problem with wrong volume mount names"
[oom.git]
/
kubernetes
/
portal
/
charts
/
portal-cassandra
/
templates
/
deployment.yaml
diff --git
a/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
b/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
index
6f3f23f
..
073bed4
100644
(file)
--- a/
kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
+++ b/
kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
@@
-1,4
+1,5
@@
# Copyright © 2017 Amdocs, Bell Canada
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
#
# 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.
@@
-20,7
+21,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 }}
@@
-28,7
+29,7
@@
spec:
metadata:
labels:
app: {{ include "common.name" . }}
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
spec:
containers:
- name: {{ include "common.name" . }}
spec:
containers:
- name: {{ include "common.name" . }}
@@
-64,7
+65,7
@@
spec:
- name: CASSPASS
value: "{{ .Values.config.cassandraPassword }}"
- name: JVM_OPTS
- name: CASSPASS
value: "{{ .Values.config.cassandraPassword }}"
- name: JVM_OPTS
- value: "{{ .Values.config.cassandraJvmOpts }}"
+ value: "{{ .Values.config.cassandraJvmOpts }}"
- name: POD_IP
valueFrom:
fieldRef:
- name: POD_IP
valueFrom:
fieldRef:
@@
-74,15
+75,12
@@
spec:
name: localtime
readOnly: true
- name: cassandra-docker-entrypoint-initdb
name: localtime
readOnly: true
- name: cassandra-docker-entrypoint-initdb
- mountPath: /docker-entrypoint-initdb.d/zzz_portal.cql
- subPath: portal.cql
- - name: cassandra-docker-entrypoint-initdb
- mountPath: /docker-entrypoint-initdb.d/zzz_portalsdk.cql
- subPath: portalsdk.cql
+ mountPath: /docker-entrypoint-initdb.d/aaa_portal_single.cql
+ subPath: portal_single.cql
- name: {{ include "common.fullname" . }}-data
mountPath: /var/lib/cassandra/data
resources:
- name: {{ include "common.fullname" . }}-data
mountPath: /var/lib/cassandra/data
resources:
-{{
toYaml .Values.resources
| indent 12 }}
+{{
include "common.resources" .
| indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}