Adding Configmap for e2term

Adding Configmap for e2term

Change-Id: I2084d99897dbf1934c0fe98342f45d66bc59ec49
Signed-off-by: naman.gupta <naman.gupta@samsung.com>

diff --git a/depRicKubernetesOperator/internal/controller/getConfigmap.go b/depRicKubernetesOperator/internal/controller/getConfigmap.go
index 1a4f4ba..af56cd3 100644 (file)
--- a/depRicKubernetesOperator/internal/controller/getConfigmap.go
+++ b/depRicKubernetesOperator/internal/controller/getConfigmap.go
@@ -369,6 +369,88 @@ func GetConfigMap() []*corev1.ConfigMap {
                        Kind:       "ConfigMap",\r
                },\r
        }\r
-       \r
-       return []*corev1.ConfigMap{configMap1, configMap2, configMap3, configMap4, configMap5, configMap6,configMap7, configMap8, configMap9, configMap10, configMap11, configMap12, configMap13, configMap14, configMap15, configMap16}\r
+\r
+       configMap17 := &corev1.ConfigMap{\r
+               Data: map[string]string{\r
+                       "log-level": "log-level: 3",\r
+               },\r
+               ObjectMeta: metav1.ObjectMeta{\r
+                       Name:      "configmap-ricplt-e2term-loglevel-configmap",\r
+                       Namespace: "ricplt",\r
+               },\r
+               TypeMeta: metav1.TypeMeta{\r
+                       APIVersion: "v1",\r
+                       Kind:       "ConfigMap",\r
+               },\r
+       }\r
+\r
+       configMap18 := &corev1.ConfigMap{\r
+               ObjectMeta: metav1.ObjectMeta{\r
+                       Name:      "configmap-ricplt-e2term-router-configmap",\r
+                       Namespace: "ricplt",\r
+               },\r
+               TypeMeta: metav1.TypeMeta{\r
+                       APIVersion: "v1",\r
+                       Kind:       "ConfigMap",\r
+               },\r
+               Data: map[string]string{\r
+                       "rmr_verbose": "0\n" +\r
+                               "",\r
+                       "router.txt": "newrt|start\n" +\r
+                               "rte|1080|service-ricplt-e2mgr-rmr.ricplt:3801\n" +\r
+                               "rte|1090|service-ricplt-e2term-rmr-alpha.ricplt:38000\n" +\r
+                               "rte|1100|service-ricplt-e2mgr-rmr.ricplt:3801\n" +\r
+                               "rte|10020|service-ricplt-e2mgr-rmr.ricplt:3801\n" +\r
+                               "rte|10060|service-ricplt-e2term-rmr-alpha.ricplt:38000\n" +\r
+                               "rte|10061|service-ricplt-e2mgr-rmr.ricplt:3801\n" +\r
+                               "rte|10062|service-ricplt-e2mgr-rmr.ricplt:3801\n" +\r
+                               "rte|10030|service-ricplt-e2mgr-rmr.ricplt:3801\n" +\r
+                               "rte|10070|service-ricplt-e2mgr-rmr.ricplt:3801\n" +\r
+                               "rte|10071|service-ricplt-e2mgr-rmr.ricplt:3801\n" +\r
+                               "rte|10080|service-ricplt-e2mgr-rmr.ricplt:3801\n" +\r
+                               "rte|10091|service-ricplt-rsm-rmr.ricplt:4801\n" +\r
+                               "rte|10092|service-ricplt-rsm-rmr.ricplt:4801\n" +\r
+                               "rte|10360|service-ricplt-e2term-rmr-alpha.ricplt:38000\n" +\r
+                               "rte|10361|service-ricplt-e2mgr-rmr.ricplt:3801\n" +\r
+                               "rte|10362|service-ricplt-e2mgr-rmr.ricplt:3801\n" +\r
+                               "rte|10370|service-ricplt-e2mgr-rmr.ricplt:3801\n" +\r
+                               "rte|10371|service-ricplt-e2term-rmr-alpha.ricplt:38000\n" +\r
+                               "rte|12010|service-ricplt-e2term-rmr-alpha.ricplt:38000\n" +\r
+                               "rte|12020|service-ricplt-e2term-rmr-alpha.ricplt:38000\n" +\r
+                               "rte|20001|service-ricplt-a1mediator-rmr.ricplt:4562\n" +\r
+                               "rte|12011|service-ricxapp-ueec-rmr.ricxapp:4560;service-admission-ctrl-xapp-rmr.ricxapp:4560\n" +\r
+                               "rte|12050|service-ricxapp-ueec-rmr.ricxapp:4560;service-admission-ctrl-xapp-rmr.ricxapp:4560\n" +\r
+                               "rte|12012|service-ricxapp-ueec-rmr.ricxapp:4560;service-admission-ctrl-xapp-rmr.ricxapp:4560\n" +\r
+                               "rte|12021|service-ricxapp-ueec-rmr.ricxapp:4560;service-admission-ctrl-xapp-rmr.ricxapp:4560\n" +\r
+                               "rte|12022|service-ricxapp-ueec-rmr.ricxapp:4560;service-admission-ctrl-xapp-rmr.ricxapp:4560\n" +\r
+                               "rte|12041|service-ricxapp-ueec-rmr.ricxapp:4560;service-admission-ctrl-xapp-rmr.ricxapp:4560\n" +\r
+                               "rte|12042|service-ricxapp-ueec-rmr.ricxapp:4560;service-admission-ctrl-xapp-rmr.ricxapp:4560\n" +\r
+                               "rte|12050|service-ricxapp-ueec-rmr.ricxapp:4560;service-admission-ctrl-xapp-rmr.ricxapp:4560\n" +\r
+                               "rte|20000|service-ricxapp-ueec-rmr.ricxapp:4560;service-admission-ctrl-xapp-rmr.ricxapp:4560\n" +\r
+                               "newrt|end",\r
+               },\r
+       }\r
+\r
+       configMap19 := &corev1.ConfigMap{\r
+               ObjectMeta: metav1.ObjectMeta{\r
+                       Name: "configmap-ricplt-e2term-env-alpha",\r
+               },\r
+               TypeMeta: metav1.TypeMeta{\r
+                       APIVersion: "v1",\r
+                       Kind:       "ConfigMap",\r
+               },\r
+               Data: map[string]string{\r
+                       "RMR_SEED_RT":   "router.txt",\r
+                       "RMR_SRC_ID":    "service-ricplt-e2term-rmr-alpha.ricplt",\r
+                       "RMR_VCTL_FILE": "/tmp/rmr_verbose",\r
+                       "nano":          "38000",\r
+                       "print":         "1",\r
+                       "sctp":          "36422",\r
+                       "volume":        "/data/outgoing/",\r
+                       "RMR_RTG_SVC":   "4561",\r
+               },\r
+       }\r
+\r
+\r
+       return []*corev1.ConfigMap{configMap1, configMap2, configMap3, configMap4, configMap5, configMap6,configMap7, configMap8, configMap9, configMap10, configMap11, configMap12, configMap13, configMap14, configMap15, configMap16, configMap17, configMap18, configMap19}\r
 }\r

