Merge "Kong as Ingress Controller"

diff --git a/nonrtric/helm/enrichmentservice/templates/deployment.yaml b/nonrtric/helm/enrichmentservice/templates/statefulset.yaml
similarity index 96%
rename from nonrtric/helm/enrichmentservice/templates/deployment.yaml
rename to nonrtric/helm/enrichmentservice/templates/statefulset.yaml
index 11a1874..7bc9a75 100644 (file)
--- a/nonrtric/helm/enrichmentservice/templates/deployment.yaml
+++ b/nonrtric/helm/enrichmentservice/templates/statefulset.yaml
@@ -14,7 +14,7 @@
 #   limitations under the License.                                             #
 ################################################################################
 
-kind: Deployment
+kind: StatefulSet
 apiVersion: apps/v1
 metadata:
   name: {{ include "common.name.enrichmentservice" . }}
@@ -28,6 +28,7 @@ metadata:
   annotations:
     deployment.kubernetes.io/revision: '1'
 spec:
+  serviceName: {{ include "common.name.enrichmentservice" . }}
   replicas: 1
   selector:
     matchLabels:
@@ -64,11 +65,11 @@ spec:
         - name: {{ include "common.name.enrichmentservice" . }}-enrichment-config
           mountPath: /opt/app/enrichment-coordinator-service/config
         - name: {{ include "common.name.enrichmentservice" . }}-ei-jobs-vol
-          mountPath: /var/enrichment-coordinator-service/database
+          mountPath: /var/enrichment-coordinator-service
       volumes:
         - name: {{ include "common.name.enrichmentservice" . }}-enrichment-config
           configMap:
             name: {{ include "common.name.enrichmentservice" . }}-configmap
         - name: {{ include "common.name.enrichmentservice" . }}-ei-jobs-vol
           persistentVolumeClaim:
-            claimName: {{ include "common.name.enrichmentservice" . }}-pvc
\ No newline at end of file
+            claimName: {{ include "common.name.enrichmentservice" . }}-pvc

diff --git a/nonrtric/helm/policymanagementservice/templates/deployment.yaml b/nonrtric/helm/policymanagementservice/templates/statefulset.yaml
similarity index 95%
rename from nonrtric/helm/policymanagementservice/templates/deployment.yaml
rename to nonrtric/helm/policymanagementservice/templates/statefulset.yaml
index 939f935..779d51f 100644 (file)
--- a/nonrtric/helm/policymanagementservice/templates/deployment.yaml
+++ b/nonrtric/helm/policymanagementservice/templates/statefulset.yaml
@@ -14,7 +14,7 @@
 #   limitations under the License.                                             #
 ################################################################################
 
-kind: Deployment
+kind: StatefulSet
 apiVersion: apps/v1
 metadata:
   name: {{ include "common.name.policymanagementservice" . }}
@@ -28,6 +28,7 @@ metadata:
   annotations:
     deployment.kubernetes.io/revision: '1'
 spec:
+  serviceName: {{ include "common.name.policymanagementservice" . }}
   replicas: 1
   selector:
     matchLabels:
@@ -62,11 +63,11 @@ spec:
           periodSeconds: {{ .Values.policymanagementservice.liveness.periodSeconds }}
         volumeMounts:
         - name: {{ include "common.name.policymanagementservice" . }}-vardata
-          mountPath: "/var/policy-management-service/database"
+          mountPath: "/var/policy-management-service"
         - name: {{ include "common.name.policymanagementservice" . }}-policy-config
           mountPath: /opt/app/policy-agent/config
         - name: {{ include "common.name.policymanagementservice" . }}-policy-data
-          mountPath: /opt/app/policy-agent/data       
+          mountPath: /opt/app/policy-agent/data
       volumes:
         - name: {{ include "common.name.policymanagementservice" . }}-policy-config
           configMap: