mock:
rannames: "ABCD123456, EFGH123456"
-ext:
- ip:
- 192.168.130.110
+extsvcaux:
+ ricip:
+ # The ip address of the ric cluster ingress controller
+ <IP_ADDRESS of the RIC cluster>
+ auxip:
+ # The ip address of the aux cluster ingress controller
+ <IP_ADDRESS of the AUX cluster>
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
+ <IP_ADDRESS of the AUX cluster>
+ ricip:
+ # The ip address of the ric cluster ingress controller
+ <IP_ADDRESS of the RIC cluster>
# 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" . }}
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
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 }}
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
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.
+
- path: /vescollector
backend:
serviceName: xdcae-ves-collector
- servicePort: 8080
+ servicePort: {{ include "common.serviceport.ves.http.container" . }}
- name: {{ include "common.namespace" . }}-{{include "common.name" . }}\r
image: {{ .Values.ves.onapRepository }}/{{ .Values.ves.image.name }}:{{ .Values.ves.image.tag }}\r
ports:\r
- - containerPort: 8080\r
+ - containerPort: {{ include "common.serviceport.ves.http.container" . }}\r
protocol: TCP\r
- - containerPort: 8443\r
+ - containerPort: {{ include "common.serviceport.ves.https.container" . }}\r
protocol: TCP\r
env:\r
- name: CONSUL_HOST\r
readinessProbe:\r
httpGet:\r
path: "/healthcheck"\r
- port: 8080\r
+ port: {{ include "common.serviceport.ves.http.container" . }}\r
scheme: HTTP\r
initialDelaySeconds: 5\r
timeoutSeconds: 1\r
ports:\r
- name: xport-t-8080\r
protocol: TCP\r
- port: 8080\r
- targetPort: 8080\r
- nodePort: 30235\r
+ port: {{ include "common.serviceport.ves.http.container" . }}\r
+ targetPort: {{ include "common.serviceport.ves.http.container" . }}\r
+ nodePort: {{ include "common.serviceport.ves.http" . }}\r
- name: xport-t-8443\r
protocol: TCP\r
- port: 8443\r
- targetPort: 8443\r
- nodePort: 30417\r
+ port: {{ include "common.serviceport.ves.https.container" . }}\r
+ targetPort: {{ include "common.serviceport.ves.https.container" . }}\r
+ nodePort: {{ include "common.serviceport.ves.https" . }}\r
selector:\r
app: dcae-ves-collector\r
type: NodePort\r
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"
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"
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
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
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
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
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
# 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
## 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 -}}
# 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
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"
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
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"
-
-
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
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
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
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"
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/
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
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
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
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
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
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
# 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
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/
{{- $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 }}
- 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:
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
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 }}
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
Code Review / it / dep.git / commitdiff