Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[COMMON] Fix resources indent
[oom.git]
/
kubernetes
/
multicloud
/
components
/
multicloud-pike
/
templates
/
deployment.yaml
diff --git
a/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
b/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
index
d12e663
..
a8d876a
100644
(file)
--- a/
kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
+++ b/
kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
@@
-41,15
+41,15
@@
spec:
containers:
- env:
- name: MSB_PROTO
containers:
- env:
- name: MSB_PROTO
- value:
{{ .Values.config.msbprotocol }}
+ value:
"{{ if (include "common.needTLS" .) }}https{{ else }}http{{ end }}"
- 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
- value: "{{
.Values.config.msbPort
}}"
+ value: "{{
- if (include "common.needTLS" .) }}{{ .Values.config.msbPort }}{{ else }}{{ .Values.config.msbPlainPort }}{{ end
}}"
- name: AAI_ADDR
- name: AAI_ADDR
- value:
aai.{{ include "common.namespace" . }}
+ value:
"aai.{{ include "common.namespace" . }}"
- name: AAI_PORT
- name: AAI_PORT
- value: "{{
.Values.config.aai.port
}}"
+ value: "{{
- if (include "common.needTLS" .) }}{{ .Values.config.aai.aaiPort }}{{ else }}{{ .Values.config.aai.aaiPlainPort }}{{ end
}}"
- name: AAI_SCHEMA_VERSION
value: "{{ .Values.config.aai.schemaVersion }}"
- name: AAI_USERNAME
- name: AAI_SCHEMA_VERSION
value: "{{ .Values.config.aai.schemaVersion }}"
- name: AAI_USERNAME
@@
-57,16
+57,15
@@
spec:
- name: AAI_PASSWORD
value: "{{ .Values.config.aai.password }}"
- name: SSL_ENABLED
- name: AAI_PASSWORD
value: "{{ .Values.config.aai.password }}"
- name: SSL_ENABLED
- value: "{{
.Values.config.ssl_enable
d }}"
+ value: "{{
- if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ en
d }}"
name: {{ include "common.name" . }}
volumeMounts:
name: {{ include "common.name" . }}
volumeMounts:
- - mountPath:
/var/log/onap
+ - mountPath:
"{{ .Values.log.path }}"
name: pike-log
- mountPath: /opt/pike/pike/pub/config/log.yml
name: pike-logconfig
subPath: log.yml
name: pike-log
- mountPath: /opt/pike/pike/pub/config/log.yml
name: pike-logconfig
subPath: log.yml
- resources:
-{{ include "common.resources" . | indent 12 }}
+ resources: {{ include "common.resources" . | nindent 9 }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/bin/sh"]
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/bin/sh"]
@@
-88,26
+87,15
@@
spec:
failureThreshold: {{ .Values.liveness.failureThreshold }}
{{ end }}
# side car containers
failureThreshold: {{ .Values.liveness.failureThreshold }}
{{ end }}
# side car containers
- - image: {{ include "repositoryGenerator.image.logging" . }}
+ {{ include "common.log.sidecar" . | nindent 5 }}
+ - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.memcached }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: filebeat-onap
- volumeMounts:
- - mountPath: /usr/share/filebeat/filebeat.yml
- name: filebeat-conf
- subPath: filebeat.yml
- - mountPath: /var/log/onap
- name: pike-log
- - mountPath: /usr/share/filebeat/data
- name: pike-data-filebeat
+ name: memcached
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
- name: pike-log
emptyDir: {}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
- name: pike-log
emptyDir: {}
- - name: pike-data-filebeat
- emptyDir: {}
- - name: filebeat-conf
- configMap:
- name: multicloud-filebeat-configmap
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix .)) | nindent 5 }}
- name: pike-logconfig
configMap:
name: {{ include "common.fullname" . }}-log-configmap
- name: pike-logconfig
configMap:
name: {{ include "common.fullname" . }}-log-configmap