aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/aaf
diff options
context:
space:
mode:
authorBorislavG <Borislav.Glozman@amdocs.com>2018-02-27 15:04:26 +0000
committerAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-03-01 18:10:31 +0000
commit8bfc6cf8c3d338c84c48201f7a4f274958e721a9 (patch)
tree2e0e1a969afc6ae38f0a2f62cc1a36e184cb48e1 /kubernetes/aaf
parentf0a34e22011b4323bbd6a51ad313d6e547808101 (diff)
Run all components in one namespace
Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e Issue-ID: OOM-722 Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Diffstat (limited to 'kubernetes/aaf')
-rw-r--r--kubernetes/aaf/templates/aaf-configmap.yaml2
-rw-r--r--kubernetes/aaf/templates/aaf-cs-deployment.yaml2
-rw-r--r--kubernetes/aaf/templates/aaf-deployment.yaml2
-rw-r--r--kubernetes/aaf/templates/aaf-secret.yaml2
-rw-r--r--kubernetes/aaf/templates/all-services.yaml4
5 files changed, 6 insertions, 6 deletions
diff --git a/kubernetes/aaf/templates/aaf-configmap.yaml b/kubernetes/aaf/templates/aaf-configmap.yaml
index c8565f2d90..b6e494df46 100644
--- a/kubernetes/aaf/templates/aaf-configmap.yaml
+++ b/kubernetes/aaf/templates/aaf-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: aaf-data-configmap
- namespace: {{ .Values.nsPrefix }}-aaf
+ namespace: {{ .Values.nsPrefix }}
data:
{{ (.Files.Glob "resources/config/aaf-data/*").AsConfig | indent 2 }}
#{{ end }}
diff --git a/kubernetes/aaf/templates/aaf-cs-deployment.yaml b/kubernetes/aaf/templates/aaf-cs-deployment.yaml
index 55619b3280..be5f6c1c54 100644
--- a/kubernetes/aaf/templates/aaf-cs-deployment.yaml
+++ b/kubernetes/aaf/templates/aaf-cs-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: aaf-cs
- namespace: "{{ .Values.nsPrefix }}-aaf"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: 1
selector:
diff --git a/kubernetes/aaf/templates/aaf-deployment.yaml b/kubernetes/aaf/templates/aaf-deployment.yaml
index 4f64048aad..50c3e5ad94 100644
--- a/kubernetes/aaf/templates/aaf-deployment.yaml
+++ b/kubernetes/aaf/templates/aaf-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
labels:
app: aaf
name: aaf
- namespace: "{{ .Values.nsPrefix }}-aaf"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
selector:
matchLabels:
diff --git a/kubernetes/aaf/templates/aaf-secret.yaml b/kubernetes/aaf/templates/aaf-secret.yaml
index 705d05053c..4b6984ab38 100644
--- a/kubernetes/aaf/templates/aaf-secret.yaml
+++ b/kubernetes/aaf/templates/aaf-secret.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: Secret
metadata:
name: aaf-cs-data-secret
- namespace: {{ .Values.nsPrefix }}-aaf
+ namespace: {{ .Values.nsPrefix }}
type: Opaque
data:
{{ (.Files.Glob "resources/config/aaf-cs-data/*").AsSecrets | indent 2 }}
diff --git a/kubernetes/aaf/templates/all-services.yaml b/kubernetes/aaf/templates/all-services.yaml
index be04180089..0a06d1dd3c 100644
--- a/kubernetes/aaf/templates/all-services.yaml
+++ b/kubernetes/aaf/templates/all-services.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
name: aaf-cs
- namespace: "{{ .Values.nsPrefix }}-aaf"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: aaf-cs
spec:
@@ -26,7 +26,7 @@ apiVersion: v1
kind: Service
metadata:
name: aaf-authz-service
- namespace: "{{ .Values.nsPrefix }}-aaf"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: aaf-authz-service
spec: