Merge "Issue-ID: RICAPP-169 - Inclusion of InfluxDB helm chart for KPIMON, AD, TS...

diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
index 7efd8e1..07d0689 100644 (file)
--- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
@@ -23,7 +23,9 @@ common:
 # Change the namespaces using the following options
   namespace:
     nonrtric: nonrtric
-# any nonrtric chart can be installed: nonrtric (all components), controlpanel, a1controller, a1simulator, policymanagementservice, enrichmentservice, rappcatalogueservice, nonrtricgateway
+  ingressClassName: kong
+# any nonrtric chart can be installed: nonrtric (all components), controlpanel, a1controller, a1simulator, policymanagementservice, 
+# enrichmentservice, rappcatalogueservice, nonrtricgateway
 component: nonrtric
 
 # A1 Conttroller may take few more minutes to start. Increase the initialDelaySeconds in liveness to avoid container restart.

diff --git a/nonrtric/helm/enrichmentservice/templates/ingress.yaml b/nonrtric/helm/enrichmentservice/templates/ingress.yaml
new file mode 100644 (file)
index 0000000..5a1fb33
--- /dev/null
+++ b/nonrtric/helm/enrichmentservice/templates/ingress.yaml
@@ -0,0 +1,41 @@
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "common.name.enrichmentservice" . }}
+  namespace: {{ include "common.namespace.nonrtric" . }}
+
+spec:
+  ingressClassName: {{ include "common.ingressClassName" . }}
+  rules:
+    - http:
+        paths:
+          - path: "/ei-producer"
+            backend:
+              service:
+                name: {{ include "common.name.enrichmentservice" . }}
+                port: 
+                  number: {{ .Values.enrichmentservice.service.internalPort1 }}
+            pathType: Prefix
+            path: "/data-consumer"
+            backend:
+              service:
+                name: {{ include "common.name.enrichmentservice" . }}
+                port: 
+                  number: {{ .Values.enrichmentservice.service.internalPort1 }}
+            pathType: Prefix

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/nonrtric/requirements.yaml b/nonrtric/helm/nonrtric/requirements.yaml
index 2a9e512..bc6a3b0 100644 (file)
--- a/nonrtric/helm/nonrtric/requirements.yaml
+++ b/nonrtric/helm/nonrtric/requirements.yaml
@@ -38,5 +38,4 @@ dependencies:
     repository: "@local"
   - name: nonrtricgateway
     version: ~1.0.0
-    repository: "@local"
-
+    repository: "@local"
\ No newline at end of file

diff --git a/nonrtric/helm/policymanagementservice/templates/ingress.yaml b/nonrtric/helm/policymanagementservice/templates/ingress.yaml
new file mode 100644 (file)
index 0000000..67eac10
--- /dev/null
+++ b/nonrtric/helm/policymanagementservice/templates/ingress.yaml
@@ -0,0 +1,34 @@
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "common.name.policymanagementservice" . }}
+  namespace: {{ include "common.namespace.nonrtric" . }}
+
+spec:
+  ingressClassName: {{ include "common.ingressClassName" . }}
+  rules:
+    - http:
+        paths:
+          - backend:
+              service:
+                name: {{ include "common.name.policymanagementservice" . }}
+                port:
+                  number: {{ .Values.policymanagementservice.service.internalPort1 }}
+            path: "/a1-policy"
+            pathType: Prefix

diff --git a/nonrtric/helm/policymanagementservice/templates/pv.yaml b/nonrtric/helm/policymanagementservice/templates/pv.yaml
index f840a78..929c7e5 100644 (file)
--- a/nonrtric/helm/policymanagementservice/templates/pv.yaml
+++ b/nonrtric/helm/policymanagementservice/templates/pv.yaml
@@ -35,4 +35,3 @@ spec:
   hostPath:
     path: {{ .Values.policymanagementservice.persistence.mountPath }}/{{ .Values.policymanagementservice.persistence.mountSubPath }}
   storageClassName: "{{ .Values.policymanagementservice.persistence.storageClass }}"
-

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:

diff --git a/ric-common/Common-Template/helm/nonrtric-common/templates/_nonrtricgateway.tpl b/ric-common/Common-Template/helm/nonrtric-common/templates/_nonrtricgateway.tpl
index 0d1435f..d14e540 100644 (file)
--- a/ric-common/Common-Template/helm/nonrtric-common/templates/_nonrtricgateway.tpl
+++ b/ric-common/Common-Template/helm/nonrtric-common/templates/_nonrtricgateway.tpl
@@ -22,3 +22,7 @@
   {{- $name := ( include "common.name.nonrtricgateway" . ) -}}
   {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{- define "common.ingressClassName" -}}
+  {{- printf "kong" -}}
+{{- end -}}