X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=RECIPE_EXAMPLE%2FRIC_INFRA_RECIPE_EXAMPLE;h=6488385fba8a8e09d5fd81dc79df55c521eb5d0e;hb=f1e9d069ec4ae0e35202b1d508f2652986036342;hp=f5bea07ac7640602c4ef0f097617af2fbd915e07;hpb=bb6097c9e2fa2918028892b2c5e675841029bee9;p=it%2Fdep.git diff --git a/RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE index f5bea07a..6488385f 100644 --- a/RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE +++ b/RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE @@ -21,7 +21,7 @@ global: # Docker registry from which RIC platform components pull the images repository: nexus3.o-ran-sc.org:10004 - + # Name of the K8S docker credential that is onboarded by 20-credential repositoryCred: docker-reg-cred @@ -37,24 +37,49 @@ global: # Name of the K8S secret that contains the credential of the helm repo helmRepositoryCred: xapp-mgr-creds - # The name of the tiller that xApp helm client talks to - helmRepositoryTiller: tiller-deploy - # The namespace of the xApp helm tiller - helmRepositoryTillerNamespace: kube-system - - # The port the xApp helm tiller is listening to - helmRepositoryTillerPort: 44134 + # Endpoint of k8s API server + k8sAPIHost: https://kubernetes.default.svc.cluster.local/ # The ingress URL definitions for the ingress controller in four namespaces ingressurl: - platform: ricplt-entry - xapp: ricxapp-entry - aux: ricaux-entry - infra: ricinfra-entry - localnexus: nexus-entry - localhelm: helm-entry - localdocker: docker-entry + ric: ric-entry + aux: aux-entry + helm: helm-entry + + + tillers: + ricxapp: + name: ricxapp + nameSpace: ricxapp + deployNameSpace: ricinfra + image: + tillerTLSSecrets: + repository: nexus3.o-ran-sc.org:10004 + name: it-dep-secret + tag: 0.0.2 + tiller: + repository: gcr.io + name: kubernetes-helm/tiller + tag: v2.12.3 + secret: + create: true + tillerSecretName: secret-tiller-ricxapp + helmSecretName: secret-helm-client-ricxapp + tls: + authenticate: true + verify: true + serviceAccount: + name: tiller + role: + - apiGroups: [""] + resources: ["pods", "configmaps", "services"] + verbs: ["get", "list", "create", "delete"] + - apiGroups: ["extensions", "apps"] + resources: ["deployments"] + verbs: ["get", "list", "create", "delete"] + port: 44134 + #------------------------------------------------------------------------- # Infrastructure #------------------------------------------------------------------------- @@ -81,13 +106,6 @@ credential: -----END CERTIFICATE----- -nexus: - image: - name: nexus-repository-helm-apt - tag: 1.0.0 - adminPassword: - datapath: /tmp/nexus3-data/ - storagesize: 20Gi chartmuseum: repositoryOverride: "registry.hub.docker.com"