topology CM lookup, inject into console-plugin deployment (#920)

* topology CM lookup, inject into console-plugin deployment Signed-off-by: Jason Madigan <[email protected]> * console-plugin: reuse topology configmap name and namespace (#929) Signed-off-by: Eguzki Astiz Lezaun <[email protected]> --------- Signed-off-by: Jason Madigan <[email protected]> Signed-off-by: Eguzki Astiz Lezaun <[email protected]> Co-authored-by: Eguzki Astiz Lezaun <[email protected]>
Kuadrant · Oct 10, 2024 · df87130 · df87130
1 parent 565274d
commit df87130
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/controllers/consoleplugin_reconciler.go b/controllers/consoleplugin_reconciler.go
@@ -89,7 +89,7 @@ func (r *ConsolePluginReconciler) Run(eventCtx context.Context, _ []controller.R
 	}
 
 	// Deployment
-	deployment := consoleplugin.Deployment(r.namespace, ConsolePluginImageURL)
+	deployment := consoleplugin.Deployment(r.namespace, ConsolePluginImageURL, TopologyConfigMapName)
 	deploymentMutators := make([]reconcilers.DeploymentMutateFn, 0)
 	deploymentMutators = append(deploymentMutators, reconcilers.DeploymentImageMutator)
 	if !topologyExists {

diff --git a/pkg/openshift/consoleplugin/deployment.go b/pkg/openshift/consoleplugin/deployment.go
@@ -80,7 +80,7 @@ func DeploymentLabels(namespace string) map[string]string {
 	return result
 }
 
-func Deployment(ns, image string) *appsv1.Deployment {
+func Deployment(ns, image, topologyName string) *appsv1.Deployment {
 	return &appsv1.Deployment{
 		TypeMeta: metav1.TypeMeta{Kind: "Deployment", APIVersion: "apps/v1"},
 		ObjectMeta: metav1.ObjectMeta{
@@ -108,6 +108,10 @@ func Deployment(ns, image string) *appsv1.Deployment {
 							},
 							ImagePullPolicy: corev1.PullAlways,
 							VolumeMounts:    DeploymentVolumeMounts(),
+							Env: []corev1.EnvVar{
+								{Name: "TOPOLOGY_CONFIGMAP_NAME", Value: topologyName},
+								{Name: "TOPOLOGY_CONFIGMAP_NAMESPACE", Value: ns},
+							},
 						},
 					},
 					Volumes:       DeploymentVolumes(),

diff --git a/pkg/openshift/consoleplugin/nginx_configmap.go b/pkg/openshift/consoleplugin/nginx_configmap.go
@@ -34,6 +34,9 @@ http {
 		location / {
 			root                /usr/share/nginx/html;
 		}
+		location /config.js {
+			root /tmp;
+		}
 	}
 }
 `,