Add Rapp Enhanced Catalogue helm charts 83/10183/3
authoraravind.est <aravindhan.a@est.tech>
Fri, 16 Dec 2022 14:59:58 +0000 (14:59 +0000)
committeraravind.est <aravindhan.a@est.tech>
Fri, 16 Dec 2022 17:31:58 +0000 (17:31 +0000)
Issue-ID: NONRTRIC-819
Signed-off-by: aravind.est <aravindhan.a@est.tech>
Change-Id: I8ef948b0613cdcefd2bf8c7b8a2c865e182656ea

bin/deploy-nonrtric
bin/undeploy-nonrtric
nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
nonrtric/helm/nonrtric/Chart.yaml
nonrtric/helm/nonrtric/values.yaml
nonrtric/helm/rappcatalogueenhancedservice/Chart.yaml [new file with mode: 0644]
nonrtric/helm/rappcatalogueenhancedservice/requirements.yaml [new file with mode: 0644]
nonrtric/helm/rappcatalogueenhancedservice/templates/deployment.yaml [new file with mode: 0644]
nonrtric/helm/rappcatalogueenhancedservice/templates/service.yaml [new file with mode: 0644]
nonrtric/helm/rappcatalogueenhancedservice/values.yaml [new file with mode: 0644]
ric-common/Common-Template/helm/nonrtric-common/templates/_rappcatalogueenhancedservice.tpl [new file with mode: 0644]

