Merge "Add right to create pod forwarding for appmgr tiller"
authorLusheng Ji <lji@research.att.com>
Tue, 23 Jul 2019 15:04:32 +0000 (15:04 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Tue, 23 Jul 2019 15:04:32 +0000 (15:04 +0000)
39 files changed:
RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
bin/package-ric-deployment-tools [new file with mode: 0755]
ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/_genurl.tpl
ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml
ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml
ric-common/Common-Template/helm/ric-common/templates/_configmapname.tpl
ric-common/Common-Template/helm/ric-common/templates/_containername.tpl
ric-common/Common-Template/helm/ric-common/templates/_deploymentname.tpl
ric-common/Common-Template/helm/ric-common/templates/_ingressname.tpl
ric-common/Common-Template/helm/ric-common/templates/_name.tpl
ric-common/Common-Template/helm/ric-common/templates/_ports.tpl
ric-common/Common-Template/helm/ric-common/templates/_serviceaccountname.tpl
ric-common/Common-Template/helm/ric-common/templates/_servicename.tpl
ric-infra/15-Chartmuseum/bin/clear_data_path [new file with mode: 0755]
ric-infra/15-Chartmuseum/bin/install [new file with mode: 0755]
ric-infra/15-Chartmuseum/bin/uninstall [new file with mode: 0755]
ric-infra/15-Chartmuseum/etc/chartmuseum.conf [new file with mode: 0644]
ric-infra/15-Chartmuseum/helm/chartmuseum/Chart.yaml [new file with mode: 0644]
ric-infra/15-Chartmuseum/helm/chartmuseum/requirements.yaml [new file with mode: 0644]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/_gen-cert.tpl [new file with mode: 0644]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/deployment.yaml [new file with mode: 0644]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/env.yaml [new file with mode: 0644]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/ingress.yaml [new file with mode: 0644]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/job-save-certs.yaml [new file with mode: 0644]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/persistentVolume.yaml [new file with mode: 0644]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/persistentVolumeClaim.yaml [new file with mode: 0644]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/secret.yaml [new file with mode: 0644]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/service.yaml [new file with mode: 0644]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/storageClass.yaml [new file with mode: 0644]
ric-infra/15-Chartmuseum/helm/chartmuseum/values.yaml [new file with mode: 0644]
ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml
ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml
ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml
ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml
ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml
ric-platform/50-RIC-Platform/helm/e2term/templates/env.yaml
ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml
ric-platform/50-RIC-Platform/helm/submgr/templates/deployment.yaml

index 3912aea..e20150a 100644 (file)
@@ -88,3 +88,11 @@ nexus:
   datapath: /tmp/nexus3-data/
   storagesize: 20Gi
 
+chartmuseum:
+  repositoryOverride: "registry.hub.docker.com"
+  image:
+    name: chartmuseum/chartmuseum
+    tag: v0.8.2
+
+  storagesize: 2Gi
+  datapath: /tmp/chartmuseum-data/
diff --git a/bin/package-ric-deployment-tools b/bin/package-ric-deployment-tools
new file mode 100755 (executable)
index 0000000..d932fb9
--- /dev/null
@@ -0,0 +1,116 @@
+#!/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.                                             #
+################################################################################
+
+# This script package RIC deployment tools as a debian package
+
+VERSION=$1
+
+if [ -z "$VERSION" ];then
+echo "Please provide a version number."
+exit 1
+
+fi
+
+DPKG_BUILDPACKAGE=$(whereis dpkg-buildpackage | awk '{print $2}')
+
+if [ -z "$DPKG_BUILDPACKAGE" ];then
+echo "dpkg-buildpackage not found. Please run \"apt install -y dpkg-dev\""
+exit 1
+
+fi
+
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+mkdir -p /tmp/ric-deployment-tools-$VERSION
+cp -r $DIR/../* /tmp/ric-deployment-tools-$VERSION/
+
+
+DIR=/tmp/ric-deployment-tools-$VERSION
+
+
+mkdir $DIR/debian
+
+cat <<EOF >$DIR/debian/changelog
+ric-deployment-tools ($VERSION) stable; urgency=low
+  
+  * Release $VERSION
+
+ -- Zhe Huang <zhehuang@research.att.com>  $(date -R)
+EOF
+
+cat <<EOF >$DIR/debian/compat
+9
+EOF
+
+cat <<EOF >$DIR/debian/control
+Source: ric-deployment-tools
+Section: Miscellaneous
+Priority: optional
+Maintainer: Zhe Huang <zhehuang@research.att.com>
+Build-Depends: debhelper (>= 9)
+Standards-Version: 4.1.2
+Homepage: https://gerrit.o-ran-sc.org/r/admin/repos/it/dep
+#Vcs-Git: https://anonscm.debian.org/git/collab-maint/ric-deployment.git
+#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/ric-deployment.git
+
+Package: ric-deployment-tools
+Architecture: all
+Depends: \${misc:Depends}
+Description: Utility tools to deploy RAN intelligent controller
+ ric-deployment-tools provides scripts and helm charts to deploy RIC platform components and RIC auxiliary functions.
+EOF
+
+cat <<EOF >$DIR/debian/rules
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+export DESTROOT=\$(CURDIR)/debian/ric-deployment-tools
+
+%:
+       dh \$@
+
+override_dh_auto_install:
+       dh_auto_install
+       install -d \$(DESTROOT)/opt/ric/ric-deployment-tools
+       rsync -a \$(CURDIR)/* \$(DESTROOT)/opt/ric/ric-deployment-tools --exclude debian
+# dh_make generated override targets
+# This is example for Cmake (See https://bugs.debian.org/641051 )
+#override_dh_auto_configure:
+#      dh_auto_configure -- #  -DCMAKE_LIBRARY_PATH=\$(DEB_HOST_MULTIARCH)
+
+
+EOF
+
+
+cd $DIR
+dpkg-buildpackage -us -uc
+
+
+echo "RIC it/dep repo has been packaged as /tmp/ric-deployment-tools_${VERSION}_all.deb."
index 9f89c39..1aba1a6 100644 (file)
@@ -20,38 +20,38 @@ Generate the URLS of the endpoints.
 */}}
 
 