diff --git a/depRicKubernetesOperator/internal/controller/getPersistentVolume.go b/depRicKubernetesOperator/internal/controller/getPersistentVolume.go
index 8fbb043..ea39552 100644 (file)
--- a/depRicKubernetesOperator/internal/controller/getPersistentVolume.go
+++ b/depRicKubernetesOperator/internal/controller/getPersistentVolume.go
@@ -30,5 +30,30 @@ func GetPersistentVolume() []*unstructured.Unstructured {
                },\r
        }\r
 \r
-       return []*unstructured.Unstructured{persistentVolume1}\r
+       persistentVolume2 := &unstructured.Unstructured{\r
+               Object: map[string]interface{}{\r
+                       "apiVersion": "v1",\r
+                       "kind":       "PersistentVolume",\r
+                       "metadata": map[string]interface{}{\r
+                               "name": "pv-ricplt-e2term-alpha",\r
+                               "labels": map[string]interface{}{\r
+                                       "type": "local",\r
+                               },\r
+                       },\r
+                       "spec": map[string]interface{}{\r
+                               "accessModes": []interface{}{\r
+                                       "ReadWriteOnce",\r
+                               },\r
+                               "capacity": map[string]interface{}{\r
+                                       "storage": "100Mi",\r
+                               },\r
+                               "hostPath": map[string]interface{}{\r
+                                       "path": "/mnt/pv-ricplt-e2term-alpha",\r
+                               },\r
+                               "storageClassName": "local-storage",\r
+                       },\r
+               },\r
+       }\r
+\r
+       return []*unstructured.Unstructured{persistentVolume1, persistentVolume2}\r
 }\r

