minor fix and house cleaning

[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 e20150a..5dcdd96 100644 (file)
--- 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
 
@@ -29,7 +29,7 @@ global:
   imagePullPolicy: Always
 
   # Helm repo that will be used by xApp manager
-  helmRepository: "https://helm-entry"
+  helmRepository: "http://aux-entry/helm"
 
   # Certificate of the helm repo
   helmRepositoryCert: xapp-mgr-certs
@@ -37,24 +37,48 @@ 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
+
+
+  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
 #-------------------------------------------------------------------------
@@ -62,7 +86,8 @@ global:
 cluster:
   deployK8S: false
   deployNexus: false
-  useLocalHelmRepo: false
+  deployK8SMonitoringStake: false
+  useLocalHelmRepo: true
   useLocalDockerRegistry: false
 
 credential:
@@ -80,19 +105,15 @@ credential:
     <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
 
 chartmuseum:
-  repositoryOverride: "registry.hub.docker.com"
+  repositoryOverride: "docker.io"
   image:
     name: chartmuseum/chartmuseum
     tag: v0.8.2
+  job:
+    image:
+      name: alpine
+      tag: latest
 
   storagesize: 2Gi
-  datapath: /tmp/chartmuseum-data/