-{{- define "dashboard.endpoint.a1mediator" -}}
+{{- define "dashboard.prefix.a1mediator" -}}
   {{- $ingress := ( include "common.ingressurl.ricplt" . ) -}}
-  {{- if .Values.dashboard.properties.a1med.url.override -}}
-    {{- printf "%s" .Values.dashboard.properties.a1med.url.override -}}
+  {{- if .Values.dashboard.properties.a1med.url.prefix -}}
+    {{- printf "%s" .Values.dashboard.properties.a1med.url.prefix -}}
   {{- else -}}
-    {{- printf "http://%s/a1mediator%s" $ingress .Values.dashboard.properties.a1med.url.suffix -}}
+    {{- printf "http://%s/a1mediator" $ingress -}}
   {{- end -}}
 {{- end -}}
 
-{{- define "dashboard.endpoint.anrxapp" -}}
+{{- define "dashboard.prefix.anrxapp" -}}
   {{- $ingress := ( include "common.ingressurl.ricxapp" . ) -}}
-  {{- if .Values.dashboard.properties.anrxapp.url.override -}}
-    {{- printf "%s" .Values.dashboard.properties.anrxapp.url.override -}}
+  {{- if .Values.dashboard.properties.anrxapp.url.prefix -}}
+    {{- printf "%s" .Values.dashboard.properties.anrxapp.url.prefix -}}
   {{- else -}}
-    {{- printf "http://%s/anr%s" $ingress .Values.dashboard.properties.anrxapp.url.suffix -}}
+    {{- printf "http://%s/anr" $ingress -}}
   {{- end -}}
 {{- end -}}
 
