From e691473b686c832d7f1e2158bd5364e14f6447b3 Mon Sep 17 00:00:00 2001 From: RehanRaza Date: Thu, 4 Feb 2021 13:17:31 +0100 Subject: [PATCH] Add helm chart for nonrtric-gateway Change-Id: I7d7c1c2ae55540dff694bb91438a5da752d32a47 Issue-ID: NONRTRIC-428 Signed-off-by: RehanRaza --- bin/deploy-nonrtric | 2 +- nonrtric/RECIPE_EXAMPLE/example_recipe.yaml | 31 +++++++--- nonrtric/bin/install | 2 +- nonrtric/bin/uninstall | 2 +- .../helm/enrichmentservice/templates/service.yaml | 4 +- nonrtric/helm/enrichmentservice/values.yaml | 2 - nonrtric/helm/nonrtric/requirements.yaml | 3 + nonrtric/helm/nonrtricgateway/.helmignore | 22 ++++++++ nonrtric/helm/nonrtricgateway/Chart.yaml | 21 +++++++ nonrtric/helm/nonrtricgateway/requirements.yaml | 20 +++++++ .../resources/config/application.yaml | 52 +++++++++++++++++ .../helm/nonrtricgateway/templates/configmap.yaml | 29 ++++++++++ .../helm/nonrtricgateway/templates/deployment.yaml | 66 ++++++++++++++++++++++ .../helm/nonrtricgateway/templates/service.yaml | 37 ++++++++++++ nonrtric/helm/nonrtricgateway/values.yaml | 37 ++++++++++++ .../policymanagementservice/templates/service.yaml | 4 +- nonrtric/helm/policymanagementservice/values.yaml | 6 +- .../rappcatalogueservice/templates/service.yaml | 4 +- nonrtric/helm/rappcatalogueservice/values.yaml | 2 - .../nonrtric-common/templates/_nonrtricgateway.tpl | 24 ++++++++ 20 files changed, 342 insertions(+), 28 deletions(-) create mode 100644 nonrtric/helm/nonrtricgateway/.helmignore create mode 100644 nonrtric/helm/nonrtricgateway/Chart.yaml create mode 100644 nonrtric/helm/nonrtricgateway/requirements.yaml create mode 100644 nonrtric/helm/nonrtricgateway/resources/config/application.yaml create mode 100644 nonrtric/helm/nonrtricgateway/templates/configmap.yaml create mode 100644 nonrtric/helm/nonrtricgateway/templates/deployment.yaml create mode 100644 nonrtric/helm/nonrtricgateway/templates/service.yaml create mode 100644 nonrtric/helm/nonrtricgateway/values.yaml create mode 100644 ric-common/Common-Template/helm/nonrtric-common/templates/_nonrtricgateway.tpl diff --git a/bin/deploy-nonrtric b/bin/deploy-nonrtric index cad783f1..dbaaea39 100755 --- a/bin/deploy-nonrtric +++ b/bin/deploy-nonrtric @@ -85,7 +85,7 @@ fi $ROOT_DIR/prepare-common-templates -COMPONENTS=${LIST_OF_COMPONENTS:-"controlpanel a1controller a1simulator policymanagementservice enrichmentservice rappcatalogueservice"} +COMPONENTS=${LIST_OF_COMPONENTS:-"controlpanel a1controller a1simulator policymanagementservice enrichmentservice rappcatalogueservice nonrtricgateway"} echo "Packaging NONRTRIC components [$COMPONENTS]" # Package common templates and serve it using Helm local repo HELM_LOCAL_REPO="" diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml index 51adbd6f..a746270a 100644 --- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml +++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml @@ -114,19 +114,17 @@ policymanagementservice: policymanagementservice: imagePullPolicy: IfNotPresent image: - registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' + registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc' name: nonrtric-policy-agent - tag: 2.1.0 + tag: 2.2.0 service: allowHttp: true httpName: http internalPort1: 9080 targetPort1: 8081 - externalPort1: 30093 httpsName: https internalPort2: 9081 targetPort2: 8433 - externalPort2: 30094 liveness: initialDelaySeconds: 20 periodSeconds: 10 @@ -208,6 +206,7 @@ policymanagementservice: } } } + enrichmentservice: enrichmentservice: imagePullPolicy: IfNotPresent @@ -220,11 +219,9 @@ enrichmentservice: httpName: http internalPort1: 9082 targetPort1: 8083 - externalPort1: 30095 httpsName: https internalPort2: 9083 targetPort2: 8434 - externalPort2: 30096 liveness: initialDelaySeconds: 20 periodSeconds: 10 @@ -238,6 +235,7 @@ enrichmentservice: size: 2Gi mountPath: /dockerdata-nfs mountSubPath: nonrtric/enrichmentservice + rappcatalogueservice: rappcatalogueservice: imagePullPolicy: IfNotPresent @@ -250,14 +248,31 @@ rappcatalogueservice: httpName: http internalPort1: 9085 targetPort1: 8080 - externalPort1: 30097 httpsName: https internalPort2: 9086 targetPort2: 8433 - externalPort2: 30098 liveness: initialDelaySeconds: 20 periodSeconds: 10 readiness: initialDelaySeconds: 20 periodSeconds: 10 + +nonrtricgateway: + nonrtricgateway: + imagePullPolicy: IfNotPresent + image: + registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc' + name: nonrtric-gateway + tag: 0.0.1 + service: + httpName: http + internalPort1: 9090 + targetPort1: 9090 + externalPort1: 30093 + liveness: + initialDelaySeconds: 20 + periodSeconds: 10 + readiness: + initialDelaySeconds: 20 + periodSeconds: 10 \ No newline at end of file diff --git a/nonrtric/bin/install b/nonrtric/bin/install index 80088336..608556df 100755 --- a/nonrtric/bin/install +++ b/nonrtric/bin/install @@ -52,7 +52,7 @@ NAMESPACE_BLOCK=$(cat $OVERRIDEYAML | awk '/^ namespace:/{getline; while ($0 ~ NONRTRIC_NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *nonrtric:/{print $2}') RELEASE_PREFIX=$(echo "$COMMON_BLOCK" | awk '/^ *releasePrefix:/{print $2}') PARENT_CHART=$(cat $OVERRIDEYAML | awk '/^ *component:/{print $2}') -COMPONENTS=${LIST_OF_COMPONENTS:-"controlpanel a1controller a1simulator policymanagementservice enrichmentservice nonrtric rappcatalogueservice"} +COMPONENTS=${LIST_OF_COMPONENTS:-"controlpanel a1controller a1simulator policymanagementservice enrichmentservice nonrtric rappcatalogueservice nonrtricgateway"} echo "Chart name- $PARENT_CHART" if ! kubectl get ns ${NONRTRIC_NAMESPACE:-nonrtric}> /dev/null 2>&1; then diff --git a/nonrtric/bin/uninstall b/nonrtric/bin/uninstall index 27eefa5b..d0549f57 100755 --- a/nonrtric/bin/uninstall +++ b/nonrtric/bin/uninstall @@ -16,7 +16,7 @@ ################################################################################ -COMPONENTS="controlpanel a1controller a1simulator policymanagementservice enrichmentservice rappcatalogueservice" +COMPONENTS="controlpanel a1controller a1simulator policymanagementservice enrichmentservice rappcatalogueservice nonrtricgateway" 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/helm/enrichmentservice/templates/service.yaml b/nonrtric/helm/enrichmentservice/templates/service.yaml index 2fb216db..0b2a110c 100644 --- a/nonrtric/helm/enrichmentservice/templates/service.yaml +++ b/nonrtric/helm/enrichmentservice/templates/service.yaml @@ -30,15 +30,13 @@ spec: - name: {{ index .Values.enrichmentservice.service.httpName }} port: {{ .Values.enrichmentservice.service.internalPort1 }} targetPort: {{ .Values.enrichmentservice.service.targetPort1 }} - nodePort: {{ .Values.enrichmentservice.service.externalPort1 }} protocol: TCP {{- end }} - name: {{ index .Values.enrichmentservice.service.httpsName }} port: {{ .Values.enrichmentservice.service.internalPort2 }} targetPort: {{ .Values.enrichmentservice.service.targetPort2 }} - nodePort: {{ .Values.enrichmentservice.service.externalPort2 }} protocol: TCP selector: app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.enrichmentservice" . }} release: {{ .Release.Name }} - type: NodePort + type: ClusterIP diff --git a/nonrtric/helm/enrichmentservice/values.yaml b/nonrtric/helm/enrichmentservice/values.yaml index b64e3aca..7e1ed199 100644 --- a/nonrtric/helm/enrichmentservice/values.yaml +++ b/nonrtric/helm/enrichmentservice/values.yaml @@ -29,11 +29,9 @@ enrichmentservice: httpName: http internalPort1: 9082 targetPort1: 8083 - externalPort1: 30095 httpsName: https internalPort2: 9083 targetPort2: 8434 - externalPort2: 30096 liveness: initialDelaySeconds: 20 periodSeconds: 10 diff --git a/nonrtric/helm/nonrtric/requirements.yaml b/nonrtric/helm/nonrtric/requirements.yaml index 138f67c6..2a9e5129 100644 --- a/nonrtric/helm/nonrtric/requirements.yaml +++ b/nonrtric/helm/nonrtric/requirements.yaml @@ -36,4 +36,7 @@ dependencies: - name: rappcatalogueservice version: ~1.0.0 repository: "@local" + - name: nonrtricgateway + version: ~1.0.0 + repository: "@local" diff --git a/nonrtric/helm/nonrtricgateway/.helmignore b/nonrtric/helm/nonrtricgateway/.helmignore new file mode 100644 index 00000000..50af0317 --- /dev/null +++ b/nonrtric/helm/nonrtricgateway/.helmignore @@ -0,0 +1,22 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/nonrtric/helm/nonrtricgateway/Chart.yaml b/nonrtric/helm/nonrtricgateway/Chart.yaml new file mode 100644 index 00000000..c989221e --- /dev/null +++ b/nonrtric/helm/nonrtricgateway/Chart.yaml @@ -0,0 +1,21 @@ +################################################################################ +# 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: v1 +appVersion: "0.0.1" +description: A Helm chart for Nonrtric Gateway +name: nonrtricgateway +version: 1.0.0 diff --git a/nonrtric/helm/nonrtricgateway/requirements.yaml b/nonrtric/helm/nonrtricgateway/requirements.yaml new file mode 100644 index 00000000..69b4db6d --- /dev/null +++ b/nonrtric/helm/nonrtricgateway/requirements.yaml @@ -0,0 +1,20 @@ +################################################################################ +# 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. # +################################################################################ + +dependencies: + - name: nonrtric-common + version: ^2.0.0 + repository: "@local" diff --git a/nonrtric/helm/nonrtricgateway/resources/config/application.yaml b/nonrtric/helm/nonrtricgateway/resources/config/application.yaml new file mode 100644 index 00000000..1a6c1bf1 --- /dev/null +++ b/nonrtric/helm/nonrtricgateway/resources/config/application.yaml @@ -0,0 +1,52 @@ +################################################################################ +# 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. # +################################################################################ + +server: + port: 9090 +spring: + cloud: + gateway: + httpclient: + ssl: + useInsecureTrustManager: true + wiretap: true + httpserver: + wiretap: true + routes: + - id: a1-policy + uri: https://policymanagementservice:9081 + predicates: + - Path=/a1-policy/** + - id: ei-producer + uri: https://enrichmentservice:9083 + predicates: + - Path=/ei-producer/** +management: + endpoint: + gateway: + enabled: true + endpoints: + web: + exposure: + include: "gateway,loggers,logfile,health,info,metrics,threaddump,heapdump" +logging: + level: + ROOT: ERROR + org.springframework: ERROR + org.springframework.cloud.gateway: INFO + reactor.netty: INFO + file: + name: /var/log/nonrtric-gateway/application.log \ No newline at end of file diff --git a/nonrtric/helm/nonrtricgateway/templates/configmap.yaml b/nonrtric/helm/nonrtricgateway/templates/configmap.yaml new file mode 100644 index 00000000..d391d1ee --- /dev/null +++ b/nonrtric/helm/nonrtricgateway/templates/configmap.yaml @@ -0,0 +1,29 @@ +################################################################################ +# 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: v1 +kind: ConfigMap +metadata: + name: {{ include "common.name.nonrtricgateway" . }}-configmap + namespace: {{ include "common.namespace.nonrtric" . }} + labels: + app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.nonrtricgateway" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +data: +{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} \ No newline at end of file diff --git a/nonrtric/helm/nonrtricgateway/templates/deployment.yaml b/nonrtric/helm/nonrtricgateway/templates/deployment.yaml new file mode 100644 index 00000000..bd742a9a --- /dev/null +++ b/nonrtric/helm/nonrtricgateway/templates/deployment.yaml @@ -0,0 +1,66 @@ +################################################################################ +# 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. # +################################################################################ + +kind: Deployment +apiVersion: apps/v1 +metadata: + name: {{ include "common.name.nonrtricgateway" . }} + namespace: {{ include "common.namespace.nonrtric" . }} + generation: 1 + labels: + app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.nonrtricgateway" . }} + 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.nonrtricgateway" . }} + release: {{ .Release.Name }} + template: + metadata: + labels: + app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.nonrtricgateway" . }} + release: {{ .Release.Name }} + spec: + hostname: {{ include "common.name.nonrtricgateway" . }} + containers: + - name: {{ include "common.container.nonrtricgateway" . }} + image: {{ .Values.nonrtricgateway.image.registry }}/{{ .Values.nonrtricgateway.image.name }}:{{ .Values.nonrtricgateway.image.tag }} + imagePullPolicy: {{ .Values.nonrtricgateway.imagePullPolicy }} + ports: + - containerPort: {{ .Values.nonrtricgateway.service.targetPort1 }} + protocol: TCP + readinessProbe: + tcpSocket: + port: {{ .Values.nonrtricgateway.service.targetPort1 }} + initialDelaySeconds: {{ .Values.nonrtricgateway.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.nonrtricgateway.liveness.periodSeconds }} + livenessProbe: + tcpSocket: + port: {{ .Values.nonrtricgateway.service.targetPort1 }} + initialDelaySeconds: {{ .Values.nonrtricgateway.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.nonrtricgateway.liveness.periodSeconds }} + volumeMounts: + - name: {{ include "common.name.nonrtricgateway" . }}-config + mountPath: /opt/app/nonrtric-gateway/config + volumes: + - name: {{ include "common.name.nonrtricgateway" . }}-config + configMap: + name: {{ include "common.name.nonrtricgateway" . }}-configmap \ No newline at end of file diff --git a/nonrtric/helm/nonrtricgateway/templates/service.yaml b/nonrtric/helm/nonrtricgateway/templates/service.yaml new file mode 100644 index 00000000..085c0e65 --- /dev/null +++ b/nonrtric/helm/nonrtricgateway/templates/service.yaml @@ -0,0 +1,37 @@ +################################################################################ +# 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. # +################################################################################ + +kind: Service +apiVersion: v1 +metadata: + name: {{ include "common.name.nonrtricgateway" . }} + namespace: {{ include "common.namespace.nonrtric" . }} + labels: + app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.nonrtricgateway" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + ports: + - name: {{ index .Values.nonrtricgateway.service.httpName }} + port: {{ .Values.nonrtricgateway.service.internalPort1 }} + targetPort: {{ .Values.nonrtricgateway.service.targetPort1 }} + nodePort: {{ .Values.nonrtricgateway.service.externalPort1 }} + protocol: TCP + selector: + app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.nonrtricgateway" . }} + release: {{ .Release.Name }} + type: NodePort diff --git a/nonrtric/helm/nonrtricgateway/values.yaml b/nonrtric/helm/nonrtricgateway/values.yaml new file mode 100644 index 00000000..0009dfa5 --- /dev/null +++ b/nonrtric/helm/nonrtricgateway/values.yaml @@ -0,0 +1,37 @@ +################################################################################ +# 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. # +################################################################################ + +# Default values for Gateway application. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +nonrtricgateway: + imagePullPolicy: IfNotPresent + image: + registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc' + name: nonrtric-gateway + tag: 0.0.1 + service: + httpName: http + internalPort1: 9090 + targetPort1: 9090 + externalPort1: 30093 + liveness: + initialDelaySeconds: 20 + periodSeconds: 10 + readiness: + initialDelaySeconds: 20 + periodSeconds: 10 \ No newline at end of file diff --git a/nonrtric/helm/policymanagementservice/templates/service.yaml b/nonrtric/helm/policymanagementservice/templates/service.yaml index 23586928..6d820e21 100644 --- a/nonrtric/helm/policymanagementservice/templates/service.yaml +++ b/nonrtric/helm/policymanagementservice/templates/service.yaml @@ -30,15 +30,13 @@ spec: - name: {{ index .Values.policymanagementservice.service.httpName }} port: {{ .Values.policymanagementservice.service.internalPort1 }} targetPort: {{ .Values.policymanagementservice.service.targetPort1 }} - nodePort: {{ .Values.policymanagementservice.service.externalPort1 }} protocol: TCP {{- end }} - name: {{ index .Values.policymanagementservice.service.httpsName }} port: {{ .Values.policymanagementservice.service.internalPort2 }} targetPort: {{ .Values.policymanagementservice.service.targetPort2 }} - nodePort: {{ .Values.policymanagementservice.service.externalPort2 }} protocol: TCP selector: app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.policymanagementservice" . }} release: {{ .Release.Name }} - type: NodePort + type: ClusterIP diff --git a/nonrtric/helm/policymanagementservice/values.yaml b/nonrtric/helm/policymanagementservice/values.yaml index 3e6cc52e..ae26644f 100644 --- a/nonrtric/helm/policymanagementservice/values.yaml +++ b/nonrtric/helm/policymanagementservice/values.yaml @@ -21,19 +21,17 @@ policymanagementservice: imagePullPolicy: IfNotPresent image: - registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' + registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc' name: nonrtric-policy-agent - tag: 2.1.0 + tag: 2.2.0 service: allowHttp: true httpName: http internalPort1: 9080 targetPort1: 8081 - externalPort1: 30093 httpsName: https internalPort2: 9081 targetPort2: 8433 - externalPort2: 30094 liveness: initialDelaySeconds: 20 periodSeconds: 10 diff --git a/nonrtric/helm/rappcatalogueservice/templates/service.yaml b/nonrtric/helm/rappcatalogueservice/templates/service.yaml index 2aae7d64..2c056eb5 100644 --- a/nonrtric/helm/rappcatalogueservice/templates/service.yaml +++ b/nonrtric/helm/rappcatalogueservice/templates/service.yaml @@ -30,15 +30,13 @@ spec: - name: {{ index .Values.rappcatalogueservice.service.httpName }} port: {{ .Values.rappcatalogueservice.service.internalPort1 }} targetPort: {{ .Values.rappcatalogueservice.service.targetPort1 }} - nodePort: {{ .Values.rappcatalogueservice.service.externalPort1 }} protocol: TCP {{- end }} - name: {{ index .Values.rappcatalogueservice.service.httpsName }} port: {{ .Values.rappcatalogueservice.service.internalPort2 }} targetPort: {{ .Values.rappcatalogueservice.service.targetPort2 }} - nodePort: {{ .Values.rappcatalogueservice.service.externalPort2 }} protocol: TCP selector: app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappcatalogueservice" . }} release: {{ .Release.Name }} - type: NodePort + type: ClusterIP diff --git a/nonrtric/helm/rappcatalogueservice/values.yaml b/nonrtric/helm/rappcatalogueservice/values.yaml index e21d2c54..34af14d5 100644 --- a/nonrtric/helm/rappcatalogueservice/values.yaml +++ b/nonrtric/helm/rappcatalogueservice/values.yaml @@ -29,11 +29,9 @@ rappcatalogueservice: httpName: http internalPort1: 9080 targetPort1: 8080 - externalPort1: 30093 httpsName: https internalPort2: 9081 targetPort2: 8433 - externalPort2: 30094 liveness: initialDelaySeconds: 20 periodSeconds: 10 diff --git a/ric-common/Common-Template/helm/nonrtric-common/templates/_nonrtricgateway.tpl b/ric-common/Common-Template/helm/nonrtric-common/templates/_nonrtricgateway.tpl new file mode 100644 index 00000000..0d1435f2 --- /dev/null +++ b/ric-common/Common-Template/helm/nonrtric-common/templates/_nonrtricgateway.tpl @@ -0,0 +1,24 @@ +################################################################################ +# 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. # +################################################################################ + +{{- define "common.name.nonrtricgateway" -}} + {{- printf "nonrtricgateway" -}} +{{- end -}} + +{{- define "common.container.nonrtricgateway" -}} + {{- $name := ( include "common.name.nonrtricgateway" . ) -}} + {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} -- 2.16.6