diff options
| author |   BorislavG <Borislav.Glozman@amdocs.com> | 2018-02-27 15:04:26 +0000 |
|---|---|---|
| committer |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-03-01 18:10:31 +0000 |
| commit | df274d21cbc5c809f2445e64e233b8892d4a1e08 (patch) | |
| tree | 2a4380133b84a101e3f6b75a93a82ae5e5516503 | |
| parent | 2ae26ab7b72bfae8395c0de807c0384f8d7b458b (diff) | |
Run all components in one namespace
Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e
Issue-ID: OOM-722
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
| -rw-r--r-- | templates/aaf-configmap.yaml | 2 | ||||
| -rw-r--r-- | templates/aaf-cs-deployment.yaml | 2 | ||||
| -rw-r--r-- | templates/aaf-deployment.yaml | 2 | ||||
| -rw-r--r-- | templates/aaf-secret.yaml | 2 | ||||
| -rw-r--r-- | templates/all-services.yaml | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/templates/aaf-configmap.yaml b/templates/aaf-configmap.yaml index c8565f2..b6e494d 100644 --- a/templates/aaf-configmap.yaml +++ b/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/templates/aaf-cs-deployment.yaml b/templates/aaf-cs-deployment.yaml index 55619b3..be5f6c1 100644 --- a/templates/aaf-cs-deployment.yaml +++ b/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/templates/aaf-deployment.yaml b/templates/aaf-deployment.yaml index 4f64048..50c3e5a 100644 --- a/templates/aaf-deployment.yaml +++ b/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/templates/aaf-secret.yaml b/templates/aaf-secret.yaml index 705d050..4b6984a 100644 --- a/templates/aaf-secret.yaml +++ b/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/templates/all-services.yaml b/templates/all-services.yaml index be04180..0a06d1d 100644 --- a/templates/all-services.yaml +++ b/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: |