-{{- define "dashboard.endpoint.e2mgr" -}}
+{{- define "dashboard.prefix.e2mgr" -}}
   {{- $ingress := ( include "common.ingressurl.ricplt" . ) -}}
-  {{- if .Values.dashboard.properties.e2mgr.url.override -}}
-    {{- printf "%s" .Values.dashboard.properties.e2mgr.url.override -}}
+  {{- if .Values.dashboard.properties.e2mgr.url.prefix -}}
+    {{- printf "%s" .Values.dashboard.properties.e2mgr.url.prefix -}}
   {{- else -}}
-    {{- printf "http://%s/e2mgr%s" $ingress .Values.dashboard.properties.e2mgr.url.suffix -}}
+    {{- printf "http://%s/e2mgr" $ingress -}}
   {{- end -}}
 {{- end -}}
-    
-{{- define "dashboard.endpoint.xappmgr" -}}
+
+{{- define "dashboard.prefix.appmgr" -}}
   {{- $ingress := ( include "common.ingressurl.ricplt" . ) -}}
-  {{- if .Values.dashboard.properties.xappmgr.url.override -}}
-    {{- printf "%s" .Values.dashboard.properties.xappmgr.url.override -}}
+  {{- if .Values.dashboard.properties.appmgr.url.prefix -}}
+    {{- printf "%s" .Values.dashboard.properties.appmgr.url.prefix -}}
   {{- else -}}
-    {{- printf "http://%s/appmgr%s" $ingress .Values.dashboard.properties.xappmgr.url.suffix -}}
+    {{- printf "http://%s/appmgr" $ingress -}}
   {{- end -}}
 {{- end -}}
index 2b68de2..e6358c5 100644 (file)
@@ -26,9 +26,11 @@ data:
   application.properties: |
     # appconfig.yaml
     server.port = {{ .Values.dashboard.service.http.containerPort }}
-    a1med.url =   {{ include "dashboard.endpoint.a1mediator" . }}
-    anrxapp.url = {{ include "dashboard.endpoint.anrxapp" . }}
-    e2mgr.url =   {{ include "dashboard.endpoint.e2mgr" . }}
-    # mock names for R1 testing, removing this entry disables the mock
-    e2mgr.mock.rannames = {{ .Values.dashboard.properties.e2mgr.mock.rannames }}
-    xappmgr.url = {{ include "dashboard.endpoint.xappmgr" . }}
+    a1med.url.prefix =   {{ include "dashboard.prefix.a1mediator" . }}
+    a1med.url.suffix =   {{ .Values.dashboard.properties.a1med.url.suffix   }}
+    anrxapp.url.prefix = {{ include "dashboard.prefix.anrxapp" . }}
+    anrxapp.url.suffix = {{ .Values.dashboard.properties.anrxapp.url.suffix }}
+    appmgr.url.prefix =  {{ include "dashboard.prefix.appmgr" .  }}
+    appmgr.url.suffix =  {{ .Values.dashboard.properties.appmgr.url.suffix  }}
+    e2mgr.url.prefix =   {{ include "dashboard.prefix.e2mgr" .   }}
+    e2mgr.url.suffix =   {{ .Values.dashboard.properties.e2mgr.url.suffix   }}
index 17188ac..77a3a5c 100644 (file)
@@ -23,8 +23,8 @@ repositoryCred: docker-reg-cred
 
 dashboard:
   image:
-    name: ric-dash-be
-    tag: 1.0.5
+    name: ric-dashboard
+    tag: 1.2.0
   replicaCount: 1
   service:
     http:
@@ -33,34 +33,28 @@ dashboard:
       containerPort: 8080
   # config URLs must be specified at deployment
   properties:
-    # These URLs use K8S/Kong service names
+    # The URL prefixes use K8S/Kong service names
     a1med:
-      # The URL will be provided by the RIC common template
       url:
-        # no suffix required
-        suffix: ""
-        # You can override the URL using the following option
-        # override:  http://ricplt-entry/a1mediator
+        # The default a1mediator endpoint is http://ricplt-entry/a1mediator
+        # You can override the a1mediator endpoint using the following option
+        # prefix:
+        suffix: ''
     anrxapp:
