From: John Keeney Date: Fri, 16 Dec 2022 18:03:36 +0000 (+0000) Subject: Merge "Add Rapp Enhanced Catalogue helm charts" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=bbe8aec7d79b1dfa4b8d513b0fefd7c42691e653;hp=d1457ddedb21c4f46e20016c56e4c4cd9e8666c2;p=it%2Fdep.git Merge "Add Rapp Enhanced Catalogue helm charts" --- diff --git a/bin/deploy-nonrtric b/bin/deploy-nonrtric index df12178b..baaa1aaa 100755 --- a/bin/deploy-nonrtric +++ b/bin/deploy-nonrtric @@ -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 diff --git a/bin/undeploy-nonrtric b/bin/undeploy-nonrtric index 7015b244..162bf6e6 100755 --- a/bin/undeploy-nonrtric +++ b/bin/undeploy-nonrtric @@ -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 diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml index eb1d0a6b..e566e910 100644 --- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml +++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml @@ -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 diff --git a/nonrtric/helm/nonrtric/Chart.yaml b/nonrtric/helm/nonrtric/Chart.yaml index 4758e5fc..2cb1aaf7 100644 --- a/nonrtric/helm/nonrtric/Chart.yaml +++ b/nonrtric/helm/nonrtric/Chart.yaml @@ -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" diff --git a/nonrtric/helm/nonrtric/values.yaml b/nonrtric/helm/nonrtric/values.yaml index c6e857cf..c8206996 100644 --- a/nonrtric/helm/nonrtric/values.yaml +++ b/nonrtric/helm/nonrtric/values.yaml @@ -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 index 00000000..2695c8cf --- /dev/null +++ b/nonrtric/helm/rappcatalogueenhancedservice/Chart.yaml @@ -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 index 00000000..25a3e897 --- /dev/null +++ b/nonrtric/helm/rappcatalogueenhancedservice/requirements.yaml @@ -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 index 00000000..d55fcdcc --- /dev/null +++ b/nonrtric/helm/rappcatalogueenhancedservice/templates/deployment.yaml @@ -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 index 00000000..d1ba4820 --- /dev/null +++ b/nonrtric/helm/rappcatalogueenhancedservice/templates/service.yaml @@ -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 index 00000000..ad38a305 --- /dev/null +++ b/nonrtric/helm/rappcatalogueenhancedservice/values.yaml @@ -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 index 00000000..eb480131 --- /dev/null +++ b/ric-common/Common-Template/helm/nonrtric-common/templates/_rappcatalogueenhancedservice.tpl @@ -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 -}}