diff --git a/depRicKubernetesOperator/internal/controller/getPersistentVolumeClaim.go b/depRicKubernetesOperator/internal/controller/getPersistentVolumeClaim.go
index 9bab433..b4a7a2e 100644 (file)
--- a/depRicKubernetesOperator/internal/controller/getPersistentVolumeClaim.go
+++ b/depRicKubernetesOperator/internal/controller/getPersistentVolumeClaim.go
@@ -30,5 +30,27 @@ func GetPersistentVolumeClaim() []*corev1.PersistentVolumeClaim {
                        Namespace: "ricplt",\r
                },\r
        }\r
-       return []*corev1.PersistentVolumeClaim{persistentVolumeClaim1}\r
+       persistentVolumeClaim2 := &corev1.PersistentVolumeClaim{\r
+               ObjectMeta: metav1.ObjectMeta{\r
+                       Name: "pvc-ricplt-e2term-alpha",\r
+               },\r
+               Spec: corev1.PersistentVolumeClaimSpec{\r
+                       AccessModes: []corev1.PersistentVolumeAccessMode{\r
+\r
+                               corev1.PersistentVolumeAccessMode("ReadWriteOnce"),\r
+                       },\r
+                       Resources: corev1.ResourceRequirements{\r
+                               Requests: corev1.ResourceList{\r
+                                       "storage": resource.MustParse("100Mi"),\r
+                               },\r
+                       },\r
+                       StorageClassName: stringPtr("local-storage"),\r
+               },\r
+               TypeMeta: metav1.TypeMeta{\r
+                       APIVersion: "v1",\r
+                       Kind:       "PersistentVolumeClaim",\r
+               },\r
+       }\r
+\r
+       return []*corev1.PersistentVolumeClaim{persistentVolumeClaim1, persistentVolumeClaim2}\r
 }\r

diff --git a/depRicKubernetesOperator/internal/controller/getServices.go b/depRicKubernetesOperator/internal/controller/getServices.go
index 915463d..05247ef 100644 (file)
--- a/depRicKubernetesOperator/internal/controller/getServices.go
+++ b/depRicKubernetesOperator/internal/controller/getServices.go
@@ -339,5 +339,130 @@ func GetService() []*corev1.Service {
                },\r
        }\r
 \r
