From: Lusheng Ji Date: Wed, 26 Jun 2019 20:53:56 +0000 (+0000) Subject: Merge "Integrate appmgr with common template. Add ingress controller entries in the... X-Git-Tag: 0.0.2~86 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=b98e18905302fc97cd0ec46c8cc10b1844f08e4e;hp=4af2ac38d2fb26d5efd0887b2eff9f90314b4c0c;p=it%2Fdep.git Merge "Integrate appmgr with common template. Add ingress controller entries in the common templates." --- diff --git a/ric-platform/50-RIC-Platform/bin/install b/ric-platform/50-RIC-Platform/bin/install index 4c97c14a..75590bee 100755 --- a/ric-platform/50-RIC-Platform/bin/install +++ b/ric-platform/50-RIC-Platform/bin/install @@ -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 diff --git a/ric-platform/50-RIC-Platform/bin/uninstall b/ric-platform/50-RIC-Platform/bin/uninstall index e5a65fa5..a5ccd8cd 100755 --- a/ric-platform/50-RIC-Platform/bin/uninstall +++ b/ric-platform/50-RIC-Platform/bin/uninstall @@ -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 index 00000000..8147541a --- /dev/null +++ b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/ingress-a1mediator.yaml @@ -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 diff --git a/ric-platform/50-RIC-Platform/helm/ingress-appmgr.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/ingress-appmgr.yaml similarity index 54% rename from ric-platform/50-RIC-Platform/helm/ingress-appmgr.yaml rename to ric-platform/50-RIC-Platform/helm/appmgr/templates/ingress-appmgr.yaml index ff890f2c..d2342a50 100644 --- a/ric-platform/50-RIC-Platform/helm/ingress-appmgr.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/ingress-appmgr.yaml @@ -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 diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml index fe22ec4b..3b20e64b 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml @@ -75,7 +75,7 @@ appmgr: reponame: "helm-repo" service: - type: NodePort + type: ClusterIP port: 8080 name: appmgr-service protocol: "TCP" diff --git a/ric-platform/50-RIC-Platform/helm/ingress-e2mgr.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/ingress-e2mgr.yaml similarity index 51% rename from ric-platform/50-RIC-Platform/helm/ingress-e2mgr.yaml rename to ric-platform/50-RIC-Platform/helm/e2mgr/templates/ingress-e2mgr.yaml index a4cb379c..07229283 100644 --- a/ric-platform/50-RIC-Platform/helm/ingress-e2mgr.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/ingress-e2mgr.yaml @@ -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 diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml index 5f11d215..a0bb1af6 100644 --- a/ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml @@ -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 index ad0203bf..00000000 --- a/ric-platform/50-RIC-Platform/helm/ingress-appmgr.yaml~ +++ /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 index 3083a15c..00000000 --- a/ric-platform/50-RIC-Platform/helm/ingress-e2mgr.yaml~ +++ /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 index 10474311..00000000 --- a/ric-platform/50-RIC-Platform/helm/ingress.yaml +++ /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 index 91ba4eb0..00000000 --- a/ric-platform/50-RIC-Platform/helm/ingress.yaml~ +++ /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 index 00000000..50af0317 --- /dev/null +++ b/ric-platform/50-RIC-Platform/helm/kong-platform/.helmignore @@ -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 index 00000000..4bd2e363 --- /dev/null +++ b/ric-platform/50-RIC-Platform/helm/kong-platform/Chart.yaml @@ -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 index 00000000..2587ea7e --- /dev/null +++ b/ric-platform/50-RIC-Platform/helm/kong-platform/requirements.yaml @@ -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 index 00000000..0a2a6292 --- /dev/null +++ b/ric-platform/50-RIC-Platform/helm/kong-platform/values.yaml @@ -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 index 00000000..50af0317 --- /dev/null +++ b/ric-platform/50-RIC-Platform/helm/kong-xapp/.helmignore @@ -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 index 00000000..25b4aad7 --- /dev/null +++ b/ric-platform/50-RIC-Platform/helm/kong-xapp/Chart.yaml @@ -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 index 00000000..2587ea7e --- /dev/null +++ b/ric-platform/50-RIC-Platform/helm/kong-xapp/requirements.yaml @@ -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 index 00000000..54d7abf7 --- /dev/null +++ b/ric-platform/50-RIC-Platform/helm/kong-xapp/templates/ingress-xapp.yaml @@ -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 index 00000000..1cf2ab61 --- /dev/null +++ b/ric-platform/50-RIC-Platform/helm/kong-xapp/values.yaml @@ -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 + +