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>
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 -}}
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
Code Review / it / dep.git / commitdiff