Code Review
/
it
/
dep.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Changes in helm chart due to xapp-fwk adaptation in rtmgr"
[it/dep.git]
/
RECIPE_EXAMPLE
/
RIC_PLATFORM_RECIPE_EXAMPLE
diff --git
a/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
b/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
index
0d9f1cc
..
63cd42f
100644
(file)
--- a/
RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
+++ b/
RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
@@
-19,8
+19,14
@@
# Global common setting
#-------------------------------------------------------------------------
global:
# Global common setting
#-------------------------------------------------------------------------
global:
+ releasePrefix: r1
+ namespace:
+ xapp: ricxapp
+ infra: ricinfra
+ platform: ricplt
+ aux: ricaux
# Docker registry from which RIC platform components pull the images
# Docker registry from which RIC platform components pull the images
- repository: nexus3.o-ran-sc.org:10004
+ repository: nexus3.o-ran-sc.org:10004
/o-ran-sc
# Name of the K8S docker credential that is onboarded by 20-credential
repositoryCred: docker-reg-cred
# Name of the K8S docker credential that is onboarded by 20-credential
repositoryCred: docker-reg-cred
@@
-44,6
+50,7
@@
global:
ingressurl:
ric: ric-entry
aux: aux-entry
ingressurl:
ric: ric-entry
aux: aux-entry
+ dashboard: dashboard-entry
tillers:
ricxapp:
tillers:
ricxapp:
@@
-52,7
+59,7
@@
global:
deployNameSpace: ricinfra
image:
tillerTLSSecrets:
deployNameSpace: ricinfra
image:
tillerTLSSecrets:
- repository: nexus3.o-ran-sc.org:10004
+ repository: nexus3.o-ran-sc.org:10004
/o-ran-sc
name: it-dep-secret
tag: 0.0.2
tiller:
name: it-dep-secret
tag: 0.0.2
tiller:
@@
-87,7
+94,7
@@
a1mediator:
# repositoryOverride:
image:
name: ric-plt-a1
# repositoryOverride:
image:
name: ric-plt-a1
- tag:
0.10.1
+ tag:
1.0.4
rmr_timeout_config:
rcv_retry_interval_ms: 500
rcv_retry_times: 20
rmr_timeout_config:
rcv_retry_interval_ms: 500
rcv_retry_times: 20
@@
-101,7
+108,7
@@
appmgr:
name: it-dep-init
tag: 0.0.1
name: ric-plt-appmgr
name: it-dep-init
tag: 0.0.1
name: ric-plt-appmgr
- tag: 0.1.
5
+ tag: 0.1.
10
@@
-113,7
+120,7
@@
dbaas:
iterminationGracePeriodSeconds: 0
image:
name: ric-plt-dbaas
iterminationGracePeriodSeconds: 0
image:
name: ric-plt-dbaas
- tag: 0.
1.0
+ tag: 0.
2.2
# E2 Manager
e2mgr:
# E2 Manager
e2mgr:
@@
-121,10
+128,10
@@
e2mgr:
# repositoryOverride:
image:
name: ric-plt-e2mgr
# repositoryOverride:
image:
name: ric-plt-e2mgr
- tag:
1.0.0
+ tag:
3.0.1
env:
RIC_ID: "bbbccc-abcd0e/20"
env:
RIC_ID: "bbbccc-abcd0e/20"
- privilegedmode:
tru
e
+ privilegedmode:
fals
e
# E2 Termination
# E2 Termination
@@
-133,11
+140,15
@@
e2term:
# repositoryOverride:
image:
name: ric-plt-e2
# repositoryOverride:
image:
name: ric-plt-e2
- tag:
1.0.0
+ tag:
3.0.1
env:
print: "1"
env:
print: "1"
- privilegedmode: true
- hostnetworkmode: true
+ privilegedmode: false
+ hostnetworkmode: false
+
+ dataVolSize: 100Mi
+ storageClassName: local-storage
+ #storageClassName: ric-storage-class
# Routing Manager
rtmgr:
# Routing Manager
rtmgr:
@@
-145,7
+156,7
@@
rtmgr:
# repositoryOverride:
image:
name: ric-plt-rtmgr
# repositoryOverride:
image:
name: ric-plt-rtmgr
- tag: 0.3.
2
+ tag: 0.3.
9
loglevel: DEBUG
# Subscription Manager
loglevel: DEBUG
# Subscription Manager
@@
-154,7
+165,7
@@
submgr:
# repositoryOverride:
image:
name: ric-plt-submgr
# repositoryOverride:
image:
name: ric-plt-submgr
- tag: 0.
5.0
+ tag: 0.
10.7
# VESPA Manager
vespamgr:
# VESPA Manager
vespamgr:
@@
-162,15
+173,29
@@
vespamgr:
# repositoryOverride:
image:
name: ric-plt-vespamgr
# repositoryOverride:
image:
name: ric-plt-vespamgr
- tag: 0.0.
1
+ tag: 0.0.
8
prometheusurl: "http://rec-prometheus-server.default"
prometheusurl: "http://rec-prometheus-server.default"
+# RAN Resource Monitor
+rsm:
+ image:
+ name: ric-plt-resource-status-manager
+ tag: 3.0.1
+
+# Jaeger Adapter
+jaegeradapter:
+ repositoryOverride: docker.io
+ image:
+ name: jaegertracing/all-in-one
+ tag: 1.12
+ pullPolicy: IfNotPresent
+
# the service for redirecting to AUX cluster
extsvcplt:
auxip:
# The ip address of the aux cluster ingress controller
# the service for redirecting to AUX cluster
extsvcplt:
auxip:
# The ip address of the aux cluster ingress controller
- <IP_ADDRESS of the RIC cluster>
+ 10.0.2.101
ricip:
# The ip address of the ric cluster ingress controller
ricip:
# The ip address of the ric cluster ingress controller
- <IP_ADDRESS of the RIC cluster>
+ 10.0.2.100