From: wrider <lji@research.att.com>
Date: Thu, 25 Jul 2019 02:57:07 +0000 (-0400)
Subject: Rename ext charts
X-Git-Tag: 0.0.2~49^2
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F58%2F558%2F6;p=it%2Fdep.git

Rename ext charts

This change enables that both ext service charts to be deployed
(since Helm release names are based on chart name) into the same
k8s cluster.
This change also contains a number of fixes.

Change-Id: I953b96a01440e3e51e762d70ffb9d6e2a10f2b42
Signed-off-by: wrider <lji@research.att.com>
---

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
+    <IP_ADDRESS of the RIC cluster>
+  auxip:
+    # The ip address of the aux cluster ingress controller
+    <IP_ADDRESS of the AUX cluster>
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
+    <IP_ADDRESS of the AUX cluster>
+  ricip:
+    # The ip address of the ric cluster ingress controller
+    <IP_ADDRESS of the RIC cluster>
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-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