diff options
author | mayankg2703 <mayank.gupta@amdocs.com> | 2018-02-05 07:12:32 +0000 |
---|---|---|
committer | Alexis de Talhouƫt <alexis.de_talhouet@bell.ca> | 2018-02-05 15:21:33 +0000 |
commit | 19ce27937094bdb2d9ffc6b6d7eadf6e66d29a9c (patch) | |
tree | 3798202782b26a7463bc6520d85b9d6f2560f31d | |
parent | ed77ce3970427ae6887c8d6471a1d2deb6dd3812 (diff) |
config seg aai deployment service
Change-Id: Ic7572ff99d04af94e9cbab695f0597ae211fb583
Issue-ID: OOM-521
Signed-off-by: mayankg2703 <mayank.gupta@amdocs.com>
-rw-r--r-- | kubernetes/aai/resources/config/haproxy/haproxy.cfg (renamed from kubernetes/config/docker/init/src/config/aai/haproxy/haproxy.cfg) | 0 | ||||
-rw-r--r-- | kubernetes/aai/templates/aai-deployment-configmap.yaml | 9 | ||||
-rw-r--r-- | kubernetes/aai/templates/aai-deployment.yaml | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/kubernetes/config/docker/init/src/config/aai/haproxy/haproxy.cfg b/kubernetes/aai/resources/config/haproxy/haproxy.cfg index d7773270a4..d7773270a4 100644 --- a/kubernetes/config/docker/init/src/config/aai/haproxy/haproxy.cfg +++ b/kubernetes/aai/resources/config/haproxy/haproxy.cfg diff --git a/kubernetes/aai/templates/aai-deployment-configmap.yaml b/kubernetes/aai/templates/aai-deployment-configmap.yaml new file mode 100644 index 0000000000..40d4909ebf --- /dev/null +++ b/kubernetes/aai/templates/aai-deployment-configmap.yaml @@ -0,0 +1,9 @@ +#{{ if not .Values.disableAaiAaiService }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: aai-deployment-configmap + namespace: {{ .Values.nsPrefix }}-aai +data: +{{ tpl (.Files.Glob "resources/config/haproxy/*").AsConfig . | indent 2 }} +#{{ end }} diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml index a65cf44cba..e0e422b43a 100644 --- a/kubernetes/aai/templates/aai-deployment.yaml +++ b/kubernetes/aai/templates/aai-deployment.yaml @@ -42,6 +42,7 @@ spec: - mountPath: /dev/log name: aai-service-log - mountPath: /usr/local/etc/haproxy/haproxy.cfg + subPath: haproxy.cfg name: haproxy-cfg ports: - containerPort: 8080 @@ -59,8 +60,8 @@ spec: hostPath: path: "/dev/log" - name: haproxy-cfg - hostPath: - path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/haproxy.cfg" + configMap: + name: aai-deployment-configmap restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" |