Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
dcae el-alto earlydrop updates with released tag
[oom.git]
/
kubernetes
/
dcaegen2
/
charts
/
dcae-bootstrap
/
resources
/
config
/
k8s-plugin.json
diff --git
a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/k8s-plugin.json
b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/k8s-plugin.json
index
3f2168b
..
d459d5b
100644
(file)
--- a/
kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/k8s-plugin.json
+++ b/
kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/k8s-plugin.json
@@
-19,6
+19,7
@@
{
"namespace" : "{{ if .Values.dcae_ns }}{{ .Values.dcae_ns}}{{ else }}{{include "common.namespace" . }}{{ end}}",
"consul_dns_name" : "{{ .Values.config.address.consul.host }}.{{ include "common.namespace" . }}",
{
"namespace" : "{{ if .Values.dcae_ns }}{{ .Values.dcae_ns}}{{ else }}{{include "common.namespace" . }}{{ end}}",
"consul_dns_name" : "{{ .Values.config.address.consul.host }}.{{ include "common.namespace" . }}",
+ "default_k8s_location" : "{{ .Values.default_k8s_location }}",
"image_pull_secrets" : ["{{ include "common.namespace" . }}-docker-registry-key"],
"filebeat":
{
"image_pull_secrets" : ["{{ include "common.namespace" . }}-docker-registry-key"],
"filebeat":
{
@@
-32,6
+33,8
@@
"tls":
{
"cert_path": "/opt/tls/shared",
"tls":
{
"cert_path": "/opt/tls/shared",
- "image": "{{ .Values.global.tlsRepository }}/{{ .Values.global.tlsImage }}"
+ "image": "{{ .Values.global.tlsRepository }}/{{ .Values.global.tlsImage }}",
+ "component_ca_cert_path": "/opt/dcae/cacert/cacert.pem",
+ "ca_cert_configmap": "{{ include "common.fullname" . }}-dcae-cacert"
}
}
}
}