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 "[DMAAP] Add logs to STDOUT"
[oom.git]
/
kubernetes
/
dcaegen2
/
components
/
dcae-config-binding-service
/
templates
/
deployment.yaml
diff --git
a/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
b/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
index
c3e63fb
..
299e3ef
100644
(file)
--- a/
kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
+++ b/
kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
@@
-15,7
+15,7
@@
# limitations under the License.
# ============LICENSE_END=========================================================
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion:
extensions/v1beta
1
+apiVersion:
apps/v
1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
@@
-23,25
+23,30
@@
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: 1
heritage: {{ .Release.Service }}
spec:
replicas: 1
+ selector:
+ matchLabels:
+ app: {{ include "common.name" . }}
template:
metadata:
labels:
app: {{ include "common.name" . }}
template:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
spec:
initContainers:
- name: {{ include "common.name" . }}-readiness
spec:
initContainers:
- name: {{ include "common.name" . }}-readiness
- image: {{
.Values.global.readinessRepository
}}/{{ .Values.global.readinessImage }}
+ image: {{
include "common.repository" .
}}/{{ .Values.global.readinessImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- - /
root
/ready.py
+ - /
app
/ready.py
args:
- --container-name
- consul-server
args:
- --container-name
- consul-server
+ - --container-name
+ - aaf-cm
- "-t"
- "15"
env:
- "-t"
- "15"
env:
@@
-50,6
+55,8
@@
spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
+ - name: aaf_locator_fqdn
+ value: dcae
{{- if .Values.service.secure.enabled }}
- name: init-tls
env:
{{- if .Values.service.secure.enabled }}
- name: init-tls
env:
@@
-62,7
+69,7
@@
spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources: {}
volumeMounts:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources: {}
volumeMounts:
- - mountPath: /opt/
tls/shared
+ - mountPath: /opt/
app/osaaf
name: tls-info
{{ end }}
containers:
name: tls-info
{{ end }}
containers:
@@
-161,7
+168,7
@@
spec:
volumes:
- name: {{ include "common.fullname" . }}-fb-conf
configMap:
volumes:
- name: {{ include "common.fullname" . }}-fb-conf
configMap:
- name: {{
.Release.Name
}}-cbs-filebeat-configmap
+ name: {{
include "common.release" .
}}-cbs-filebeat-configmap
{{- if .Values.service.secure.enabled }}
- name: {{ include "common.fullname" . }}-data-fb
emptyDir: {}
{{- if .Values.service.secure.enabled }}
- name: {{ include "common.fullname" . }}-data-fb
emptyDir: {}