portalapi:
username: username
password: password
+ metrics:
+ url:
+ ac: http://ric-aux-kibana-server:5601/goto/fedcba9876543210?embed=true
# key.properties
cipher.enc.key: AGLDdG4D04BKm2IxIWEr8o==
# portal.properties
COMMON_OVERRIDE=$RIC_COMMON_OVERRIDE
fi
-RICAUX_COMPONENTS="dashboard ves message-router kong"
+RICAUX_COMPONENTS="dashboard ves message-router"
echo "Deploying RIC AUX components [$RICAUX_COMPONENTS]"
echo "Helm Release Name: $RELEASE_NAME"
RELEASE_NAME=$RICAUX_RELEASE_NAME
fi
-RICAUX_COMPONENTS="dashboard message-router ves kong"
+RICAUX_COMPONENTS="dashboard message-router ves"
echo "Undeploying RIC AUX components [$RICAUX_COMPONENTS]"
echo "Helm Release Name: $RELEASE_NAME"
portalapi.appname = {{ .Values.dashboard.portalapi.appname }}
portalapi.username = {{ .Values.dashboard.portalapi.username }}
portalapi.password = {{ .Values.dashboard.portalapi.password }}
+ metrics.url.ac = {{ .Values.dashboard.metrics.url.ac }}
key.properties: |
cipher.enc.key = {{ .Values.dashboard.cipher.enc.key }}
ecomp_redirect_url: https://portal.api.simpledemo.onap.org:30225/ONAPPORTAL/login.htm
ecomp_rest_url: http://portal-app.onap:8989/ONAPPORTAL/auxapi
ueb_app_key: uebkey
+ metrics:
+ url:
+ ac: http://ric-aux-kibana-server:5601/goto/1234567890abcdef?embed=true
- addresses:
- ip: "{{ .Values.extsvcaux.auxip }}"
ports:
- - port: {{ include "common.ingresshttpport.aux" . }}
+ - port: {{ include "common.ingresshttpport" . }}
name: {{ include "common.ingressurl.helm" . }}-http-ingress-port
- - port: {{ include "common.ingresshttpsport.aux" . }}
+ - port: {{ include "common.ingresshttpsport" . }}
name: {{ include "common.ingressurl.helm" . }}-https-ingress-port
- addresses:
- ip: "{{ .Values.extsvcaux.ricip }}"
ports:
- - port: {{ include "common.ingresshttpport.ric" . }}
+ - port: {{ include "common.ingresshttpport" . }}
name: {{ include "common.ingressurl.ric" . }}-http-ingress-port
- - port: {{ include "common.ingresshttpsport.ric" . }}
+ - port: {{ include "common.ingresshttpsport" . }}
name: {{ include "common.ingressurl.ric" . }}-https-ingress-port
## helm charts are not using this common template. We need to make sure that these values #
## agree with the values in the kong helm charts values.yaml files. #
############################################################################################
-{{- define "common.ingresshttpport.ric" -}}
- {{- printf "31080" -}}
-{{- end -}}
-
-{{- define "common.ingresshttpsport.ric" -}}
- {{- printf "31443" -}}
-{{- end -}}
-
-
-{{- define "common.ingresshttpport.aux" -}}
+{{- define "common.ingresshttpport" -}}
{{- printf "32080" -}}
{{- end -}}
-{{- define "common.ingresshttpsport.aux" -}}
+{{- define "common.ingresshttpsport" -}}
{{- printf "32443" -}}
{{- end -}}
# modify below for RIC infrastructure (docker-k8s-helm) component versions
-INFRA_DOCKER_VERSION="18.09.7-0ubuntu1~16.04.4"
+INFRA_DOCKER_VERSION=""
INFRA_K8S_VERSION="1.13.3"
INFRA_CNI_VERSION="0.6.0"
INFRA_HELM_VERSION="2.12.3"
curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
echo 'deb http://apt.kubernetes.io/ kubernetes-xenial main' > /etc/apt/sources.list.d/kubernetes.list
+# tell apt to retry 3 times if failed
+mkdir -p /etc/apt/apt.conf.d
+echo "APT::Acquire::Retries \"3\";" > /etc/apt/apt.conf.d/80-retries
+
# install low latency kernel, docker.io, and kubernetes
apt-get update
apt-get install -y virt-what
# 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}
+if [ -z ${DOCKERVERSION} ]; then
+ apt-get install -y curl jq netcat docker.io
+else
+ apt-get install -y curl jq netcat docker.io=${DOCKERVERSION}
+fi
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
--- /dev/null
+#!/bin/bash
+################################################################################
+# 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. #
+################################################################################
+
+
+OVERRIDEYAML=$1
+
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+source $DIR/../etc/kong.conf
+
+if [ -z "$RICINFRA_RELEASE_NAME" ];then
+ RELEASE_NAME=$helm_release_name
+else
+ RELEASE_NAME=$RICINFRA_RELEASE_NAME
+fi
+# Namespace configuration
+if [ -z "$RICPLT_NAMESPACE" ];then
+ PLT_NAMESPACE=$plt_namespace
+else
+ PLT_NAMESPACE=$RICPLT_NAMESPACE
+fi
+if [ -z "$RICXAPP_NAMESPACE" ];then
+ XAPP_NAMESPACE=$xapp_namespace
+else
+ XAPP_NAMESPACE=$RICXAPP_NAMESPACE
+fi
+if [ -z "$RICAUX_NAMESPACE" ];then
+ AUX_NAMESPACE=$aux_namespace
+else
+ AUX_NAMESPACE=$RICAUX_NAMESPACE
+fi
+if [ -z "$RICINFRA_NAMESPACE" ];then
+ INFRA_NAMESPACE=$infra_namespace
+else
+ INFRA_NAMESPACE=$RICINFRA_NAMESPACE
+fi
+
+if [ -z "$RIC_COMMON_OVERRIDE" ];then
+ COMMON_OVERRIDE="--set global.namespace.platform=$PLT_NAMESPACE --set global.namespace.xapp=$XAPP_NAMESPACE --set global.namespace.aux=$AUX_NAMESPACE --set global.namespace.infra=$INFRA_NAMESPACE"
+else
+ COMMON_OVERRIDE=$RIC_COMMON_OVERRIDE
+fi
+
+
+
+
+RICINFRA_COMPONENTS="kong"
+
+echo "Deploying RIC infra components [$RICINFRA_COMPONENTS]"
+echo "Helm Release Name: $RELEASE_NAME"
+
+
+COMMON_CHART_VERSION=$(cat $DIR/../../../ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
+helm package -d /tmp $DIR/../../../ric-common/Common-Template/helm/ric-common
+
+
+
+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
+ helm install --debug --namespace "${INFRA_NAMESPACE}" --name "${RELEASE_NAME}-$component" $COMMON_OVERRIDE $DIR/../helm/$component
+ else
+ helm install -f $OVERRIDEYAML --namespace "${INFRA_NAMESPACE}" --name "${RELEASE_NAME}-$component" $COMMON_OVERRIDE $DIR/../helm/$component
+ fi
+done
--- /dev/null
+#!/bin/bash
+################################################################################
+# 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. #
+################################################################################
+
+
+
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+
+source $DIR/../etc/kong.conf
+
+if [ -z "$RICINFRA_RELEASE_NAME" ];then
+ RELEASE_NAME=$helm_release_name
+else
+ RELEASE_NAME=$RICINFRA_RELEASE_NAME
+fi
+
+if [ -z "$RICINFRA_NAMESPACE" ];then
+ INFRA_NAMESPACE=$infra_namespace
+else
+ INFRA_NAMESPACE=$RICINFRA_NAMESPACE
+fi
+
+RICINFRA_COMPONENTS="kong"
+
+echo "Undeploying RIC infra components [$RICINFRA_COMPONENTS]"
+echo "Helm Release Name: $RELEASE_NAME"
+
+
+for component in $RICINFRA_COMPONENTS; do
+ helm delete --purge "${RELEASE_NAME}-${component}"
+done
+
+
--- /dev/null
+# 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/
--- /dev/null
+# 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/
proxy:
http:
- nodePort: 31080
+ nodePort: 32080
tls:
- nodePort: 31443
+ 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
--- /dev/null
+################################################################################
+# 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. #
+################################################################################
+
+
+# helm_release_name defines the release name helm will use to deploy RIC
+# It will be overrided by RICPLT_RELEASE_NAME
+helm_release_name=r1
+
+# namespace defines the namespace that helm will use to deploy RIC
+# It will be overrided by RICPLT_NAMESPACE
+plt_namespace=ricplt
+
+# namespace defines the namespace that helm will use to deploy RIC
+# It will be overrided by RICXAPP_NAMESPACE
+xapp_namespace=ricxapp
+
+# namespace defines the namespace that helm will use to deploy RIC
+# It will be overrided by RICAUX_NAMESPACE
+aux_namespace=ricaux
+
+# namespace defines the namespace that helm will use to deploy RIC
+# It will be overrided by RICINFRA_NAMESPACE
+infra_namespace=ricinfra
fi
-RICPLT_COMPONENTS="appmgr rtmgr dbaas e2mgr e2term a1mediator submgr kong"
+RICPLT_COMPONENTS="appmgr rtmgr dbaas e2mgr e2term a1mediator submgr"
echo "Deploying RIC Platform components [$RICPLT_COMPONENTS]"
echo "Helm Release Name: $RELEASE_NAME"
RELEASE_NAME=$RICPLT_RELEASE_NAME
fi
-RICPLT_COMPONENTS="appmgr rtmgr dbaas e2mgr e2term a1mediator submgr kong"
+RICPLT_COMPONENTS="appmgr rtmgr dbaas e2mgr e2term a1mediator submgr"
echo "Undeploying RIC Platform components [$RICPLT_COMPONENTS]"
protocol: TCP
livenessProbe:
httpGet:
- path: /healthcheck
+ path: /a1-p/healthcheck
port: http
readinessProbe:
httpGet:
- path: /healthcheck
+ path: /a1-p/healthcheck
port: http
volumes:
- name: "a1conf"
image:
name: ric-plt-a1
- tag: 0.10.2
+ tag: 0.10.3
# Service ports are now defined in
# ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file.
- addresses:
- ip: "{{ $.Values.extsvcplt.auxip }}"
ports:
- - port: {{ include "common.ingresshttpport.aux" $ }}
+ - port: {{ include "common.ingresshttpport" $ }}
name: {{ include "common.ingressurl.aux" $ }}-http-ingress-port
- - port: {{ include "common.ingresshttpsport.aux" $ }}
+ - port: {{ include "common.ingresshttpsport" $ }}
name: {{ include "common.ingressurl.aux" $ }}-https-ingress-port
{{- end -}}
- addresses:
- ip: "{{ $.Values.extsvcplt.auxip }}"
ports:
- - port: {{ include "common.ingresshttpport.aux" $ }}
+ - port: {{ include "common.ingresshttpport" $ }}
name: {{ include "common.ingressurl.helm" $ }}-http-ingress-port
- - port: {{ include "common.ingresshttpsport.aux" $ }}
+ - port: {{ include "common.ingresshttpsport" $ }}
name: {{ include "common.ingressurl.helm" $ }}-https-ingress-port
{{- end -}}
Code Review / it / dep.git / commitdiff