adding kong 16/416/4
authorrshacham <rshacham@research.att.com>
Wed, 26 Jun 2019 17:02:51 +0000 (17:02 +0000)
committerrshacham <rshacham@research.att.com>
Wed, 26 Jun 2019 20:37:09 +0000 (20:37 +0000)
Change-Id: I8e982bfb194988cf3a4559b8070388cba7484fb1
Signed-off-by: rshacham <rshacham@research.att.com>
20 files changed:
ric-platform/50-RIC-Platform/bin/install
ric-platform/50-RIC-Platform/bin/uninstall
ric-platform/50-RIC-Platform/helm/a1mediator/templates/ingress-a1mediator.yaml [new file with mode: 0644]
ric-platform/50-RIC-Platform/helm/appmgr/templates/ingress-appmgr.yaml [moved from ric-platform/50-RIC-Platform/helm/ingress-appmgr.yaml with 54% similarity]
ric-platform/50-RIC-Platform/helm/appmgr/values.yaml
ric-platform/50-RIC-Platform/helm/e2mgr/templates/ingress-e2mgr.yaml [moved from ric-platform/50-RIC-Platform/helm/ingress-e2mgr.yaml with 51% similarity]
ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml
ric-platform/50-RIC-Platform/helm/ingress-appmgr.yaml~ [deleted file]
ric-platform/50-RIC-Platform/helm/ingress-e2mgr.yaml~ [deleted file]
ric-platform/50-RIC-Platform/helm/ingress.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/ingress.yaml~ [deleted file]
ric-platform/50-RIC-Platform/helm/kong-platform/.helmignore [new file with mode: 0644]
ric-platform/50-RIC-Platform/helm/kong-platform/Chart.yaml [new file with mode: 0644]
ric-platform/50-RIC-Platform/helm/kong-platform/requirements.yaml [new file with mode: 0644]
ric-platform/50-RIC-Platform/helm/kong-platform/values.yaml [new file with mode: 0644]
ric-platform/50-RIC-Platform/helm/kong-xapp/.helmignore [new file with mode: 0644]
ric-platform/50-RIC-Platform/helm/kong-xapp/Chart.yaml [new file with mode: 0644]
ric-platform/50-RIC-Platform/helm/kong-xapp/requirements.yaml [new file with mode: 0644]
ric-platform/50-RIC-Platform/helm/kong-xapp/templates/ingress-xapp.yaml [new file with mode: 0644]
ric-platform/50-RIC-Platform/helm/kong-xapp/values.yaml [new file with mode: 0644]

index 4c97c14..75590be 100755 (executable)
@@ -37,7 +37,8 @@ else
 fi
 
 
-RICPLT_COMPONENTS="appmgr rtmgr dbaas e2mgr e2term a1mediator"
+RICPLT_COMPONENTS="appmgr rtmgr dbaas e2mgr e2term a1mediator kong-platform kong-xapp"
+#RICPLT_COMPONENTS="kong-platform kong-xapp"
 
 echo "Deploying RIC Platform components [$RICPLT_COMPONENTS]"
 echo "Platform Namespace: $NAMESPACE"
@@ -51,6 +52,21 @@ helm package -d /tmp $DIR/../helm/common
 
 for component in $RICPLT_COMPONENTS; do
   echo "Preparing chart for comonent $component"
+
+  if [ $component = "kong-platform" ]; then 
+     helm dep up $DIR/../helm/$component
+     helm install --namespace ricplt --name "${RELEASE_NAME}-$component" $DIR/../helm/$component --set postgresql.enabled=false --set env.database=off
+     continue
+  fi
+
+  if [ $component = "kong-xapp" ]; then 
+     helm dep up $DIR/../helm/$component
+     helm install --namespace ricxapp --name "${RELEASE_NAME}-$component" $DIR/../helm/$component --set postgresql.enabled=false --set env.database=off
+     continue
+  fi
+
+  echo "not kong component"
+     
   mkdir -p $DIR/../helm/$component/charts/
   cp /tmp/common-$COMMON_CHART_VERSION.tgz $DIR/../helm/$component/charts/
   if [ -z $OVERRIDEYAML ]; then
index e5a65fa..a5ccd8c 100755 (executable)
@@ -36,7 +36,7 @@ else
 fi
 
 