-      # The URL will be provided by the RIC common template
       url:
-        # no suffix required
-        suffix: ""
-        # You can override the URL using the following option
-        # override:  http://ricxapp-entry/anr
-    e2mgr:
-      # The URL will be provided by the RIC common template
+        # The default anrxapp endpoint is http://ricxapp-entry/anr
+        # You can override the anrxapp endpoint using the following option
+        # prefix:
+        suffix: ''
+    appmgr:
       url:
-        # suffix must be "/v1"
-        suffix: "/v1"
-        # You can override the URL using the following option
-        # override:  http://ricplt-entry/e2mgr/v1
-      mock:
-        rannames: "" # mock with CSV; e.g., ABCD123456, EFGH123456
-    xappmgr:
-      # The URL will be provided by the RIC common template
+        # The default appmgr endpoint is http://ricplt-entry/appmgr
+        # You can override the appmgr endpoint using the following option
+        # prefix:
+        suffix: /ric/v1
+    e2mgr:
       url:
-        # suffix must be "/ric/v1"
-        suffix: "/ric/v1"
-        # You can override the URL using the following option
-        # override:  http://ricplt-entry/appmgr/ric/v1
+        # The default e2mgr endpoint is http://ricplt-entry/e2mgr
+        # You can override the e2mgr endpoint using the following option
+        # prefix:
+        suffix: /v1
index 1210d91..c9fcebf 100644 (file)
   {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{- define "common.configmapname.chartmuseum" -}}
