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 "Initial calls to dmaaa-bc API"
[oom.git]
/
kubernetes
/
consul
/
templates
/
deployment.yaml
diff --git
a/kubernetes/consul/templates/deployment.yaml
b/kubernetes/consul/templates/deployment.yaml
index
504d54c
..
f04d772
100644
(file)
--- a/
kubernetes/consul/templates/deployment.yaml
+++ b/
kubernetes/consul/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.
@@
-34,15
+35,23
@@
spec:
release: {{ .Release.Name }}
name: {{ include "common.name" . }}
spec:
release: {{ .Release.Name }}
name: {{ include "common.name" . }}
spec:
+ imagePullSecrets:
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
containers:
containers:
- - image: "{{
.Values.repository | default .Values.global.repository
}}/{{ .Values.image }}"
+ - image: "{{
include "common.repository" .
}}/{{ .Values.image }}"
command:
- /bin/sh
- "-c"
- |
command:
- /bin/sh
- "-c"
- |
+ apk update && apk add jq
cp /tmp/consul/config/* /consul/config
cp /tmp/consul/config/* /consul/config
- /usr/local/bin/docker-entrypoint.sh agent -client 0.0.0.0 -enable-script-checks -
join {{ .Values.consulServer.nameOverride }}.{{ include "common.namespace" .
}}
+ /usr/local/bin/docker-entrypoint.sh agent -client 0.0.0.0 -enable-script-checks -
retry-join {{ .Values.consulServer.nameOverride
}}
name: {{ include "common.name" . }}
name: {{ include "common.name" . }}
+ env:
+ - name: SDNC_ODL_COUNT
+ value: "{{ .Values.sdnc.replicaCount }}"
+ - name: SDNC_IS_PRIMARY_CLUSTER
+ value: "{{ .Values.sdnc.config.isPrimaryCluster }}"
volumeMounts:
- mountPath: /tmp/consul/config
name: consul-agent-config
volumeMounts:
- mountPath: /tmp/consul/config
name: consul-agent-config
@@
-61,4
+70,3
@@
spec:
- secret:
secretName: {{ include "common.fullname" . }}-certs-secret
name: consul-agent-certs-config
- secret:
secretName: {{ include "common.fullname" . }}-certs-secret
name: consul-agent-certs-config
-