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
Update a1 helm chart from r2 to amber/r3
[it/dep.git]
/
RECIPE_EXAMPLE
/
RIC_INFRA_RECIPE_EXAMPLE
diff --git
a/RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
b/RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
index
81ed90b
..
60c22b2
100644
(file)
--- a/
RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
+++ b/
RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
@@
-19,8
+19,15
@@
# 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
@@
-29,7
+36,7
@@
global:
imagePullPolicy: Always
# Helm repo that will be used by xApp manager
imagePullPolicy: Always
# Helm repo that will be used by xApp manager
- helmRepository: "http
s://helm-entry
"
+ helmRepository: "http
://10.0.2.100:32080/helm
"
# Certificate of the helm repo
helmRepositoryCert: xapp-mgr-certs
# Certificate of the helm repo
helmRepositoryCert: xapp-mgr-certs
@@
-37,11
+44,15
@@
global:
# Name of the K8S secret that contains the credential of the helm repo
helmRepositoryCred: xapp-mgr-creds
# Name of the K8S secret that contains the credential of the helm repo
helmRepositoryCred: xapp-mgr-creds
+
+ # Endpoint of k8s API server
+ k8sAPIHost: https://kubernetes.default.svc.cluster.local/
+
# The ingress URL definitions for the ingress controller in four namespaces
ingressurl:
ric: ric-entry
aux: aux-entry
# The ingress URL definitions for the ingress controller in four namespaces
ingressurl:
ric: ric-entry
aux: aux-entry
-
helm: helm
-entry
+
dashboard: dashboard
-entry
tillers:
ricxapp:
tillers:
ricxapp:
@@
-50,9
+61,9
@@
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
name: it-dep-secret
- tag: 0.0.
1
+ tag: 0.0.
2
tiller:
repository: gcr.io
name: kubernetes-helm/tiller
tiller:
repository: gcr.io
name: kubernetes-helm/tiller
@@
-79,41
+90,52
@@
global:
# Infrastructure
#-------------------------------------------------------------------------
# Infrastructure
#-------------------------------------------------------------------------
-cluster:
- deployK8S: false
- deployNexus: false
- deployK8SMonitoringStake: false
- useLocalHelmRepo: false
- useLocalDockerRegistry: false
credential:
repositoryCredential:
credential:
repositoryCredential:
- user:
<DOCKER USER NAME>
- password:
<DOCKER PASSWORD>
+ user:
docker
+ password:
docker
helmrepoCredential:
helmrepoCredential:
- user:
<HELM USER NAME>
- password:
<HELM PASSWORD>
+ user:
helm
+ password:
helm
helmCertificate: |2
-----BEGIN CERTIFICATE-----
<CERT FOR HELM>
-----END CERTIFICATE-----
helmCertificate: |2
-----BEGIN CERTIFICATE-----
<CERT FOR HELM>
-----END CERTIFICATE-----
-nexus:
- image:
- name: nexus-repository-helm-apt
- tag: 1.0.0
- adminPassword: <NEXUS ADMIN PASSWORD>
- datapath: /tmp/nexus3-data/
- storagesize: 20Gi
+k8s:
+ enable: false
chartmuseum:
chartmuseum:
- repositoryOverride: "registry.hub.docker.com"
+ enable: true
+ repositoryOverride: "docker.io"
image:
name: chartmuseum/chartmuseum
tag: v0.8.2
image:
name: chartmuseum/chartmuseum
tag: v0.8.2
-
+ job:
+ image:
+ name: alpine
+ tag: latest
storagesize: 2Gi
storagesize: 2Gi
- datapath: /tmp/chartmuseum-data/
+ datapath: /opt/data/chartmuseum-data
+
+
+elfkp:
+ enable: false
+
+kong:
+ proxy:
+ http:
+ containerPort: 32080
+ tls:
+ containerPort: 32443
+ image:
+ repository: kong
+ tag: 1.3
+ ingressController:
+ image:
+ repository: kong-docker-kubernetes-ingress-controller.bintray.io/kong-ingress-controller
+ tag: 0.6.0