Run all components in one namespace
Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e
Issue-ID: OOM-722
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
diff --git a/kubernetes/clamp/templates/all-services.yaml b/kubernetes/clamp/templates/all-services.yaml
index 163ed58..b3b9c65 100644
--- a/kubernetes/clamp/templates/all-services.yaml
+++ b/kubernetes/clamp/templates/all-services.yaml
@@ -3,7 +3,7 @@
kind: Service
metadata:
name: clamp-mariadb
- namespace: "{{ .Values.nsPrefix }}-clamp"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: clamp-mariadb
spec:
@@ -20,7 +20,7 @@
kind: Service
metadata:
name: clamp
- namespace: "{{ .Values.nsPrefix }}-clamp"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
ports:
- name: clamp
diff --git a/kubernetes/clamp/templates/clamp-deployment.yaml b/kubernetes/clamp/templates/clamp-deployment.yaml
index de9adac..f5dbdd1 100644
--- a/kubernetes/clamp/templates/clamp-deployment.yaml
+++ b/kubernetes/clamp/templates/clamp-deployment.yaml
@@ -5,7 +5,7 @@
labels:
app: clamp
name: clamp
- namespace: "{{ .Values.nsPrefix }}-clamp"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
selector:
matchLabels:
@@ -35,8 +35,8 @@
- env:
- name: SPRING_APPLICATION_JSON
value: '{
- "spring.datasource.camunda.url": "jdbc:mariadb:sequential://clamp-mariadb.{{ .Values.nsPrefix }}-clamp:3306/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647",
- "spring.datasource.cldsdb.url": "jdbc:mariadb:sequential://clamp-mariadb.{{ .Values.nsPrefix }}-clamp:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647"
+ "spring.datasource.camunda.url": "jdbc:mariadb:sequential://clamp-mariadb.{{ .Values.nsPrefix }}:3306/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647",
+ "spring.datasource.cldsdb.url": "jdbc:mariadb:sequential://clamp-mariadb.{{ .Values.nsPrefix }}:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647"
}'
image: {{ .Values.image.clampImage }}:{{ .Values.image.clampVersion }}
imagePullPolicy: {{ .Values.pullPolicy }}
diff --git a/kubernetes/clamp/templates/clamp-mariadb-configmap.yaml b/kubernetes/clamp/templates/clamp-mariadb-configmap.yaml
index 1fdc155..9a5fd8f 100644
--- a/kubernetes/clamp/templates/clamp-mariadb-configmap.yaml
+++ b/kubernetes/clamp/templates/clamp-mariadb-configmap.yaml
@@ -3,7 +3,7 @@
kind: ConfigMap
metadata:
name: clamp-entrypoint-initdb-configmap
- namespace: {{ .Values.nsPrefix }}-clamp
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/mariadb/docker-entrypoint-initdb.d/*").AsConfig . | indent 2 }}
---
@@ -11,7 +11,7 @@
kind: ConfigMap
metadata:
name: clamp-entrypoint-drop-configmap
- namespace: {{ .Values.nsPrefix }}-clamp
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/mariadb/docker-entrypoint-initdb.d/drop/*").AsConfig . | indent 2 }}
---
@@ -19,7 +19,7 @@
kind: ConfigMap
metadata:
name: clamp-entrypoint-bulkload-configmap
- namespace: {{ .Values.nsPrefix }}-clamp
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/mariadb/docker-entrypoint-initdb.d/bulkload/*").AsConfig . | indent 2 }}
---
@@ -27,7 +27,7 @@
kind: ConfigMap
metadata:
name: clamp-mariadb-conf-configmap
- namespace: {{ .Values.nsPrefix }}-clamp
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/mariadb/conf.d/conf1/*").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml b/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml
index 0566e50..762aa80 100644
--- a/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml
+++ b/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml
@@ -3,7 +3,7 @@
kind: Deployment
metadata:
name: clamp-mariadb
- namespace: "{{ .Values.nsPrefix }}-clamp"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: 1
selector:
diff --git a/kubernetes/clamp/templates/clamp-pv-pvc.yaml b/kubernetes/clamp/templates/clamp-pv-pvc.yaml
index f15ff33..c542de6 100644
--- a/kubernetes/clamp/templates/clamp-pv-pvc.yaml
+++ b/kubernetes/clamp/templates/clamp-pv-pvc.yaml
@@ -2,10 +2,10 @@
apiVersion: v1
kind: PersistentVolume
metadata:
- name: "{{ .Values.nsPrefix }}-clamp-db"
- namespace: "{{ .Values.nsPrefix }}-clamp"
+ name: "{{ .Values.nsPrefix }}-clamp"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
- name: "{{ .Values.nsPrefix }}-clamp-db"
+ name: "{{ .Values.nsPrefix }}-clamp"
spec:
capacity:
storage: 2Gi
@@ -19,7 +19,7 @@
apiVersion: v1
metadata:
name: clamp-db
- namespace: "{{ .Values.nsPrefix }}-clamp"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
accessModes:
- ReadWriteMany
@@ -28,5 +28,5 @@
storage: 2Gi
selector:
matchLabels:
- name: "{{ .Values.nsPrefix }}-clamp-db"
+ name: "{{ .Values.nsPrefix }}-clamp"
#{{ end }}