From: Zhe Huang Date: Mon, 29 Jul 2019 18:19:05 +0000 (+0000) Subject: Merge "Drop the submodule nexus-repository-helm" X-Git-Tag: 0.0.2~46 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=b0d610ef0ba334c963cac6e2f3423657fda803dd;hp=b70591a65e15f2cc6019d5fb401e1a91aa967b29;p=it%2Fdep.git Merge "Drop the submodule nexus-repository-helm" --- diff --git a/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE index f1a62904..68c8e741 100644 --- a/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE +++ b/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE @@ -70,6 +70,10 @@ dashboard: mock: rannames: "ABCD123456, EFGH123456" -ext: - ip: - 192.168.130.110 +extsvcaux: + ricip: + # The ip address of the ric cluster ingress controller + + auxip: + # The ip address of the aux cluster ingress controller + diff --git a/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE index cf40fa51..d883d058 100644 --- a/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE +++ b/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE @@ -131,7 +131,10 @@ submgr: tag: v0.1.0 # the service for redirecting to AUX cluster -ext: - ip: +extsvcplt: + auxip: # The ip address of the aux cluster ingress controller - IP_ADDRESS + + ricip: + # The ip address of the ric cluster ingress controller + diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml index e6358c56..b2ec7877 100644 --- a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml @@ -25,7 +25,7 @@ data: # this key becomes the filename when mounted application.properties: | # appconfig.yaml - server.port = {{ .Values.dashboard.service.http.containerPort }} + server.port = {{ include "common.serviceport.dashboard.container" . }} a1med.url.prefix = {{ include "dashboard.prefix.a1mediator" . }} a1med.url.suffix = {{ .Values.dashboard.properties.a1med.url.suffix }} anrxapp.url.prefix = {{ include "dashboard.prefix.anrxapp" . }} diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml index adacef25..efe01062 100644 --- a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml @@ -46,7 +46,7 @@ spec: imagePullPolicy: {{ include "common.pullPolicy" . }} ports: - name: http - containerPort: {{ .Values.dashboard.service.http.containerPort }} + containerPort: {{ include "common.serviceport.dashboard.container" . }} protocol: TCP volumeMounts: - name: application-config diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/service.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/service.yaml index b35e4085..88dc203a 100644 --- a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/service.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/service.yaml @@ -28,10 +28,10 @@ metadata: spec: type: NodePort ports: - - port: {{ .Values.dashboard.service.http.containerPort }} - nodePort: {{ .Values.dashboard.service.http.nodeport }} - targetPort: http - protocol: TCP + - port: {{ include "common.serviceport.dashboard.container" . }} + nodePort: {{ include "common.serviceport.dashboard.http" . }} + protocol: "TCP" + targetPort: "http" selector: app: {{ include "common.namespace.aux" . }}-{{ include "common.name.dashboard" . }} release: {{ .Release.Name }} diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml index 77a3a5cd..45dc0a11 100644 --- a/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml @@ -26,11 +26,12 @@ dashboard: name: ric-dashboard tag: 1.2.0 replicaCount: 1 - service: - http: - nodeport: 30080 - # Tomcat listens here - containerPort: 8080 + + # Service ports are now defined in + # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file. + # If need to change a service port, make the code change necessary, then + # update the _ports.tpl file with the new port number. + # config URLs must be specified at deployment properties: # The URL prefixes use K8S/Kong service names diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong-aux/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/kong-aux/values.yaml index f55709b3..02d97197 100644 --- a/ric-aux/80-Auxiliary-Functions/helm/kong-aux/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/kong-aux/values.yaml @@ -16,4 +16,9 @@ kong: http: nodePort: 32080 tls: - nodePort: 32443 \ No newline at end of file + nodePort: 32443 + # These port numbers MUST matche with what's in + # ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl file. + # If need to change a proxy port here, do not forget to update the + # _ingresscontroller.tpl file with the new port number. + diff --git a/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ingress-ves.yaml b/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ingress-ves.yaml index 7a91f7d4..6db96ded 100644 --- a/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ingress-ves.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ingress-ves.yaml @@ -9,4 +9,4 @@ spec: - path: /vescollector backend: serviceName: xdcae-ves-collector - servicePort: 8080 + servicePort: {{ include "common.serviceport.ves.http.container" . }} diff --git a/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml b/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml index e730cf66..6d79ac76 100644 --- a/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml @@ -58,9 +58,9 @@ spec: - name: {{ include "common.namespace" . }}-{{include "common.name" . }} image: {{ .Values.ves.onapRepository }}/{{ .Values.ves.image.name }}:{{ .Values.ves.image.tag }} ports: - - containerPort: 8080 + - containerPort: {{ include "common.serviceport.ves.http.container" . }} protocol: TCP - - containerPort: 8443 + - containerPort: {{ include "common.serviceport.ves.https.container" . }} protocol: TCP env: - name: CONSUL_HOST @@ -82,7 +82,7 @@ spec: readinessProbe: httpGet: path: "/healthcheck" - port: 8080 + port: {{ include "common.serviceport.ves.http.container" . }} scheme: HTTP initialDelaySeconds: 5 timeoutSeconds: 1 diff --git a/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-service.yaml b/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-service.yaml index 718cd412..cc66510f 100644 --- a/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-service.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-service.yaml @@ -30,14 +30,14 @@ spec: ports: - name: xport-t-8080 protocol: TCP - port: 8080 - targetPort: 8080 - nodePort: 30235 + port: {{ include "common.serviceport.ves.http.container" . }} + targetPort: {{ include "common.serviceport.ves.http.container" . }} + nodePort: {{ include "common.serviceport.ves.http" . }} - name: xport-t-8443 protocol: TCP - port: 8443 - targetPort: 8443 - nodePort: 30417 + port: {{ include "common.serviceport.ves.https.container" . }} + targetPort: {{ include "common.serviceport.ves.https.container" . }} + nodePort: {{ include "common.serviceport.ves.https" . }} selector: app: dcae-ves-collector type: NodePort diff --git a/ric-aux/85-Ext-Services/bin/install b/ric-aux/85-Ext-Services/bin/install index 39ca0ea7..59f01ca2 100755 --- a/ric-aux/85-Ext-Services/bin/install +++ b/ric-aux/85-Ext-Services/bin/install @@ -58,7 +58,7 @@ else COMMON_OVERRIDE=$RIC_COMMON_OVERRIDE fi -RICAUX_COMPONENTS="ext" +RICAUX_COMPONENTS="extsvcaux" echo "Deploying RIC AUX components [$RICAUX_COMPONENTS]" echo "Helm Release Name: $RELEASE_NAME" diff --git a/ric-aux/85-Ext-Services/bin/uninstall b/ric-aux/85-Ext-Services/bin/uninstall index fd51c57c..ad8dac6e 100755 --- a/ric-aux/85-Ext-Services/bin/uninstall +++ b/ric-aux/85-Ext-Services/bin/uninstall @@ -30,7 +30,7 @@ else RELEASE_NAME=$RICAUX_RELEASE_NAME fi -RICAUX_COMPONENTS="ext" +RICAUX_COMPONENTS="extsvcaux" echo "Undeploying RIC AUX components [$RICAUX_COMPONENTS]" echo "Helm Release Name: $RELEASE_NAME" diff --git a/ric-aux/85-Ext-Services/helm/ext/Chart.yaml b/ric-aux/85-Ext-Services/helm/extsvcaux/Chart.yaml similarity index 86% rename from ric-aux/85-Ext-Services/helm/ext/Chart.yaml rename to ric-aux/85-Ext-Services/helm/extsvcaux/Chart.yaml index d6e6bb6a..93b11dc6 100644 --- a/ric-aux/85-Ext-Services/helm/ext/Chart.yaml +++ b/ric-aux/85-Ext-Services/helm/extsvcaux/Chart.yaml @@ -17,7 +17,7 @@ apiVersion: v1 appVersion: "1.0" -description: A Helm chart for setting up external endpoints as k8s services -name: ext -version: 0.1.0 +description: A Helm chart for setting up services with endpoints referencing external services so that these external services can be accessed as if they are in the same namespace. +name: extsvcaux +version: 0.2.0 diff --git a/ric-aux/85-Ext-Services/helm/ext/requirements.yaml b/ric-aux/85-Ext-Services/helm/extsvcaux/requirements.yaml similarity index 100% rename from ric-aux/85-Ext-Services/helm/ext/requirements.yaml rename to ric-aux/85-Ext-Services/helm/extsvcaux/requirements.yaml diff --git a/ric-platform/55-Ext-Services/helm/ext/templates/services-docker.yaml b/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-docker.yaml similarity index 98% rename from ric-platform/55-Ext-Services/helm/ext/templates/services-docker.yaml rename to ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-docker.yaml index 8d6eb016..b7a67535 100644 --- a/ric-platform/55-Ext-Services/helm/ext/templates/services-docker.yaml +++ b/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-docker.yaml @@ -37,7 +37,7 @@ metadata: namespace: {{ include "common.namespace" . }} subsets: - addresses: - - ip: "{{ .Values.ext.ip }}" + - ip: "{{ .Values.extsvcaux.auxip }}" ports: - port: {{ include "common.ingresshttpport.ricinfra" . }} name: {{ include "common.ingressurl.localdocker" . }}-http-ingress-port diff --git a/ric-platform/55-Ext-Services/helm/ext/templates/services-helm.yaml b/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-helm.yaml similarity index 98% rename from ric-platform/55-Ext-Services/helm/ext/templates/services-helm.yaml rename to ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-helm.yaml index 11ab1d8c..6ce4f2f4 100644 --- a/ric-platform/55-Ext-Services/helm/ext/templates/services-helm.yaml +++ b/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-helm.yaml @@ -37,7 +37,7 @@ metadata: namespace: {{ include "common.namespace" . }} subsets: - addresses: - - ip: "{{ .Values.ext.ip }}" + - ip: "{{ .Values.extsvcaux.auxip }}" ports: - port: {{ include "common.ingresshttpport.ricinfra" . }} name: {{ include "common.ingressurl.localhelm" . }}-http-ingress-port diff --git a/ric-aux/85-Ext-Services/helm/ext/templates/services-platform.yaml b/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-platform.yaml similarity index 98% rename from ric-aux/85-Ext-Services/helm/ext/templates/services-platform.yaml rename to ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-platform.yaml index f1978186..36eaf052 100644 --- a/ric-aux/85-Ext-Services/helm/ext/templates/services-platform.yaml +++ b/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-platform.yaml @@ -37,7 +37,7 @@ metadata: namespace: {{ include "common.namespace" . }} subsets: - addresses: - - ip: "{{ .Values.ext.ip }}" + - ip: "{{ .Values.extsvcaux.ricip }}" ports: - port: {{ include "common.ingresshttpport.ricplt" . }} name: {{ include "common.ingressurl.ricplt" . }}-http-ingress-port diff --git a/ric-aux/85-Ext-Services/helm/ext/templates/services-xapp.yaml b/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-xapp.yaml similarity index 98% rename from ric-aux/85-Ext-Services/helm/ext/templates/services-xapp.yaml rename to ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-xapp.yaml index f644588d..1c9d2edc 100644 --- a/ric-aux/85-Ext-Services/helm/ext/templates/services-xapp.yaml +++ b/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-xapp.yaml @@ -37,7 +37,7 @@ metadata: namespace: {{ include "common.namespace" . }} subsets: - addresses: - - ip: "{{ .Values.ext.ip }}" + - ip: "{{ .Values.extsvcaux.ricip }}" ports: - port: {{ include "common.ingresshttpport.ricxapp" . }} name: {{ include "common.ingressurl.ricxapp" . }}-http-ingress-port diff --git a/ric-aux/85-Ext-Services/helm/ext/values.yaml b/ric-aux/85-Ext-Services/helm/extsvcaux/values.yaml similarity index 89% rename from ric-aux/85-Ext-Services/helm/ext/values.yaml rename to ric-aux/85-Ext-Services/helm/extsvcaux/values.yaml index 08b71570..1316c12e 100644 --- a/ric-aux/85-Ext-Services/helm/ext/values.yaml +++ b/ric-aux/85-Ext-Services/helm/extsvcaux/values.yaml @@ -14,10 +14,8 @@ # limitations under the License. # ################################################################################ - -# Default values for ves. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -ext: - ip: "192.168.130.84" \ No newline at end of file +extsvcaux: + # The IP address of the RIC cluster + ricip: "0.0.0.0" + # The IP address of the AUX cluster + auxip: "0.0.0.0" \ No newline at end of file diff --git a/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl b/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl index f3fcab05..af110ab7 100644 --- a/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl +++ b/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl @@ -144,11 +144,11 @@ ## agree with the values in the kong helm charts values.yaml files. # ############################################################################################ {{- define "common.ingresshttpport.ricplt" -}} - {{- printf "30080" -}} + {{- printf "30180" -}} {{- end -}} {{- define "common.ingresshttpsport.ricplt" -}} - {{- printf "30443" -}} + {{- printf "30543" -}} {{- end -}} diff --git a/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh b/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh index e1e96150..25550a1b 100644 --- a/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh +++ b/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh @@ -127,7 +127,13 @@ echo 'deb http://apt.kubernetes.io/ kubernetes-xenial main' > /etc/apt/sources.l # install low latency kernel, docker.io, and kubernetes apt-get update -apt-get install -y linux-image-4.15.0-45-lowlatency curl jq netcat docker.io=${DOCKERVERSION} +apt-get install -y virt-what +if ! echo $(virt-what) | grep "virtualbox"; then + # this version of low latency kernel causes virtualbox VM to hand. + # install if identifying the VM not being a virtualbox VM. + apt-get install -y linux-image-4.15.0-45-lowlatency +fi +apt-get install -y curl jq netcat docker.io=${DOCKERVERSION} apt-get install -y kubernetes-cni=${CNIVERSION} apt-get install -y --allow-unauthenticated kubeadm=${KUBEVERSION} kubelet=${KUBEVERSION} kubectl=${KUBEVERSION} apt-mark hold docker.io kubernetes-cni kubelet kubeadm kubectl diff --git a/ric-infra/10-Nexus/bin/install b/ric-infra/10-Nexus/bin/install index f1ca83ab..cacb3a91 100755 --- a/ric-infra/10-Nexus/bin/install +++ b/ric-infra/10-Nexus/bin/install @@ -65,7 +65,7 @@ echo "Helm Release: $RELEASE_NAME" NODENAME=$(kubectl get node | awk 'NR==2{print $1}') kubectl label --overwrite nodes $NODENAME nexus-node=enable -. ./clear_nexus_data_path +. "$DIR/clear_nexus_data_path" @@ -74,6 +74,8 @@ helm package -d /tmp $DIR/../../../ric-common/Common-Template/helm/ric-common mkdir -p $DIR/../helm/charts/ +mkdir -p /tmp/nexus3-data + cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/charts/ if [ -z $OVERRIDEYAML ]; then diff --git a/ric-infra/15-Chartmuseum/bin/install b/ric-infra/15-Chartmuseum/bin/install index f1a3bb83..ae097fea 100755 --- a/ric-infra/15-Chartmuseum/bin/install +++ b/ric-infra/15-Chartmuseum/bin/install @@ -64,11 +64,12 @@ NODENAME=$(kubectl get node | awk 'NR==2{print $1}') kubectl label --overwrite nodes $NODENAME helm-node=enable DIRTEMP=$DIR -. ./clear_data_path +. "$DIR/clear_data_path" DIR=$DIRTEMP RICINFRA_COMPONENTS="chartmuseum" +mkdir -p /tmp/chartmuseum-data echo "Deploying RIC infra components [$RICINFRA_COMPONENTS]" echo "Helm Release Name: $RELEASE_NAME" @@ -79,11 +80,10 @@ helm package -d /tmp $DIR/../../../ric-common/Common-Template/helm/ric-common - - for component in $RICINFRA_COMPONENTS; do mkdir -p $DIR/../helm/$component/charts/ + cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/$component/charts/ if [ -z $OVERRIDEYAML ]; then diff --git a/ric-platform/50-RIC-Platform/helm/kong-platform/values.yaml b/ric-platform/50-RIC-Platform/helm/kong-platform/values.yaml index c0b83f37..cd658c4b 100644 --- a/ric-platform/50-RIC-Platform/helm/kong-platform/values.yaml +++ b/ric-platform/50-RIC-Platform/helm/kong-platform/values.yaml @@ -14,9 +14,9 @@ kong: proxy: http: - nodePort: 30080 + nodePort: 30180 tls: - nodePort: 30443 + nodePort: 30543 # These port numbers MUST matche with what's in # ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl file. # If need to change a proxy port here, do not forget to update the diff --git a/ric-platform/55-Ext-Services/bin/install b/ric-platform/55-Ext-Services/bin/install index 68fb4dc6..cf5a6db4 100755 --- a/ric-platform/55-Ext-Services/bin/install +++ b/ric-platform/55-Ext-Services/bin/install @@ -24,10 +24,10 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" source $DIR/../etc/ext.conf -if [ -z "$RICAUX_RELEASE_NAME" ];then +if [ -z "$RICPLT_RELEASE_NAME" ];then RELEASE_NAME=$helm_release_name else - RELEASE_NAME=$RICAUX_RELEASE_NAME + RELEASE_NAME=$RICPLT_RELEASE_NAME fi # Namespace configuration if [ -z "$RICPLT_NAMESPACE" ];then @@ -58,9 +58,9 @@ else COMMON_OVERRIDE=$RIC_COMMON_OVERRIDE fi -RICAUX_COMPONENTS="ext" +RICPLT_COMPONENTS="extsvcplt" -echo "Deploying RIC AUX components [$RICAUX_COMPONENTS]" +echo "Deploying RIC Platform components [$RICPLT_COMPONENTS]" echo "Helm Release Name: $RELEASE_NAME" @@ -69,7 +69,7 @@ COMMON_CHART_VERSION=$(cat $DIR/../../../ric-common/Common-Template/helm/ric-com helm package -d /tmp $DIR/../../../ric-common/Common-Template/helm/ric-common -for component in $RICAUX_COMPONENTS; do +for component in $RICPLT_COMPONENTS; do echo "Preparing chart for comonent $component" mkdir -p $DIR/../helm/$component/charts/ cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/$component/charts/ diff --git a/ric-platform/55-Ext-Services/bin/uninstall b/ric-platform/55-Ext-Services/bin/uninstall index 97edfa22..751c157e 100755 --- a/ric-platform/55-Ext-Services/bin/uninstall +++ b/ric-platform/55-Ext-Services/bin/uninstall @@ -24,25 +24,24 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" source $DIR/../etc/ext.conf -if [ -z "$RICAUX_RELEASE_NAME" ];then +if [ -z "$RICPLT_RELEASE_NAME" ];then RELEASE_NAME=$helm_release_name else - RELEASE_NAME=$RICAUX_RELEASE_NAME + RELEASE_NAME=$RICPLT_RELEASE_NAME fi -if [ -z "$RICAUX_NAMESPACE" ];then +if [ -z "$RICPLT_NAMESPACE" ];then NAMESPACE=$namespace else - NAMESPACE=$RICAUX_NAMESPACE + NAMESPACE=$RICPLT_NAMESPACE fi -RICAUX_COMPONENTS="ext" +RICPLT_COMPONENTS="extsvcplt" -echo "Undeploying RIC AUX components [$RICAUX_COMPONENTS]" +echo "Undeploying RIC Platform components [$RICPLT_COMPONENTS]" echo "Platform Namespace: $NAMESPACE" echo "Helm Release Name: $RELEASE_NAME" - -for component in $RICAUX_COMPONENTS; do +for component in $RICPLT_COMPONENTS; do helm delete --purge "${RELEASE_NAME}-$component" done diff --git a/ric-platform/55-Ext-Services/helm/ext/Chart.yaml b/ric-platform/55-Ext-Services/helm/extsvcplt/Chart.yaml similarity index 86% rename from ric-platform/55-Ext-Services/helm/ext/Chart.yaml rename to ric-platform/55-Ext-Services/helm/extsvcplt/Chart.yaml index d6e6bb6a..9cd80bf6 100644 --- a/ric-platform/55-Ext-Services/helm/ext/Chart.yaml +++ b/ric-platform/55-Ext-Services/helm/extsvcplt/Chart.yaml @@ -17,7 +17,7 @@ apiVersion: v1 appVersion: "1.0" -description: A Helm chart for setting up external endpoints as k8s services -name: ext -version: 0.1.0 +description: A Helm chart for setting up services with endpoints referencing external services so that these external services can be accessed as if they are in the same namespace. +name: extsvcplt +version: 0.2.0 diff --git a/ric-platform/55-Ext-Services/helm/ext/requirements.yaml b/ric-platform/55-Ext-Services/helm/extsvcplt/requirements.yaml similarity index 100% rename from ric-platform/55-Ext-Services/helm/ext/requirements.yaml rename to ric-platform/55-Ext-Services/helm/extsvcplt/requirements.yaml diff --git a/ric-platform/55-Ext-Services/helm/ext/templates/services-aux.yaml b/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-aux.yaml similarity index 97% rename from ric-platform/55-Ext-Services/helm/ext/templates/services-aux.yaml rename to ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-aux.yaml index e5958749..13313e4b 100644 --- a/ric-platform/55-Ext-Services/helm/ext/templates/services-aux.yaml +++ b/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-aux.yaml @@ -37,7 +37,7 @@ metadata: namespace: {{ include "common.namespace" . }} subsets: - addresses: - - ip: "{{ .Values.ext.ip }}" + - ip: "{{ .Values.extsvcplt.auxip }}" ports: - port: {{ include "common.ingresshttpport.ricaux" . }} name: {{ include "common.ingressurl.ricaux" . }}-http-ingress-port @@ -66,7 +66,7 @@ metadata: namespace: {{ include "common.namespace" . }} subsets: - addresses: - - ip: "{{ .Values.ext.ip }}" + - ip: "{{ .Values.extsvcplt.auxip }}" ports: - port: {{ include "common.ingresshttpport.ricinfra" . }} name: {{ include "common.ingressurl.ricinfra" . }}-http-ingress-port diff --git a/ric-aux/85-Ext-Services/helm/ext/templates/services-docker.yaml b/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-docker.yaml similarity index 98% rename from ric-aux/85-Ext-Services/helm/ext/templates/services-docker.yaml rename to ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-docker.yaml index 8d6eb016..d8900641 100644 --- a/ric-aux/85-Ext-Services/helm/ext/templates/services-docker.yaml +++ b/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-docker.yaml @@ -37,7 +37,7 @@ metadata: namespace: {{ include "common.namespace" . }} subsets: - addresses: - - ip: "{{ .Values.ext.ip }}" + - ip: "{{ .Values.extsvcplt.auxip }}" ports: - port: {{ include "common.ingresshttpport.ricinfra" . }} name: {{ include "common.ingressurl.localdocker" . }}-http-ingress-port diff --git a/ric-aux/85-Ext-Services/helm/ext/templates/services-helm.yaml b/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-helm.yaml similarity index 98% rename from ric-aux/85-Ext-Services/helm/ext/templates/services-helm.yaml rename to ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-helm.yaml index 11ab1d8c..f05f3c37 100644 --- a/ric-aux/85-Ext-Services/helm/ext/templates/services-helm.yaml +++ b/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-helm.yaml @@ -37,7 +37,7 @@ metadata: namespace: {{ include "common.namespace" . }} subsets: - addresses: - - ip: "{{ .Values.ext.ip }}" + - ip: "{{ .Values.extsvcplt.auxip }}" ports: - port: {{ include "common.ingresshttpport.ricinfra" . }} name: {{ include "common.ingressurl.localhelm" . }}-http-ingress-port diff --git a/ric-platform/55-Ext-Services/helm/ext/values.yaml b/ric-platform/55-Ext-Services/helm/extsvcplt/values.yaml similarity index 89% rename from ric-platform/55-Ext-Services/helm/ext/values.yaml rename to ric-platform/55-Ext-Services/helm/extsvcplt/values.yaml index 580be7fa..6aec0ce5 100644 --- a/ric-platform/55-Ext-Services/helm/ext/values.yaml +++ b/ric-platform/55-Ext-Services/helm/extsvcplt/values.yaml @@ -14,10 +14,8 @@ # limitations under the License. # ################################################################################ - -# Default values for ves. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -ext: - ip: "192.168.130.118" +extsvcplt: + # The IP address of the RIC cluster + ricip: "0.0.0.0" + # The IP address of the AUX cluster + auxip: "0.0.0.0" \ No newline at end of file diff --git a/ric-xapps/90-xApps/bin/install b/ric-xapps/90-xApps/bin/install index 08f45635..3ed7fe60 100755 --- a/ric-xapps/90-xApps/bin/install +++ b/ric-xapps/90-xApps/bin/install @@ -155,7 +155,8 @@ else fi - +mkdir /tmp/$CHART_NAME/config/ +mkdir /tmp/$CHART_NAME/descriptors/ cp $CONFIG_JSON_PATH /tmp/$CHART_NAME/config/ cp $DESCRIPTOR_PATH /tmp/$CHART_NAME/descriptors/ diff --git a/ric-xapps/90-xApps/helm/xapp-std/templates/appconfig.yaml b/ric-xapps/90-xApps/helm/xapp-std/templates/appconfig.yaml index e08ecc8d..ab8c2940 100644 --- a/ric-xapps/90-xApps/helm/xapp-std/templates/appconfig.yaml +++ b/ric-xapps/90-xApps/helm/xapp-std/templates/appconfig.yaml @@ -29,4 +29,4 @@ data: {{- $rtmgrrmrservice := .Values.ricplt.rtmgrRMRService | quote -}} {{- $a1mediatorrmrservice := .Values.ricplt.a1mediatorRMRService | quote -}} -{{ (.Files.Glob "config/*").AsConfig | replace "__DBAAS_SERVICE__" $dbaasservice | replace "__PLT_INGRESS_URL__" $pltingressurl | replace "__XAPP_INGRESS_URL__" $xappingressurl | replace "__APPMGR_RMR_SERVICE__" $appmgrrmrservice | replace "__E2MGR_RMR_SERVICE__" $e2mgrrmrservice | replace "__E2TERM_RMR_SERVICE__" $e2termrmrservice | replace "__RTMGR_RMR_SERVICE__" $rtmgrrmrservice | replace "__A1MEDIATOR_RMR_SERVICE__" $a1mediatorrmrservice | indent 2 }} +{{- (.Files.Glob "config/*").AsConfig | replace "__DBAAS_SERVICE__" $dbaasservice | replace "__PLT_INGRESS_URL__" $pltingressurl | replace "__XAPP_INGRESS_URL__" $xappingressurl | replace "__APPMGR_RMR_SERVICE__" $appmgrrmrservice | replace "__E2MGR_RMR_SERVICE__" $e2mgrrmrservice | replace "__E2TERM_RMR_SERVICE__" $e2termrmrservice | replace "__RTMGR_RMR_SERVICE__" $rtmgrrmrservice | replace "__A1MEDIATOR_RMR_SERVICE__" $a1mediatorrmrservice | nindent 2 }} diff --git a/ric-xapps/90-xApps/helm/xapp-std/templates/deployment.yaml b/ric-xapps/90-xApps/helm/xapp-std/templates/deployment.yaml index 28bd23bb..b539b9b4 100644 --- a/ric-xapps/90-xApps/helm/xapp-std/templates/deployment.yaml +++ b/ric-xapps/90-xApps/helm/xapp-std/templates/deployment.yaml @@ -46,10 +46,10 @@ spec: - name: http containerPort: {{ .Values.ricxapp.service.http.containerPort }} protocol: TCP - - name: rmrRoute + - name: rmrroute containerPort: {{ .Values.ricxapp.service.rmr.route.port }} protocol: TCP - - name: rmrData + - name: rmrdata containerPort: {{ .Values.ricxapp.service.rmr.data.port }} protocol: TCP volumeMounts: @@ -58,18 +58,14 @@ spec: envFrom: - configMapRef: name: {{ include "ricxapp.configmapname" . }}-appenv + {{- if .Values.ricxapp.livenessProbe }} livenessProbe: - httpGet: - path: {{ .Values.ricxapp.probes.healthAliveCheckEndpoint }} - port: {{ .Values.ricxapp.service.http.containerPort }} - initialDelaySeconds: 5 - periodSeconds: 15 + {{- .Values.ricxapp.livenessProbe | nindent 12 -}} + {{ end }} + {{- if .Values.ricxapp.readinessProbe }} readinessProbe: - httpGet: - path: {{ .Values.ricxapp.probes.healthReadyCheckEndpoint }} - port: {{ .Values.ricxapp.service.http.containerPort }} - initialDelaySeconds: 5 - periodSeconds: 15 + {{- .Values.ricxapp.readinessProbe | nindent 12 -}} + {{ end }} restartPolicy: Always volumes: - name: config-volume diff --git a/ric-xapps/90-xApps/helm/xapp-std/templates/service-rmr.yaml b/ric-xapps/90-xApps/helm/xapp-std/templates/service-rmr.yaml index ee1670b1..14a75722 100644 --- a/ric-xapps/90-xApps/helm/xapp-std/templates/service-rmr.yaml +++ b/ric-xapps/90-xApps/helm/xapp-std/templates/service-rmr.yaml @@ -29,13 +29,13 @@ spec: type: ClusterIP ports: - port: {{ .Values.ricxapp.service.rmr.data.port }} - targetPort: rmrData + targetPort: rmrdata protocol: TCP - name: rmrData + name: rmrdata - port: {{ .Values.ricxapp.service.rmr.route.port }} - targetPort: rmrRoute + targetPort: rmrroute protocol: TCP - name: rmrRoute + name: rmrroute selector: app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }} release: {{ .Release.Name }} diff --git a/ric-xapps/90-xApps/helm/xapp-std/values.yaml b/ric-xapps/90-xApps/helm/xapp-std/values.yaml index bf9be32c..50eab3c2 100644 --- a/ric-xapps/90-xApps/helm/xapp-std/values.yaml +++ b/ric-xapps/90-xApps/helm/xapp-std/values.yaml @@ -53,9 +53,20 @@ ricxapp: data: port: 4560 - probes: - healthAliveCheckEndpoint: ric/v1/health/alive - healthReadyCheckEndpoint: ric/v1/health/ready + livenessProbe: |- + httpGet: + path: ric/v1/health/alive + port: 8080 + initialDelaySeconds: 5 + periodSeconds: 15 + + readinessProbe: |- + httpGet: + path: ric/v1/health/ready + port: 8080 + initialDelaySeconds: 5 + periodSeconds: 15 + appconfig: path: /opt/ric/config