From: Zhe Huang Date: Fri, 17 Apr 2020 18:00:05 +0000 (+0000) Subject: Merge "Fixed external port in Policy service." X-Git-Tag: f-release~118 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=0faae789812e0f84949d26c415e8cb2cce1d94d5;hp=7e09001c5b58dab96d014fe3f9c41f89b53f3cc3;p=it%2Fdep.git Merge "Fixed external port in Policy service." --- diff --git a/ci/Dockerfile-package b/ci/Dockerfile-package index afb8a741..9b12cf95 100644 --- a/ci/Dockerfile-package +++ b/ci/Dockerfile-package @@ -15,11 +15,19 @@ ################################################################################ FROM buildpack-deps:stretch -RUN apt-get update && apt-get -q -y install debhelper dpkg-dev build-essential rsync +RUN apt-get update && apt-get -q -y install debhelper dpkg-dev build-essential rsync curl RUN mkdir /tmp/it-dep COPY . /tmp/it-dep WORKDIR /tmp/it-dep + +# Verify that the it/dep and the corresponding submodules are synced up +ARG GH=get_helm.sh +RUN curl --silent --show-error --connect-timeout 10 --retry 6 -L https://raw.githubusercontent.com/helm/helm/master/scripts/get -o ${GH} +RUN bash ${GH} +RUN helm init -c +RUN ./bin/verify-ric-charts + # building RIC deployment artifacts into a package RUN ./bin/package-ric-deployment-tools $(grep tag ./ci/package-tag.yaml | cut -f2 -d':') @@ -31,4 +39,3 @@ RUN ./bin/package-ric-deployment-tools $(grep tag ./ci/package-tag.yaml | cut -f # assumption is that the target directory is mounted as a volume. # ENTRYPOINT [ "ci/publish.sh" ] - diff --git a/ric-aux/helm/aaf/requirements.yaml b/ric-aux/helm/aaf/requirements.yaml index c6409999..efb6c271 100755 --- a/ric-aux/helm/aaf/requirements.yaml +++ b/ric-aux/helm/aaf/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: aux-common - version: ~3.0.0 + version: ^3.0.0 repository: "@local" diff --git a/ric-aux/helm/dashboard/requirements.yaml b/ric-aux/helm/dashboard/requirements.yaml index 40a2e9bd..ba6a2203 100644 --- a/ric-aux/helm/dashboard/requirements.yaml +++ b/ric-aux/helm/dashboard/requirements.yaml @@ -17,5 +17,5 @@ dependencies: - name: ric-common - version: ~3.1.0 + version: ^3.1.0 repository: "@local" diff --git a/ric-aux/helm/infrastructure/requirements.yaml b/ric-aux/helm/infrastructure/requirements.yaml index 744e2750..2490dbf0 100644 --- a/ric-aux/helm/infrastructure/requirements.yaml +++ b/ric-aux/helm/infrastructure/requirements.yaml @@ -17,7 +17,7 @@ dependencies: - name: ric-common - version: ~3.1.0 + version: ^3.1.0 repository: "@local" - name: extsvcaux version: 0.2.0 diff --git a/ric-aux/helm/infrastructure/subcharts/certificate-manager/requirements.yaml b/ric-aux/helm/infrastructure/subcharts/certificate-manager/requirements.yaml index 40a2e9bd..ba6a2203 100644 --- a/ric-aux/helm/infrastructure/subcharts/certificate-manager/requirements.yaml +++ b/ric-aux/helm/infrastructure/subcharts/certificate-manager/requirements.yaml @@ -17,5 +17,5 @@ dependencies: - name: ric-common - version: ~3.1.0 + version: ^3.1.0 repository: "@local" diff --git a/ric-aux/helm/infrastructure/subcharts/docker-credential/requirements.yaml b/ric-aux/helm/infrastructure/subcharts/docker-credential/requirements.yaml index 40a2e9bd..ba6a2203 100644 --- a/ric-aux/helm/infrastructure/subcharts/docker-credential/requirements.yaml +++ b/ric-aux/helm/infrastructure/subcharts/docker-credential/requirements.yaml @@ -17,5 +17,5 @@ dependencies: - name: ric-common - version: ~3.1.0 + version: ^3.1.0 repository: "@local" diff --git a/ric-aux/helm/infrastructure/subcharts/extsvcaux/requirements.yaml b/ric-aux/helm/infrastructure/subcharts/extsvcaux/requirements.yaml index 40a2e9bd..ba6a2203 100644 --- a/ric-aux/helm/infrastructure/subcharts/extsvcaux/requirements.yaml +++ b/ric-aux/helm/infrastructure/subcharts/extsvcaux/requirements.yaml @@ -17,5 +17,5 @@ dependencies: - name: ric-common - version: ~3.1.0 + version: ^3.1.0 repository: "@local" diff --git a/ric-aux/helm/message-router/requirements.yaml b/ric-aux/helm/message-router/requirements.yaml index c6409999..efb6c271 100755 --- a/ric-aux/helm/message-router/requirements.yaml +++ b/ric-aux/helm/message-router/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: aux-common - version: ~3.0.0 + version: ^3.0.0 repository: "@local" diff --git a/ric-aux/helm/portal/requirements.yaml b/ric-aux/helm/portal/requirements.yaml index 2032fd76..6e3dcafd 100755 --- a/ric-aux/helm/portal/requirements.yaml +++ b/ric-aux/helm/portal/requirements.yaml @@ -15,5 +15,5 @@ dependencies: - name: aux-common - version: ~3.0.0 + version: ^3.0.0 repository: "@local" diff --git a/ric-aux/helm/ves/requirements.yaml b/ric-aux/helm/ves/requirements.yaml index 40a2e9bd..ba6a2203 100644 --- a/ric-aux/helm/ves/requirements.yaml +++ b/ric-aux/helm/ves/requirements.yaml @@ -17,5 +17,5 @@ dependencies: - name: ric-common - version: ~3.1.0 + version: ^3.1.0 repository: "@local" diff --git a/ric-common/Common-Template/helm/ric-common/Chart.yaml b/ric-common/Common-Template/helm/ric-common/Chart.yaml index e2f199a2..23da5017 100644 --- a/ric-common/Common-Template/helm/ric-common/Chart.yaml +++ b/ric-common/Common-Template/helm/ric-common/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v1 description: Common templates for inclusion in other charts name: ric-common -version: 3.1.0 +version: 3.3.0 diff --git a/ric-common/Common-Template/helm/ric-common/templates/_dbaasha.tpl b/ric-common/Common-Template/helm/ric-common/templates/_alarmadapter.tpl old mode 100644 new mode 100755 similarity index 50% rename from ric-common/Common-Template/helm/ric-common/templates/_dbaasha.tpl rename to ric-common/Common-Template/helm/ric-common/templates/_alarmadapter.tpl index b9480724..6ff7b580 --- a/ric-common/Common-Template/helm/ric-common/templates/_dbaasha.tpl +++ b/ric-common/Common-Template/helm/ric-common/templates/_alarmadapter.tpl @@ -14,47 +14,51 @@ # limitations under the License. # ################################################################################ -{{- define "common.name.dbaasha" -}} - {{- printf "dbaasha" -}} +{{- define "common.name.alarmadapter" -}} + {{- printf "alarmadapter" -}} {{- end -}} -{{- define "common.fullname.dbaasha" -}} - {{- $name := ( include "common.name.dbaasha" . ) -}} +{{- define "common.fullname.alarmadapter" -}} + {{- $name := ( include "common.name.alarmadapter" . ) -}} {{- $namespace := ( include "common.namespace.platform" . ) -}} {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.configmapname.dbaasha" -}} - {{- $name := ( include "common.fullname.dbaasha" . ) -}} +{{- define "common.configmapname.alarmadapter" -}} + {{- $name := ( include "common.fullname.alarmadapter" . ) -}} {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.statefulsetname.dbaasha" -}} - {{- $name := ( include "common.fullname.dbaasha" . ) -}} - {{- printf "statefulset-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- define "common.deploymentname.alarmadapter" -}} + {{- $name := ( include "common.fullname.alarmadapter" . ) -}} + {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.containername.dbaasha.redis" -}} - {{- $name := ( include "common.fullname.dbaasha" . ) -}} - {{- printf "container-%s-redis" $name | trunc 63 | trimSuffix "-" -}} +{{- define "common.containername.alarmadapter" -}} + {{- $name := ( include "common.fullname.alarmadapter" . ) -}} + {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.containername.dbaasha.sentinel" -}} - {{- $name := ( include "common.fullname.dbaasha" . ) -}} - {{- printf "container-%s-sentinel" $name | trunc 63 | trimSuffix "-" -}} +{{- define "common.serviceaccountname.alarmadapter" -}} + {{- $name := ( include "common.fullname.alarmadapter" . ) -}} + {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- define "common.ingressname.alarmadapter" -}} + {{- $name := ( include "common.fullname.alarmadapter" . ) -}} + {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} - -{{- define "common.serviceaccountname.dbaasha" -}} - {{- $name := ( include "common.fullname.dbaasha" . ) -}} - {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- define "common.servicename.alarmadapter.rmr" -}} + {{- $name := ( include "common.fullname.alarmadapter" . ) -}} + {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.servicename.dbaasha.tcp" -}} - {{- $name := ( include "common.fullname.dbaasha" . ) -}} - {{- printf "service-%s-tcp" $name | trunc 63 | trimSuffix "-" -}} +{{- define "common.servicename.alarmadapter.http" -}} + {{- $name := ( include "common.fullname.alarmadapter" . ) -}} + {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.serviceport.dbaasha.redis" -}}6379{{- end -}} -{{- define "common.serviceport.dbaasha.sentinel" -}}26379{{- end -}} +{{- define "common.serviceport.alarmadapter.rmr.data" -}}4560{{- end -}} +{{- define "common.serviceport.alarmadapter.rmr.route" -}}4561{{- end -}} +{{- define "common.serviceport.alarmadapter.http" -}}3800{{- end -}} diff --git a/ric-common/Common-Template/helm/ric-common/templates/_dbaas.tpl b/ric-common/Common-Template/helm/ric-common/templates/_dbaas.tpl index 54f9d286..9f3daca5 100644 --- a/ric-common/Common-Template/helm/ric-common/templates/_dbaas.tpl +++ b/ric-common/Common-Template/helm/ric-common/templates/_dbaas.tpl @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2019 AT&T Intellectual Property. # +# Copyright (c) 2020 AT&T Intellectual Property. # # # # Licensed under the Apache License, Version 2.0 (the "License"); # # you may not use this file except in compliance with the License. # @@ -34,12 +34,16 @@ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- define "common.statefulsetname.dbaas" -}} + {{- $name := ( include "common.fullname.dbaas" . ) -}} + {{- printf "statefulset-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + {{- define "common.containername.dbaas" -}} {{- $name := ( include "common.fullname.dbaas" . ) -}} {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} - {{- define "common.serviceaccountname.dbaas" -}} {{- $name := ( include "common.fullname.dbaas" . ) -}} {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}} @@ -50,4 +54,5 @@ {{- printf "service-%s-tcp" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.serviceport.dbaas.tcp" -}}6379{{- end -}} +{{- define "common.serviceport.dbaas.redis" -}}6379{{- end -}} +{{- define "common.serviceport.dbaas.sentinel" -}}26379{{- end -}} diff --git a/ric-common/Common-Template/helm/ric-common/templates/_e2term.tpl b/ric-common/Common-Template/helm/ric-common/templates/_e2term.tpl index f83862e8..aad075ad 100644 --- a/ric-common/Common-Template/helm/ric-common/templates/_e2term.tpl +++ b/ric-common/Common-Template/helm/ric-common/templates/_e2term.tpl @@ -54,6 +54,10 @@ {{- $name := ( include "common.fullname.e2term" . ) -}} {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- define "common.servicename.e2term.sctp" -}} + {{- $name := ( include "common.fullname.e2term" . ) -}} + {{- printf "service-%s-sctp" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} {{- define "common.servicename.e2term.http" -}} {{- $name := ( include "common.fullname.e2term" . ) -}} @@ -65,7 +69,7 @@ {{- define "common.serviceport.e2term.rmr.data" -}}38000{{- end -}} {{- define "common.serviceport.e2term.rmr.route" -}}4561{{- end -}} {{- define "common.serviceport.e2term.http" -}}8080{{- end -}} -{{- define "common.serviceport.e2term.sctp" -}}5577{{- end -}} +{{- define "common.serviceport.e2term.sctp" -}}36422{{- end -}} {{- define "common.serviceaccountname.e2term" -}}