-       return []*corev1.Service{service1, service2, service3, service4,service5,service6,service8,service9 }\r
+       service10 := &corev1.Service{\r
+               ObjectMeta: metav1.ObjectMeta{\r
+                       Annotations: map[string]string{\r
+                               "prometheus.io/path":   "/metrics",\r
+                               "prometheus.io/port":   "8088",\r
+                               "prometheus.io/scrape": "true",\r
+                       },\r
+                       Labels: map[string]string{\r
+                               "heritage": "Helm",\r
+                               "release":  "release-name",\r
+                               "app":      "ricplt-e2term-alpha",\r
+                               "chart":    "e2term-3.0.0",\r
+                       },\r
+                       Name:      "service-ricplt-e2term-prometheus-alpha",\r
+                       Namespace: "ricplt",\r
+               },\r
+               Spec: corev1.ServiceSpec{\r
+                       Ports: []corev1.ServicePort{\r
+\r
+                               corev1.ServicePort{\r
+                                       Name:     "prmts-alpha",\r
+                                       Port:     8088,\r
+                                       Protocol: corev1.Protocol("TCP"),\r
+                                       TargetPort: intstr.IntOrString{\r
+                                               StrVal: "prmts-alpha",\r
+                                               Type:   intstr.Type(1),\r
+                                       },\r
+                               },\r
+                       },\r
+                       PublishNotReadyAddresses: false,\r
+                       Selector: map[string]string{\r
+                               "release": "release-name",\r
+                               "app":     "ricplt-e2term-alpha",\r
+                       },\r
+                       Type: corev1.ServiceType("ClusterIP"),\r
+               },\r
+               TypeMeta: metav1.TypeMeta{\r
+                       APIVersion: "v1",\r
+                       Kind:       "Service",\r
+               },\r
+       }\r
+\r
+       service11 := &corev1.Service{\r
+               ObjectMeta: metav1.ObjectMeta{\r
+                       Labels: map[string]string{\r
+                               "chart":    "e2term-3.0.0",\r
+                               "heritage": "Helm",\r
+                               "release":  "release-name",\r
+                               "app":      "ricplt-e2term-alpha",\r
+                       },\r
+                       Name:      "service-ricplt-e2term-rmr-alpha",\r
+                       Namespace: "ricplt",\r
+               },\r
+               Spec: corev1.ServiceSpec{\r
+                       Ports: []corev1.ServicePort{\r
+\r
+                               corev1.ServicePort{\r
+                                       Name:     "rmrroute-alpha",\r
+                                       Port:     4561,\r
+                                       Protocol: corev1.Protocol("TCP"),\r
+                                       TargetPort: intstr.IntOrString{\r
+                                               StrVal: "rmrroute-alpha",\r
+                                               Type:   intstr.Type(1),\r
+                                       },\r
+                               },\r
+                               corev1.ServicePort{\r
+                                       TargetPort: intstr.IntOrString{\r
+                                               StrVal: "rmrdata-alpha",\r
+                                               Type:   intstr.Type(1),\r
+                                       },\r
+                                       Name:     "rmrdata-alpha",\r
+                                       Port:     38000,\r
+                                       Protocol: corev1.Protocol("TCP"),\r
+                               },\r
+                       },\r
+                       PublishNotReadyAddresses: false,\r
+                       Selector: map[string]string{\r
+                               "app":     "ricplt-e2term-alpha",\r
+                               "release": "release-name",\r
+                       },\r
+                       Type: corev1.ServiceType("ClusterIP"),\r
+               },\r
+               TypeMeta: metav1.TypeMeta{\r
+                       APIVersion: "v1",\r
+                       Kind:       "Service",\r
+               },\r
+       }\r
+\r
+       service12 := &corev1.Service{\r
+               ObjectMeta: metav1.ObjectMeta{\r
+                       Namespace: "ricplt",\r
+                       Labels: map[string]string{\r
+                               "app":      "ricplt-e2term-alpha",\r
+                               "chart":    "e2term-3.0.0",\r
+                               "heritage": "Helm",\r
+                               "release":  "release-name",\r
+                       },\r
+                       Name: "service-ricplt-e2term-sctp-alpha",\r
+               },\r
+               Spec: corev1.ServiceSpec{\r
+                       Ports: []corev1.ServicePort{\r
+\r
+                               corev1.ServicePort{\r
+                                       Name:     "sctp-alpha",\r
+                                       NodePort: 32222,\r
+                                       Port:     36422,\r
+                                       Protocol: corev1.Protocol("SCTP"),\r
+                                       TargetPort: intstr.IntOrString{\r
+                                               IntVal: 36422,\r
+                                       },\r
+                               },\r
+                       },\r
+                       PublishNotReadyAddresses: false,\r
+                       Selector: map[string]string{\r
+                               "app":     "ricplt-e2term-alpha",\r
+                               "release": "release-name",\r
+                       },\r
+                       Type: corev1.ServiceType("NodePort"),\r
+               },\r
+               TypeMeta: metav1.TypeMeta{\r
+                       APIVersion: "v1",\r
+                       Kind:       "Service",\r
+               },\r
+       }\r
+\r
+       return []*corev1.Service{service1, service2, service3, service4,service5,service6,service8,service9,service10,service11,service12}\r
 }\r