-RICPLT_COMPONENTS="appmgr rtmgr dbaas e2mgr e2term a1mediator"
+RICPLT_COMPONENTS="appmgr rtmgr dbaas e2mgr e2term a1mediator kong-platform kong-xapp"
 
 echo "Undeploying RIC Platform components [$RICPLT_COMPONENTS]"
 echo "Platform Namespace: $NAMESPACE"
diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/ingress-a1mediator.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/ingress-a1mediator.yaml
new file mode 100644 (file)
index 0000000..8147541
--- /dev/null
@@ -0,0 +1,12 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: ric-ingress-a1mediator
+spec:
+  rules:
+  - http:
+      paths:
+      - path: /a1mediator
+        backend:
+          serviceName: {{ include "a1mediator.fullname" . }}
+          servicePort: {{ .Values.httpservice.port }}
\ No newline at end of file
@@ -4,10 +4,9 @@ metadata:
   name: ric-ingress-appmgr
 spec:
   rules:
-  - host: foo.bar.com
-    http:
+  - http:
       paths:
       - path: /appmgr
         backend:
-          serviceName: r0-appmgr
-          servicePort: 8080
\ No newline at end of file
+          serviceName: {{ include "appmgr.fullname" . }}
+          servicePort: {{ .Values.appmgr.service.port }}
\ No newline at end of file
index 2bb470b..40b6742 100644 (file)
@@ -75,7 +75,7 @@ appmgr:
   reponame: "helm-repo"
 
   service:
-    type: NodePort
+    type: ClusterIP
     port: 8080
     name: appmgr-service
     protocol: "TCP"
@@ -4,10 +4,9 @@ metadata:
   name: ric-ingress-e2mgr
 spec:
   rules:
-  - host: foo.bar.com
-    http:
+  - http:
       paths:
       - path: /e2mgr
         backend:
-          serviceName: r0-e2mgr
-          servicePort: 3800
\ No newline at end of file
+          serviceName: {{ include "common.servicename.e2mgr" . }}
+          servicePort: {{ .Values.e2mgr.service.http.port }}
\ No newline at end of file
index 5f11d21..a0bb1af 100644 (file)
@@ -48,7 +48,7 @@ e2mgr:
     RMR_RTG_SVC: "ric-full-rtmgr"
   
   service:
-    type: NodePort
+    type: ClusterIP
     http:
       port: 3800
       target_port: 3800
