sd-ran: post install job populates onos-topo and onos-config (#107)

Also fixed problem in onos-cli pod configmap Removed unused param in ran-simulator
onosproject · May 21, 2020 · 89446a8 · 89446a8
1 parent 1c39b44
commit 89446a8
Show file tree

Hide file tree

Showing 16 changed files with 43,188 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -12,6 +12,9 @@ publish: # @HELP publish version on github
 bumponosdeps: # @HELP update "onosproject" go dependencies and push patch to git.
 	./../build-tools/bump-onos-deps ${VERSION}
 
+clean: # @HELP clean up temporary files.
+	rm -rf sd-ran/charts sd-ran/Chart.lock
+
 help:
 	@grep -E '^.*: *# *@HELP' $(MAKEFILE_LIST) \
     | sort \

diff --git a/onos-cli/Chart.yaml b/onos-cli/Chart.yaml
@@ -3,7 +3,7 @@ name: onos-cli
 description: ONOS Command Line Interface
 kubeVersion: ">=1.17.0"
 type: application
-version: 0.0.2
+version: 0.0.3
 appVersion: v0.6.5
 keywords:
   - onos

diff --git a/onos-cli/templates/configmap.yaml b/onos-cli/templates/configmap.yaml
@@ -3,10 +3,5 @@ kind: ConfigMap
 metadata:
   name: {{ template "onos-cli.fullname" . }}
   namespace: {{ .Release.Namespace }}
-# The followign shoudl be under the atomix.yaml key, see
-# https://github.com/onosproject/onos-test/blob/master/pkg/onit/k8s/onos-cli.go#L104
 data:
-  {{ $root := . }}
-    {{ range $path, $bytes := .Files.Glob "files/configs/*.yaml" }}
-    {{ base $path }}: '{{ $root.Files.Get $path }}'
-    {{ end }}
+{{ (.Files.Glob "files/configs/*.yaml").AsConfig | indent 2 }}
diff --git a/ran-simulator/templates/deployment.yaml b/ran-simulator/templates/deployment.yaml
@@ -54,7 +54,6 @@ spec:
             - "-showRoutes={{ .Values.showRoutes }}"
             - "-stepDelayMs={{ .Values.stepDelayMs }}"
             - "-zoom={{ .Values.zoom }}"
-            - "-towerConfigName={{ .Values.towerConfigName }}"
           ports:
             - name: grpc
               containerPort: 5150

diff --git a/ran-simulator/values.yaml b/ran-simulator/values.yaml
@@ -21,7 +21,6 @@ showPower: true
 showRoutes: true
 stepDelayMs: 1000
 zoom: 13
-towerConfigName: berlin-honeycomb-4-3.yaml
 
 imagePullSecrets: []
 nameOverride: ""

diff --git a/sd-ran/Chart.yaml b/sd-ran/Chart.yaml
@@ -3,7 +3,7 @@ name: sd-ran
 description: Umbrella chart to deploy all ONOS-RIC and simulator
 kubeVersion: ">=1.17.0"
 type: application
-version: 0.0.8
+version: 0.0.9
 appVersion: v0.6.5
 keywords:
   - onos
@@ -63,4 +63,4 @@ dependencies:
   - name: onos-cli
     condition: import.onos-cli.enabled
     repository: https://charts.onosproject.org
-    version: 0.0.2
+    version: 0.0.3
diff --git a/sd-ran/files/configs/README.md b/sd-ran/files/configs/README.md
@@ -0,0 +1,9 @@
+# Config files
+
+Copied here from ran-simulator/pkg/config
+
+Available in /home/onos at runtime. Needed
+to populate onos-topo and onos-config through
+a post-install action on startup of sd-ran. 
+
+> TODO: automate the process of copying these