+  {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
+  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{- define "common.configmapname.dashboard" -}}
   {{- $name := ( include "common.fullname.dashboard" . ) -}}
   {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
index e0dbc3b..b80a7ad 100644 (file)
   {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{- define "common.containername.chartmuseum" -}}
+  {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{- define "common.containername.dashboard" -}}
   {{- $name := ( include "common.fullname.dashboard" . ) -}}
   {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
index 3b11c3e..c7a0ed2 100644 (file)
   {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{- define "common.deploymentname.chartmuseum" -}}
+  {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
+  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{- define "common.deploymentname.dashboard" -}}
   {{- $name := ( include "common.fullname.dashboard" . ) -}}
   {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
index d10ebcf..ec5951f 100644 (file)
   {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{- define "common.ingressname.chartmuseum" -}}
+  {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
+  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{- define "common.ingressname.ves" -}}
   {{- $name := ( include "common.fullname.ves" . ) -}}
   {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
index 9ad9ffa..bbfce4f 100644 (file)
   {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{- define "common.name.chartmuseum" -}}
+  {{- if .Values.chartmuseum -}}
+    {{- if .Values.chartmuseum.nameOverride -}}
+      {{- printf "%s" .Values.chartmuseum.nameOverride -}}
+    {{- else -}}
+      {{- printf "chartmuseum" -}}
+    {{- end -}}
+  {{- else -}}
+    {{- printf "chartmuseum" -}}
+  {{- end -}}
+{{- end -}}
+
+
+{{- define "common.fullname.chartmuseum" -}}
+  {{- $name := ( include "common.name.chartmuseum" . ) -}}
+  {{- $namespace := ( include "common.namespace.infra" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
 
 {{- define "common.name.dashboard" -}}
   {{- if .Values.dashboard -}}
index fe463c2..36f91c4 100644 (file)
@@ -55,6 +55,8 @@
 
 {{- define "common.serviceport.nexus.http" -}}8080{{- end -}}
 
+{{- define "common.serviceport.chartmuseum.http" -}}8080{{- end -}}
+
 {{- define "common.serviceport.dashboard.http" -}}30080{{- end -}}
 {{- define "common.serviceport.dashboard.container" -}}8080{{- end -}}
 
@@ -68,4 +70,4 @@
 {{- define "common.serviceport.ves.http" -}}30235{{- end -}}
 {{- define "common.serviceport.ves.http.container" -}}8080{{- end -}}
 {{- define "common.serviceport.ves.https" -}}30417{{- end -}}
-{{- define "common.serviceport.ves.https.container" -}}8443{{- end -}}
\ No newline at end of file
+{{- define "common.serviceport.ves.https.container" -}}8443{{- end -}}
index 9daabc9..8e9c3f3 100644 (file)
   {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{- define "common.serviceaccountname.chartmuseum" -}}
+  {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
+  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{- define "common.serviceaccountname.dashboard" -}}
   {{- $name := ( include "common.fullname.dashboard" . ) -}}
   {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
index 81d2026..8af2a97 100644 (file)
   {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{- define "common.servicename.chartmuseum.http" -}}
+  {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
+  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{- define "common.servicename.dashboard.http" -}}
   {{- $name := ( include "common.fullname.dashboard" . ) -}}
   {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
diff --git a/ric-infra/15-Chartmuseum/bin/clear_data_path b/ric-infra/15-Chartmuseum/bin/clear_data_path
new file mode 100755 (executable)
index 0000000..f7a3780
--- /dev/null
@@ -0,0 +1,47 @@
+#!/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 )"
+
+
+
+
+
+
+if [ -z $OVERRIDEYAML ]; then
+
+  DATAPATH=$(cat $DIR/../helm/chartmuseum/values.yaml | awk '/^.*datapath:.*/{ print $2;}')
+  
+else
+  DATAPATH=$(cat $OVERRIDEYAML | awk '/^chartmuseum:.*/{ getline; while ( match($0, / .*/) || (!$0)){  if(getline == 0){break;}; if (match($0, /^ .*datapath:.*/)){print $2}} }')
+
+
+  if [ -z $DATAPATH ]; then
+    DATAPATH=$(cat $DIR/../helm/chartmuseum/values.yaml | awk '/^.*datapath:.*/{ print $2;}')
+  fi
+
+fi
+
+  rm -rf $DATAPATH
+
+  mkdir -p $DATAPATH
+
+
+  chmod -R a+rwx $DATAPATH
+
diff --git a/ric-infra/15-Chartmuseum/bin/install b/ric-infra/15-Chartmuseum/bin/install
new file mode 100755 (executable)
index 0000000..f1a3bb8
--- /dev/null
@@ -0,0 +1,94 @@
+#!/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/chartmuseum.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
+
+
+
+
+NODENAME=$(kubectl get node | awk 'NR==2{print $1}')
+kubectl label --overwrite nodes $NODENAME helm-node=enable
+
+DIRTEMP=$DIR
+. ./clear_data_path
+DIR=$DIRTEMP
+
+
+RICINFRA_COMPONENTS="chartmuseum"
+
+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
diff --git a/ric-infra/15-Chartmuseum/bin/uninstall b/ric-infra/15-Chartmuseum/bin/uninstall
new file mode 100755 (executable)
index 0000000..79ca2d7
--- /dev/null
@@ -0,0 +1,41 @@
+#!/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/chartmuseum.conf
+
+if [ -z "$RICINFRA_RELEASE_NAME" ];then
+   RELEASE_NAME=$helm_release_name
+else
+   RELEASE_NAME=$RICINFRA_RELEASE_NAME
+fi
+
+RICINFRA_COMPONENTS="chartmuseum"
+
+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
diff --git a/ric-infra/15-Chartmuseum/etc/chartmuseum.conf b/ric-infra/15-Chartmuseum/etc/chartmuseum.conf
new file mode 100644 (file)
index 0000000..92008b5
--- /dev/null
@@ -0,0 +1,37 @@
+################################################################################
+#   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
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/Chart.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/Chart.yaml
new file mode 100644 (file)
index 0000000..7594952
--- /dev/null
@@ -0,0 +1,23 @@
+################################################################################
+#   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.                                             #
+################################################################################
+
+
+apiVersion: v1
+description: A Helm chart for helm repository for RIC
+name: chartmuseum
+version: 0.0.1
+appVersion: 0.1
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/requirements.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/requirements.yaml
new file mode 100644 (file)
index 0000000..2ab71b4
--- /dev/null
@@ -0,0 +1,20 @@
+################################################################################
+#   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: ric-common
+    version: ~2.0.0
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/_gen-cert.tpl b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/_gen-cert.tpl
new file mode 100644 (file)
index 0000000..9dcbdb9
--- /dev/null
@@ -0,0 +1,29 @@
+################################################################################
+#   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.                                             #
+################################################################################i
+
+{{/*
+Generate certificates for the docker registry
+*/}}
+
+{{- define "chartmuseum.gen-cert" -}}
+{{- $altNames := list ( include "common.ingressurl.localhelm" . ) -}}
+{{- $ca := genCA "docker-registry-ca" 365 -}}
+{{- $cert := genSignedCert ( include "common.ingressurl.localhelm" . ) nil $altNames 365 $ca -}}
+tls.crt: {{ $cert.Cert | b64enc }}
+tls.key: {{ $cert.Key | b64enc }}
+{{- end -}}
+
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/deployment.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/deployment.yaml
new file mode 100644 (file)
index 0000000..c283c19
--- /dev/null
@@ -0,0 +1,63 @@
+################################################################################
+#   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.                                             #
+################################################################################
+
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ include "common.deploymentname.chartmuseum" .}}
+  labels:
+    app: {{ include "common.namespace.infra" . }}-{{ include "common.name.chartmuseum" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.chartmuseum.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ include "common.namespace.infra" . }}-{{ include "common.name.chartmuseum" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ include "common.namespace.infra" . }}-{{ include "common.name.chartmuseum" . }}
+        release: {{ .Release.Name }}
+    spec:
+      hostname: {{ .Chart.Name }}
+      imagePullSecrets:
+        - name: {{ include "common.repositoryCred" . }}
+      containers:
+        - name: {{ include "common.containername.chartmuseum" . }} 
+          image: {{ include "common.repository" . }}/{{ .Values.chartmuseum.image.name }}:{{ .Values.chartmuseum.image.tag }}
+          imagePullPolicy: {{ include "common.pullPolicy" . }}
+          envFrom:
+            - configMapRef:
+                name: {{ include "common.configmapname.chartmuseum" . }}-env
+          #          volumeMounts:
+          #- name: certs
+          #  mountPath: /var/run/certs
+          #  readOnly: true
+          ports:
+            - name: http
+              containerPort: {{ include "common.serviceport.chartmuseum.http" . }}
+              protocol: TCP
+          volumeMounts:
+            - name: chart-data
+              mountPath: /charts
+      volumes:
+        - name: chart-data
+          persistentVolumeClaim:
+            claimName: pvc-{{ include "common.name.chartmuseum" . }}
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/env.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/env.yaml
new file mode 100644 (file)
index 0000000..8565e88
--- /dev/null
@@ -0,0 +1,24 @@
+################################################################################
+#   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.                                             #
+################################################################################
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.configmapname.chartmuseum" . }}-env
+data:
+   DEBUG: "true"
+   STORAGE: "local"
+   STORAGE_LOCAL_ROOTDIR: "/charts"
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/ingress.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/ingress.yaml
new file mode 100644 (file)
index 0000000..8ecd7e1
--- /dev/null
@@ -0,0 +1,33 @@
+################################################################################
+#   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.                                             #
+################################################################################
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ include "common.ingressname.chartmuseum" . }}
+spec:
+  tls:
+    - hosts:
+      - {{ include "common.ingressurl.localhelm" . }}
+      secretName: secret-{{ include "common.name.chartmuseum" . }}
+  rules:
+    - host: {{ include "common.ingressurl.localhelm" . }}
+      http:
+        paths:
+          - backend:
+              serviceName: {{ include "common.servicename.chartmuseum.http" . }}
+              servicePort: http
+            path: "/"
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/job-save-certs.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/job-save-certs.yaml
new file mode 100644 (file)
index 0000000..01f5ac6
--- /dev/null
@@ -0,0 +1,44 @@
+################################################################################
+#   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.                                             #
+################################################################################
+
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: job-{{ include "common.fullname.chartmuseum" . }}-save-certs
+spec:
+  template:
+    spec:
+      containers:
+      - name: cert-copy
+        image: alpine
+        command: [ "/bin/sh","-c","cp -rL /var/run/helmcerts/..data/tls.crt /var/run/certs-copy/helmtls.crt"]
+        #        command: ["tail", "-f", "/dev/null"]
+        volumeMounts:
+        - name: helmcerts
+          mountPath: /var/run/helmcerts
+          readOnly: true
+        - name:  write-to-volume
+          mountPath: /var/run/certs-copy
+      volumes:
+      - name: helmcerts
+        secret:
+          secretName: secret-{{ include "common.name.chartmuseum" . }}
+      - name: write-to-volume
+        hostPath:
+          path: /tmp
+      restartPolicy: Never
+  backoffLimit: 4
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/persistentVolume.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/persistentVolume.yaml
new file mode 100644 (file)
index 0000000..93127ca
--- /dev/null
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-{{ include "common.name.chartmuseum" . }}
+spec:
+  capacity:
+    storage: {{ .Values.chartmuseum.storagesize }}
+  accessModes:
+  - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: storageclass-{{ include "common.name.chartmuseum" . }}
+  local:
+    path: {{ .Values.chartmuseum.datapath }}
+  nodeAffinity:
+    required:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: helm-node
+          operator: In
+          values:
+          - enable
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/persistentVolumeClaim.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/persistentVolumeClaim.yaml
new file mode 100644 (file)
index 0000000..11e0314
--- /dev/null
@@ -0,0 +1,11 @@
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name:  pvc-{{ include "common.name.chartmuseum" . }}
+spec:
+  accessModes:
+  - ReadWriteOnce
+  storageClassName: storageclass-{{ include "common.name.chartmuseum" . }} 
+  resources:
+    requests:
+      storage: {{ .Values.chartmuseum.storagesize }}
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/secret.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/secret.yaml
new file mode 100644 (file)
index 0000000..5490528
--- /dev/null
@@ -0,0 +1,27 @@
+################################################################################
+#   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.                                             #
+################################################################################
+
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/tls
+metadata:
+  name: secret-{{ include "common.name.chartmuseum" . }}
+  annotations:
+    "helm.sh/hook": "pre-install"
+    "helm.sh/hook-delete-policy": "before-hook-creation"
+data:
+{{ ( include "chartmuseum.gen-cert" . ) | indent 2 }}
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/service.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/service.yaml
new file mode 100644 (file)
index 0000000..89e3592
--- /dev/null
@@ -0,0 +1,37 @@
+################################################################################
+#   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.                                             #
+################################################################################
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.servicename.chartmuseum.http" . }}
+  namespace: {{ include "common.namespace.infra" . }}
+  labels:
+    app: {{ include "common.namespace.infra" . }}-{{ include "common.name.chartmuseum" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: ClusterIP
+  ports:
+    - port: {{ include "common.serviceport.chartmuseum.http" . }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ include "common.namespace.infra" . }}-{{ include "common.name.chartmuseum" . }}
+    release: {{ .Release.Name }}
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/storageClass.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/storageClass.yaml
new file mode 100644 (file)
index 0000000..85eed19
--- /dev/null
@@ -0,0 +1,6 @@
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  name: storageclass-{{ include "common.name.chartmuseum" . }}
+provisioner: kubernetes.io/no-provisioner
+volumeBindingMode: WaitForFirstConsumer
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/values.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/values.yaml
new file mode 100644 (file)
index 0000000..203a678
--- /dev/null
@@ -0,0 +1,37 @@
+################################################################################
+#   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.                                             #
+################################################################################
+
+# Default values for nexus.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+repository: "registry.hub.docker.com"
+imagePullPolicy: IfNotPresent
+repositoryCred: docker-reg-cred
+helmRepositoryCert: xapp-mgr-certs
+
+chartmuseum:
+  replicaCount: 1
+
+
+# This is designed to be deployed using local image
+  image:
+    name: chartmuseum/chartmuseum
+    tag: v0.8.2
+
+
+  storagesize: 2Gi
+  datapath: /tmp/chartmuseum-data/
index ffa41a3..d6acd6e 100644 (file)
@@ -34,6 +34,10 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.a1mediator.annotations }}
+      annotations:
+        {{- .Values.a1mediator.annotations | nindent 8 -}}
+      {{ end }}
       labels:
         app: {{ include "common.namespace.platform" . }}-{{ include "common.name.a1mediator" . }}
         release: {{ .Release.Name }}
index d07c0ab..e92e4ed 100644 (file)
@@ -40,4 +40,3 @@ a1mediator:
   rmr_timeout_config:
     rcv_retry_interval_ms: 500
     rcv_retry_times: 20
-
index 5620cd0..ce05589 100644 (file)
@@ -33,6 +33,10 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.appmgr.annotations }}
+      annotations:
+        {{- .Values.appmgr.annotations | nindent 8 -}}
+      {{ end }}
       labels:
         app: {{ include "common.namespace.platform" . }}-{{ include "common.name.appmgr" . }}
         release: {{ .Release.Name }}
index fb6ec81..7095b18 100644 (file)
@@ -33,6 +33,10 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.dbaas.annotations }}
+      annotations:
+        {{- .Values.dbaas.annotations | nindent 8 -}}
+      {{ end }}
       labels:
         app: {{ include "common.namespace.platform" . }}-{{ include "common.name.dbaas" . }}
         release: {{ .Release.Name }}