diff --git a/ric-platform/50-RIC-Platform/helm/ingress-appmgr.yaml~ b/ric-platform/50-RIC-Platform/helm/ingress-appmgr.yaml~
deleted file mode 100644 (file)
index ad0203b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: ric-ingress
-spec:
-  rules:
-  - host: foo.bar.com
-    http:
-      paths:
-      - path: /appmgr
-        backend:
-          serviceName: r0-appmgr
-          servicePort: 8080
\ No newline at end of file
diff --git a/ric-platform/50-RIC-Platform/helm/ingress-e2mgr.yaml~ b/ric-platform/50-RIC-Platform/helm/ingress-e2mgr.yaml~
deleted file mode 100644 (file)
index 3083a15..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: ric-ingress
-spec:
-  rules:
-  - host: foo.bar.com
-    http:
-      paths:
-      - path: /e2mgr
-        backend:
-          serviceName: r0-e2mgr
-          servicePort: 3800
\ No newline at end of file
diff --git a/ric-platform/50-RIC-Platform/helm/ingress.yaml b/ric-platform/50-RIC-Platform/helm/ingress.yaml
deleted file mode 100644 (file)
index 1047431..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: ric-ingress
-spec:
-  rules:
-  - host: foo.bar.com
-    http:
-      paths:
-      - path: /e2mgr
-        backend:
-          serviceName: r0-e2mgr
-          servicePort: 3800
-      - path: /appmgr
-        backend:
-          serviceName: r0-appmgr
-          servicePort: 8080
\ No newline at end of file
diff --git a/ric-platform/50-RIC-Platform/helm/ingress.yaml~ b/ric-platform/50-RIC-Platform/helm/ingress.yaml~
deleted file mode 100644 (file)
index 91ba4eb..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: ric-ingress
-spec:
-  rules:
-  - host: foo.bar.com
-    http:
-      paths:
-      - path: /e2mgr
-        backend:
-          serviceName: r0-e2mgr
-          servicePort: 3800
-      - path: /appmgr
-        backend:
-         serviceName: r0-appmgr
-         servicePort: 8080
\ No newline at end of file
diff --git a/ric-platform/50-RIC-Platform/helm/kong-platform/.helmignore b/ric-platform/50-RIC-Platform/helm/kong-platform/.helmignore
new file mode 100644 (file)
index 0000000..50af031
--- /dev/null
@@ -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/ric-platform/50-RIC-Platform/helm/kong-platform/Chart.yaml b/ric-platform/50-RIC-Platform/helm/kong-platform/Chart.yaml
new file mode 100644 (file)
index 0000000..4bd2e36
--- /dev/null
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: kong_platform
+version: 1.0.0
diff --git a/ric-platform/50-RIC-Platform/helm/kong-platform/requirements.yaml b/ric-platform/50-RIC-Platform/helm/kong-platform/requirements.yaml
new file mode 100644 (file)
index 0000000..2587ea7
--- /dev/null
@@ -0,0 +1,21 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#   Copyright (c) 2019 Nokia.                                                  #
+#                                                                              #
+#   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: kong
+    repository: '@stable'
+    version: ~0.12.2
\ No newline at end of file
diff --git a/ric-platform/50-RIC-Platform/helm/kong-platform/values.yaml b/ric-platform/50-RIC-Platform/helm/kong-platform/values.yaml
new file mode 100644 (file)
index 0000000..0a2a629
--- /dev/null
@@ -0,0 +1,19 @@
+# Default values for kong_platform.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+kong:
+  ingressController:
+    enabled: true
+
+  postgresql:
+    enabled: false
+
+  env:
+    database: "off"
+
+  proxy:
+    http:
+      nodePort: 30080
+    tls:
+      nodePort: 30443
\ No newline at end of file
diff --git a/ric-platform/50-RIC-Platform/helm/kong-xapp/.helmignore b/ric-platform/50-RIC-Platform/helm/kong-xapp/.helmignore
new file mode 100644 (file)
index 0000000..50af031
--- /dev/null
@@ -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/ric-platform/50-RIC-Platform/helm/kong-xapp/Chart.yaml b/ric-platform/50-RIC-Platform/helm/kong-xapp/Chart.yaml
new file mode 100644 (file)
index 0000000..25b4aad
--- /dev/null
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: kong_xapp
+version: 1.0.0
diff --git a/ric-platform/50-RIC-Platform/helm/kong-xapp/requirements.yaml b/ric-platform/50-RIC-Platform/helm/kong-xapp/requirements.yaml
new file mode 100644 (file)
index 0000000..2587ea7
--- /dev/null
@@ -0,0 +1,21 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#   Copyright (c) 2019 Nokia.                                                  #
+#                                                                              #
+#   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: kong
+    repository: '@stable'
+    version: ~0.12.2
\ No newline at end of file
diff --git a/ric-platform/50-RIC-Platform/helm/kong-xapp/templates/ingress-xapp.yaml b/ric-platform/50-RIC-Platform/helm/kong-xapp/templates/ingress-xapp.yaml
new file mode 100644 (file)
index 0000000..54d7abf
--- /dev/null
@@ -0,0 +1,12 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: ric-ingress-xapp
+spec:
+  rules:
+  - http:
+      paths:
+      - path: /anr
+        backend:
+          serviceName: r0-xapp-anr
+          servicePort: 9999
\ No newline at end of file
diff --git a/ric-platform/50-RIC-Platform/helm/kong-xapp/values.yaml b/ric-platform/50-RIC-Platform/helm/kong-xapp/values.yaml
new file mode 100644 (file)
index 0000000..1cf2ab6
--- /dev/null
@@ -0,0 +1,22 @@
+# Default values for kong_platform.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+kong:
+  ingressController:
+    enabled: true
+    installCRDs: false
+
+  postgresql:
+    enabled: false
+
+  env:
+    database: "off"
+
+  proxy:
+    http:
+      nodePort: 31080
+    tls:
+      nodePort: 31443
+
+