aether-roc-umbrella: Release 0.0.29 (#257)

onosproject · Mar 2, 2021 · 42b88c4 · 42b88c4
1 parent 8598fe0
commit 42b88c4
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 77 deletions.
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
@@ -7,7 +7,7 @@ name: aether-roc-umbrella
 description: Aether ROC Umbrella chart to deploy all Aether ROC
 kubeVersion: ">=1.17.0"
 type: application
-version: 0.0.28
+version: 0.0.29
 appVersion: v0.0.0
 keywords:
   - aether
@@ -29,10 +29,10 @@ dependencies:
     condition: import.onos-gui.enabled
     repository: https://charts.onosproject.org
     version: 1.0.2
-  - name: onos-sdran-cli
-    condition: import.onos-sdran-cli.enabled
-    repository: "@sdran"
-    version: 1.0.0
+  - name: onos-cli
+    condition: import.onos-cli.enabled
+    repository: https://charts.onosproject.org
+    version: 1.0.3
   - name: aether-roc-api
     condition: import.aether-roc-api.enabled
     repository: "@sdran"

diff --git a/aether-roc-umbrella/files/configs/set.connectivity-service-demo.gnmi b/aether-roc-umbrella/files/configs/set.connectivity-service-demo.gnmi
diff --git a/aether-roc-umbrella/files/configs/set.group-menlo-admins.gnmi b/aether-roc-umbrella/files/configs/set.group-menlo-admins.gnmi
@@ -1,13 +1,13 @@
 prefix: <
-    target: 'internal'
+    target: 'rbac'
     elem: <
         name: 'rbac'
     >
     elem: <
         name: 'group'
         key:<
             key:'groupid'
-            value:'menlo-admins'
+            value:'thirdGroup'
          >
      >
 >

diff --git a/aether-roc-umbrella/files/configs/set.group-menlo-guest.gnmi b/aether-roc-umbrella/files/configs/set.group-menlo-guest.gnmi
@@ -1,13 +1,13 @@
 prefix: <
-    target: 'internal'
+    target: 'rbac'
     elem: <
         name: 'rbac'
     >
     elem: <
         name: 'group'
         key:<
             key:'groupid'
-            value:'menlo-guest'
+            value:'secondGroup'
          >
      >
 >

diff --git a/aether-roc-umbrella/files/configs/set.group-menlo-ops.gnmi b/aether-roc-umbrella/files/configs/set.group-menlo-ops.gnmi
@@ -1,13 +1,13 @@
 prefix: <
-    target: 'internal'
+    target: 'rbac'
     elem: <
         name: 'rbac'
     >
     elem: <
         name: 'group'
         key:<
             key:'groupid'
-            value:'menlo-ops'
+            value:'testGroup'
          >
      >
 >

diff --git a/aether-roc-umbrella/files/configs/set.roles-sdcore-all-everything.gnmi b/aether-roc-umbrella/files/configs/set.roles-sdcore-all-everything.gnmi
@@ -1,5 +1,5 @@
 prefix: <
-    target: 'internal'
+    target: 'rbac'
     elem: <
         name: 'rbac'
     >

diff --git a/aether-roc-umbrella/files/configs/set.roles-sdcore-read-everything.gnmi b/aether-roc-umbrella/files/configs/set.roles-sdcore-read-everything.gnmi
@@ -1,5 +1,5 @@
 prefix: <
-    target: 'internal'
+    target: 'rbac'
     elem: <
         name: 'rbac'
     >

diff --git a/aether-roc-umbrella/files/configs/set.roles-sdcore-update-subscriber.gnmi b/aether-roc-umbrella/files/configs/set.roles-sdcore-update-subscriber.gnmi
@@ -1,5 +1,5 @@
 prefix: <
-    target: 'internal'
+    target: 'rbac'
     elem: <
         name: 'rbac'
     >

diff --git a/aether-roc-umbrella/templates/post-install-config-job.yaml b/aether-roc-umbrella/templates/post-install-config-job.yaml
diff --git a/aether-roc-umbrella/templates/post-install-topo-job.yaml b/aether-roc-umbrella/templates/post-install-topo-job.yaml
@@ -29,16 +29,15 @@ spec:
       restartPolicy: Never
       containers:
         {{- if index .Values "import" "onos-topo" "enabled" }}
-          {{- if index .Values "onos-sdran-cli" "postInstall" "topo"}}
+          {{- if index .Values "onos-cli" "postInstall" "topo"}}
         - name: post-install-topo-new-job
-          image: {{ index .Values "onos-sdran-cli" "image" "repository" }}:{{ index .Values "onos-sdran-cli" "image" "tag" }}
-          imagePullPolicy: {{ index .Values "onos-sdran-cli" "image" "pullPolicy" }}
-          command: ["/usr/local/bin/sdran"]
+          image: {{ index .Values "onos-cli" "image" "repository" }}:{{ index .Values "onos-cli" "image" "tag" }}
+          imagePullPolicy: {{ index .Values "onos-cli" "image" "pullPolicy" }}
+          command: ["/usr/local/bin/onos"]
           args:
           - "topo"
           - "load"
-          - "yamlentities"
-          - {{ index .Values "onos-sdran-cli" "postInstall" "topo" }}
+          - {{ index .Values "onos-cli" "postInstall" "topo" }}
           volumeMounts:
             - name: config
               mountPath: /home/onos

diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
@@ -30,7 +30,7 @@ import:
     enabled: true
   onos-gui:
     enabled: true
-  onos-sdran-cli:
+  onos-cli:
     enabled: true
   aether-roc-api:
     enabled: true
@@ -73,7 +73,7 @@ onos-config:
 onos-gui: {}
 
 # ONOS-CLI
-onos-sdran-cli:
+onos-cli:
   postInstall:
     placeholder: true
     topo: spgw-1-topo-entities.yaml