index 5693287..c10fa6b 100644 (file)
@@ -33,6 +33,10 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.e2mgr.annotations }}
+      annotations:
+        {{- .Values.e2mgr.annotations | nindent 8 -}}
+      {{ end }}
       labels:
         app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2mgr" . }}
         release: {{ .Release.Name }}
index 6c6d71d..ed80b84 100644 (file)
@@ -33,6 +33,10 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.e2term.annotations }}
+      annotations:
+        {{- .Values.e2term.annotations | nindent 8 -}}
+      {{ end }}
       labels:
         app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2term" . }}
         release: {{ .Release.Name }}
index b796de5..2183db1 100644 (file)
@@ -24,6 +24,8 @@ data:
   DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
   DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} 
   RMR_RTG_SVC: {{ include "common.serviceport.e2term.rmr.route" . | quote }}
+  RMR_SEED_RT: "router.txt"
+  RMR_VCTL_FILE: "/tmp/rmr_verbose"
   sctp: {{ include "common.serviceport.e2term.sctp" . | quote }}
   nano: {{ include "common.serviceport.e2term.rmr.data" . | quote }}
   print: "{{ .Values.e2term.env.print }}"
index 2cffaa9..592309e 100644 (file)
@@ -33,6 +33,10 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.rtmgr.annotations }}
+      annotations:
+        {{- .Values.rtmgr.annotations | nindent 8 -}}
+      {{ end }}
       labels:
         app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rtmgr" . }}
         release: {{ .Release.Name }}
index bb4808a..2c66c7b 100644 (file)
@@ -38,6 +38,10 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.submgr.annotations }}
+      annotations:
+        {{- .Values.submgr.annotations | nindent 8 -}}
+      {{ end }}
       labels:
         app: {{ include "common.namespace.platform" . }}-{{ include "common.name.submgr" . }}
         release: {{ .Release.Name }}
@@ -62,4 +66,4 @@ spec:
               protocol: TCP
             - name: rmrdata
               containerPort: {{ include "common.serviceport.submgr.rmr.data" . }}
-              protocol: TCP
\ No newline at end of file
+              protocol: TCP