index df12178..baaa1aa 100755 (executable)
@@ -106,7 +106,7 @@ rm $HELM_LOCAL_REPO/*
 helm repo remove local
 $ROOT_DIR/prepare-common-templates
 
-COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager orufhrecovery ransliceassurance capifcore"
+COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice rappcatalogueenhancedservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager orufhrecovery ransliceassurance capifcore"
 for component in $COMPONENTS; do
     echo "Packaging NONRTRIC component [$component]"
     helm dep up $ROOT_DIR/../nonrtric/helm/$component
index 7015b24..162bf6e 100755 (executable)
@@ -17,8 +17,7 @@
 
 # This script to undeploy the NONRTRIC
 
-
-COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager orufhrecovery ransliceassurance capifcore"
+COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice rappcatalogueenhancedservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager orufhrecovery ransliceassurance capifcore"
 RECIPE_NAMESPACE=$(kubectl get cm --all-namespaces | grep nonrtric-recipe | awk '{print $1}')
 kubectl get configmap  -n $RECIPE_NAMESPACE nonrtric-recipe  -o jsonpath='{.data.recipe}' > /tmp/recipe.yaml
 
index f3c5c8d..29dac37 100644 (file)
@@ -218,6 +218,25 @@ rappcatalogueservice:
       initialDelaySeconds: 20
       periodSeconds: 10
 
+rappcatalogueenhancedservice:
+  rappcatalogueenhancedservice:
+    imagePullPolicy: Always
+    image:
+      registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
+      name: nonrtric-plt-rappcatalogue-enhanced
+      tag: 1.0.0
+    service:
+      allowHttp: true
+      httpName: http
+      internalPort1: 9696
+      targetPort1: 9696
+    liveness:
+      initialDelaySeconds: 20
+      periodSeconds: 10
+    readiness:
+      initialDelaySeconds: 20
+      periodSeconds: 10
+
 nonrtricgateway:
   nonrtricgateway:
     imagePullPolicy: Always
index 4758e5f..2cb1aaf 100644 (file)
@@ -55,6 +55,11 @@ dependencies:
     repository: "@local"
     condition: nonrtric.installRappcatalogueservice
 
+  - name: rappcatalogueenhancedservice
+    version: ~1.0.0
+    repository: "@local"
+    condition: nonrtric.installRappcatalogueenhancedservice
+
   - name: nonrtricgateway
     version: ~1.0.0
     repository: "@local"
index c6e857c..c820699 100644 (file)
@@ -21,6 +21,7 @@ nonrtric:
   installControlpanel: true
   installInformationservice: true
   installRappcatalogueservice: true
+  installRappcatalogueEnhancedservice: true
   installNonrtricgateway: true
   installDmaapadapterservice: true
   installDmaapmediatorservice: true
diff --git a/nonrtric/helm/rappcatalogueenhancedservice/Chart.yaml b/nonrtric/helm/rappcatalogueenhancedservice/Chart.yaml
new file mode 100644 (file)
index 0000000..2695c8c
--- /dev/null
@@ -0,0 +1,21 @@
+################################################################################
+#   Copyright (c) 2022 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: v1
+appVersion: "2.0.0"
+description: A Helm chart for rAPP Catalogue Enhanced Service
+name: rappcatalogueenhancedservice
+version: 1.0.0
diff --git a/nonrtric/helm/rappcatalogueenhancedservice/requirements.yaml b/nonrtric/helm/rappcatalogueenhancedservice/requirements.yaml
new file mode 100644 (file)
index 0000000..25a3e89
--- /dev/null
@@ -0,0 +1,20 @@
+################################################################################
+#   Copyright (c) 2022 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.                                             #
+################################################################################
+
+dependencies:
+  - name: nonrtric-common
+    version: ^2.0.0
+    repository: "@local"
diff --git a/nonrtric/helm/rappcatalogueenhancedservice/templates/deployment.yaml b/nonrtric/helm/rappcatalogueenhancedservice/templates/deployment.yaml
new file mode 100644 (file)
index 0000000..d55fcdc
--- /dev/null
@@ -0,0 +1,59 @@
+################################################################################
+#   Copyright (c) 2022 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.                                             #
+################################################################################
+
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: {{ include "common.name.rappcatalogueenhancedservice" . }}
+  namespace: {{ include "common.namespace.nonrtric" . }}
+  generation: 1
+  labels:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappcatalogueenhancedservice" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  annotations:
+    deployment.kubernetes.io/revision: '1'
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappcatalogueenhancedservice" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappcatalogueenhancedservice" . }}
+        release: {{ .Release.Name }}
+    spec:
+      hostname: {{ include "common.name.rappcatalogueenhancedservice" . }}
+      containers:
+      - name: {{ include "common.container.rappcatalogueenhancedservice" . }}
+        image: {{ .Values.rappcatalogueenhancedservice.image.registry }}/{{ .Values.rappcatalogueenhancedservice.image.name }}:{{ .Values.rappcatalogueenhancedservice.image.tag }}
+        imagePullPolicy: {{ .Values.rappcatalogueenhancedservice.imagePullPolicy }}
+        ports:
+        - containerPort: {{ .Values.rappcatalogueenhancedservice.service.targetPort }}
+          protocol: TCP
+        readinessProbe:
+          tcpSocket:
+            port: {{ .Values.rappcatalogueenhancedservice.service.targetPort }}
+          initialDelaySeconds: {{ .Values.rappcatalogueenhancedservice.liveness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.rappcatalogueenhancedservice.liveness.periodSeconds }}
+        livenessProbe:
+          tcpSocket:
+            port: {{ .Values.rappcatalogueenhancedservice.service.targetPort }}
+          initialDelaySeconds: {{ .Values.rappcatalogueenhancedservice.liveness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.rappcatalogueenhancedservice.liveness.periodSeconds }}
diff --git a/nonrtric/helm/rappcatalogueenhancedservice/templates/service.yaml b/nonrtric/helm/rappcatalogueenhancedservice/templates/service.yaml
new file mode 100644 (file)
index 0000000..d1ba482
--- /dev/null
@@ -0,0 +1,38 @@
+################################################################################
+#   Copyright (c) 2022 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.                                             #
+################################################################################
+
+kind: Service
+apiVersion: v1
+metadata:
+  name: {{ include "common.name.rappcatalogueenhancedservice" . }}
+  namespace: {{ include "common.namespace.nonrtric" . }}
+  labels:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappcatalogueenhancedservice" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  ports:
+    {{if eq .Values.rappcatalogueenhancedservice.service.allowHttp true -}}
+    - name: {{ index .Values.rappcatalogueenhancedservice.service.httpName }}
+      port: {{ .Values.rappcatalogueenhancedservice.service.internalPort }}
+      targetPort: {{ .Values.rappcatalogueenhancedservice.service.targetPort }}
+      protocol: TCP
+    {{- end }}
+  selector:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappcatalogueenhancedservice" . }}
+    release: {{ .Release.Name }}
+  type: ClusterIP
diff --git a/nonrtric/helm/rappcatalogueenhancedservice/values.yaml b/nonrtric/helm/rappcatalogueenhancedservice/values.yaml
new file mode 100644 (file)
index 0000000..ad38a30
--- /dev/null
@@ -0,0 +1,37 @@
+################################################################################
+#   Copyright (c) 2022 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.                                             #
+################################################################################
+
+# Default values for rAPP Catalogue Enhanced Service.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+rappcatalogueenhancedservice:
+  imagePullPolicy: IfNotPresent
+  image:
+    registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
+    name: nonrtric-plt-rappcatalogue-enhanced
+    tag: 1.0.0
+  service:
+    allowHttp: true
+    httpName: http
+    internalPort: 9696
+    targetPort: 9696
+  liveness:
+    initialDelaySeconds: 20
+    periodSeconds: 10
+  readiness:
+    initialDelaySeconds: 20
+    periodSeconds: 10
diff --git a/ric-common/Common-Template/helm/nonrtric-common/templates/_rappcatalogueenhancedservice.tpl b/ric-common/Common-Template/helm/nonrtric-common/templates/_rappcatalogueenhancedservice.tpl
new file mode 100644 (file)
index 0000000..eb48013
--- /dev/null
@@ -0,0 +1,24 @@
+################################################################################
+#   Copyright (c) 2020 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.                                             #
+################################################################################
+
+{{- define "common.name.rappcatalogueenhancedservice" -}}
+  {{- printf "rappcatalogueenhancedservice" -}}
+{{- end -}}
+
+{{- define "common.container.rappcatalogueenhancedservice" -}}
+  {{- $name := ( include "common.name.rappcatalogueenhancedservice" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}