update about panel for ocrad-bower (#279)

* update about panel for ocrad-bower * add missing commas * update about on upgrade
IBM · Nov 30, 2021 · 5ebc974 · 5ebc974
1 parent 263d3e9
commit 5ebc974
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/deploy/crds/foundation.ibm.com_v1_navconfiguration_cr.yaml b/deploy/crds/foundation.ibm.com_v1_navconfiguration_cr.yaml
@@ -90,6 +90,7 @@ spec:
       - "inotify-tools, v3.14, GPL v2"
       - "logrotate, v3.8.6, GPL v2"
       - "checker-qual, version 2.0.0, GPLv2"
+      - "ocrad-bower, v1.0.0, GPL v3"
     copyright: "© 2018, 2020 IBM. All rights reserved."
   header:
     logoUrl: "/common-nav/graphics/ibm-cloudpack-logo.svg"

diff --git a/...log/ibm-commonui-operator/1.12.0/ibm-commonui-operator.v1.12.0.clusterserviceversion.yaml b/...log/ibm-commonui-operator/1.12.0/ibm-commonui-operator.v1.12.0.clusterserviceversion.yaml
@@ -167,7 +167,8 @@ metadata:
                 "ffi (Ruby Gem), 1.11.1, GPL",
                 "inotify-tools, v3.14, GPL v2",
                 "logrotate, v3.8.6, GPL v2",
-                "checker-qual, version 2.0.0, GPLv2"
+                "checker-qual, version 2.0.0, GPLv2",
+                "ocrad-bower, v1.0.0, GPL v3"
               ],
               "logoUrl": "IBM Cloud Pak | Administration Hub",
               "logoAltText": "IBM Cloud Pak | Administration Hub"

diff --git a/pkg/controller/commonwebuiservice/commonwebuiservice_controller.go b/pkg/controller/commonwebuiservice/commonwebuiservice_controller.go
@@ -901,6 +901,13 @@ func (r *ReconcileCommonWebUI) updateCustomResource(ctx context.Context, instanc
 			}
 		}
 		unstruct.Object["spec"].(map[string]interface{})["navItems"] = updatedNavItems
+
+		if nameOfCR == res.CommonWebUICr {
+			licenses := unstruct2.Object["spec"].(map[string]interface{})["about"].(map[string]interface{})["licenses"]
+			unstruct.Object["spec"].(map[string]interface{})["about"].(map[string]interface{})["licenses"] = licenses
+		}
+
+		//Update the CR
 		updateErr := r.client.Update(ctx, &unstruct)
 		if updateErr == nil {
 			reqLogger.Info("CLIENT UPDATED NAV CONFIG CR ")

diff --git a/pkg/resources/utils.go b/pkg/resources/utils.go
@@ -842,7 +842,8 @@ var NavConfigCR = `
 		  "ffi (Ruby Gem), 1.11.1, GPL",
 		  "inotify-tools, v3.14, GPL v2",
 		  "logrotate, v3.8.6, GPL v2",
-		  "checker-qual, version 2.0.0, GPLv2"
+		  "checker-qual, version 2.0.0, GPLv2",
+		  "ocrad-bower, v1.0.0, GPL v3"
 		],
 		"logoUrl": "IBM Cloud Pak | Administration Hub",
 		"logoAltText": "IBM Cloud Pak | Administration Hub"