Update ScalityUI and ScalityUIComponentExposer to standardize ConfigMap naming

Author: ZiyangLinScality

config/crd/bases/ui.scality.com_scalityuis.yaml

@@ -49,8 +49,8 @@ spec:
                 type: string
               image:
                 description: |-
-                  Image specifies the container image to be used for the Scality UI.
-                  This should be a valid container image reference, including the tag.
+                  INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
+                  Important: Run "make" to regenerate code after modifying this file
                 type: string
               logo:
                 type: string

internal/controller/scalityui_controller.go

@@ -122,8 +122,8 @@ func (r *ScalityUIReconciler) createOrUpdateDeployment(ctx context.Context, depl
 
 		mountPath := "/usr/share/nginx/html/shell"
 		configVolumeName := scalityui.Name + "-config-volume"
-		deployedAppsVolumeName := scalityui.Name + "-deployed-apps-volume"
-		configMapDeployedAppsName := scalityui.Name + "-deployed-apps"
+		deployedAppsVolumeName := scalityui.Name + "-deployed-ui-apps-volume"
+		configMapDeployedAppsName := scalityui.Name + "-deployed-ui-apps"
 
 		zero := intstr.FromInt(0)
 		one := intstr.FromInt(1)
@@ -264,7 +264,7 @@ func (r *ScalityUIReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	// ConfigMap for config.json is ensured to exist by createOrUpdateOwnedConfigMap
 
 	// Define ConfigMap for deployed-ui-apps.json
-	configMapDeployedAppsName := scalityui.Name + "-deployed-apps"
+	configMapDeployedAppsName := scalityui.Name + "-deployed-ui-apps"
 	configMapDeployedApps := &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      configMapDeployedAppsName,

internal/controller/scalityui_controller_test.go

@@ -43,7 +43,7 @@ var _ = Describe("ScalityUI Controller", func() {
 			productName              = "Test Product"
 			imageName                = "nginx:latest"
 			baseMountPath            = "/usr/share/nginx/html/shell" // Updated to match controller
-			configMapDeployedAppsExt = "-deployed-apps"
+			configMapDeployedAppsExt = "-deployed-ui-apps"
 		)
 
 		ctx := context.Background()
@@ -150,7 +150,7 @@ var _ = Describe("ScalityUI Controller", func() {
 			Expect(themesData["light"]).To(HaveKeyWithValue("name", "artescaLight"))
 			Expect(themesData["dark"]).To(HaveKeyWithValue("name", "darkRebrand"))
 
-			// Verify deployed-apps ConfigMap
+			// Verify deployed-ui-apps ConfigMap
 			deployedAppsCm := &corev1.ConfigMap{}
 			Eventually(func() error {
 				return k8sClient.Get(ctx, types.NamespacedName{Name: resourceName + configMapDeployedAppsExt, Namespace: resourceNamespace}, deployedAppsCm)
@@ -175,7 +175,7 @@ var _ = Describe("ScalityUI Controller", func() {
 					SubPath:   "config.json",
 				},
 				corev1.VolumeMount{
-					Name:      resourceName + "-deployed-apps-volume",
+					Name:      resourceName + "-deployed-ui-apps-volume",
 					MountPath: filepath.Join(baseMountPath, "deployed-ui-apps.json"),
 					SubPath:   "deployed-ui-apps.json",
 				},
@@ -196,7 +196,7 @@ var _ = Describe("ScalityUI Controller", func() {
 					},
 				},
 				corev1.Volume{
-					Name: resourceName + "-deployed-apps-volume",
+					Name: resourceName + "-deployed-ui-apps-volume",
 					VolumeSource: corev1.VolumeSource{
 						ConfigMap: &corev1.ConfigMapVolumeSource{
 							LocalObjectReference: corev1.LocalObjectReference{Name: resourceName + configMapDeployedAppsExt},

internal/controller/scalityuicomponentexposer_controller.go

@@ -496,21 +496,10 @@ func (r *ScalityUIComponentExposerReconciler) reconcileScalityUIDeployedApps(ctx
 		Namespace: ui.Namespace,
 	}, configMap)
 
-	if err != nil && !errors.IsNotFound(err) {
+	if err != nil {
 		return fmt.Errorf("failed to get deployed-ui-apps ConfigMap: %w", err)
 	}
 
-	// Initialize empty ConfigMap if not found
-	if errors.IsNotFound(err) {
-		configMap = &corev1.ConfigMap{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      configMapName,
-				Namespace: ui.Namespace,
-			},
-			Data: make(map[string]string),
-		}
-	}
-
 	logger.Info("Reconciling deployed-ui-apps ConfigMap",
 		"namespace", configMap.Namespace,
 		"name", configMap.Name)
@@ -589,7 +578,7 @@ func (r *ScalityUIComponentExposerReconciler) reconcileScalityUIDeployedApps(ctx
 
 // TODO: This is a temporary function to determine the URL for the component.
 func determineComponentURL(component *uiv1alpha1.ScalityUIComponent) string {
-	ingressPath := fmt.Sprintf("http://localhost:7780%s", component.Status.PublicPath)
+	ingressPath := component.Status.PublicPath
 
 	return ingressPath
 }

internal/controller/scalityuicomponentexposer_controller_test.go

@@ -117,6 +117,20 @@ var _ = Describe("ScalityUIComponentExposer Controller", func() {
 				Expect(k8sClient.Create(ctx, deployment)).To(Succeed())
 			}
 
+			deployedAppsConfigMap := &corev1.ConfigMap{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      uiName + "-deployed-ui-apps",
+					Namespace: testNamespace,
+				},
+				Data: map[string]string{
+					"deployed-ui-apps.json": "[]",
+				},
+			}
+			err = k8sClient.Get(ctx, types.NamespacedName{Name: uiName + "-deployed-ui-apps", Namespace: testNamespace}, &corev1.ConfigMap{})
+			if err != nil && errors.IsNotFound(err) {
+				Expect(k8sClient.Create(ctx, deployedAppsConfigMap)).To(Succeed())
+			}
+
 			// Finally create the ScalityUIComponentExposer
 			err = k8sClient.Get(ctx, typeNamespacedName, scalityuicomponentexposer)
 			if err != nil && errors.IsNotFound(err) {
@@ -176,6 +190,13 @@ var _ = Describe("ScalityUIComponentExposer Controller", func() {
 			if err == nil {
 				Expect(k8sClient.Delete(ctx, ui)).To(Succeed())
 			}
+
+			// Cleanup deployed-ui-apps ConfigMap
+			deployedAppsConfigMap := &corev1.ConfigMap{}
+			err = k8sClient.Get(ctx, types.NamespacedName{Name: uiName + "-deployed-ui-apps", Namespace: testNamespace}, deployedAppsConfigMap)
+			if err == nil {
+				Expect(k8sClient.Delete(ctx, deployedAppsConfigMap)).To(Succeed())
+			}
 		})
 
 		It("should successfully reconcile the resource", func() {