Release v0.1.2: namespace-aware plugin deployment

README.md

@@ -49,16 +49,16 @@ Install directly from the OCI registry — no need to clone this repo:
 
 ```bash
 helm install community-plugins-admin oci://quay.io/rh-ai-community-plugins/community-plugins-admin-chart \
-  --version 0.1.1 \
-  --namespace community-plugins-admin \
+  --version 0.1.2 \
+  --namespace cp-plugins-admin \
   --create-namespace
 ```
 
 Or, if you have a local checkout of the repository:
 
 ```bash
 helm install community-plugins-admin chart/ \
-  --namespace community-plugins-admin \
+  --namespace cp-plugins-admin \
   --create-namespace
 ```
 
@@ -83,7 +83,7 @@ config.append({
     'tls': False,
     'service': {
       'name': 'community-plugins-admin',
-      'namespace': 'community-plugins-admin',
+      'namespace': 'cp-plugins-admin',
       'port': 8080
     }
   },
@@ -94,7 +94,7 @@ config.append({
     'tls': False,
     'service': {
       'name': 'community-plugins-admin-bff',
-      'namespace': 'community-plugins-admin',
+      'namespace': 'cp-plugins-admin',
       'port': 3000
     }
   }]

bff/__tests__/lifecycleService.test.ts

@@ -43,6 +43,10 @@ const FAKE_METADATA = {
   install: { helm: { registry: 'oci://quay.io/charts/my-plugin' } },
   remote: { type: 'module-federation', spec: { name: 'myPlugin', scope: 'myPlugin', paths: [{ type: 'route', path: '/my-plugin' }] } },
 };
+const FAKE_METADATA_WITH_NS = {
+  ...FAKE_METADATA,
+  install: { namespace: 'cp-my-plugin', helm: { registry: 'oci://quay.io/charts/my-plugin' } },
+};
 
 beforeEach(() => {
   jest.resetAllMocks();
@@ -126,7 +130,7 @@ describe('upgradePlugin namespace handling', () => {
       'oci://quay.io/charts/my-plugin',
       'custom-ns',
       'token',
-      undefined,
+      { namespace: 'custom-ns' },
     );
   });
 
@@ -142,7 +146,7 @@ describe('upgradePlugin namespace handling', () => {
       'oci://quay.io/charts/my-plugin',
       'installed-ns',
       'token',
-      undefined,
+      { namespace: 'installed-ns' },
     );
   });
 
@@ -157,7 +161,23 @@ describe('upgradePlugin namespace handling', () => {
       'oci://quay.io/charts/my-plugin',
       'my-plugin',
       'token',
-      undefined,
+      { namespace: 'my-plugin' },
+    );
+  });
+
+  it('uses metadata namespace when discovery returns null', async () => {
+    mockDiscoverReleaseNamespace.mockResolvedValue(null);
+    mockGetPluginMetadata.mockResolvedValue(FAKE_METADATA_WITH_NS as never);
+
+    const result = await upgradePlugin('my-plugin', 'token');
+
+    expect(result.success).toBe(true);
+    expect(mockHelmUpgrade).toHaveBeenCalledWith(
+      'my-plugin',
+      'oci://quay.io/charts/my-plugin',
+      'cp-my-plugin',
+      'token',
+      { namespace: 'cp-my-plugin' },
     );
   });
 
@@ -258,7 +278,7 @@ describe('installPlugin', () => {
       'oci://quay.io/charts/my-plugin',
       'my-plugin',
       'token',
-      undefined,
+      { namespace: 'my-plugin' },
     );
     expect(mockAddPluginToConfig).toHaveBeenCalledWith(
       'token',
@@ -282,7 +302,7 @@ describe('installPlugin', () => {
       'oci://quay.io/charts/my-plugin',
       'custom-ns',
       'token',
-      undefined,
+      { namespace: 'custom-ns' },
     );
   });
 
@@ -361,6 +381,44 @@ describe('installPlugin', () => {
     expect(mockHelmUninstall).not.toHaveBeenCalled();
     expect(result.steps.find((s) => s.id === 'cleanup')).toBeUndefined();
   });
+
+  it('uses namespace from plugin metadata when no explicit namespace is provided', async () => {
+    mockGetPluginMetadata.mockResolvedValue(FAKE_METADATA_WITH_NS as never);
+
+    const result = await installPlugin('my-plugin', 'token');
+
+    expect(result.success).toBe(true);
+    expect(mockHelmInstall).toHaveBeenCalledWith(
+      'my-plugin',
+      'oci://quay.io/charts/my-plugin',
+      'cp-my-plugin',
+      'token',
+      { namespace: 'cp-my-plugin' },
+    );
+    expect(mockAddPluginToConfig).toHaveBeenCalledWith(
+      'token',
+      expect.objectContaining({
+        backend: expect.objectContaining({
+          service: { name: 'my-plugin', namespace: 'cp-my-plugin', port: 8080 },
+        }),
+      }),
+    );
+  });
+
+  it('explicit namespace overrides metadata namespace', async () => {
+    mockGetPluginMetadata.mockResolvedValue(FAKE_METADATA_WITH_NS as never);
+
+    const result = await installPlugin('my-plugin', 'token', 'override-ns');
+
+    expect(result.success).toBe(true);
+    expect(mockHelmInstall).toHaveBeenCalledWith(
+      'my-plugin',
+      'oci://quay.io/charts/my-plugin',
+      'override-ns',
+      'token',
+      { namespace: 'override-ns' },
+    );
+  });
 });
 
 describe('enablePlugin', () => {
@@ -381,6 +439,23 @@ describe('enablePlugin', () => {
     expect(result.steps.every((s) => s.status === 'completed')).toBe(true);
   });
 
+  it('uses metadata namespace when discovery returns null', async () => {
+    mockDiscoverReleaseNamespace.mockResolvedValue(null);
+    mockGetPluginMetadata.mockResolvedValue(FAKE_METADATA_WITH_NS as never);
+
+    const result = await enablePlugin('my-plugin', 'token');
+
+    expect(result.success).toBe(true);
+    expect(mockAddPluginToConfig).toHaveBeenCalledWith(
+      'token',
+      expect.objectContaining({
+        backend: expect.objectContaining({
+          service: { name: 'my-plugin', namespace: 'cp-my-plugin', port: 8080 },
+        }),
+      }),
+    );
+  });
+
   it('returns failure when plugin is not found in registry', async () => {
     mockGetRegistryPlugins.mockResolvedValue([]);
 

bff/package.json

@@ -1,6 +1,6 @@
 {
   "name": "community-plugins-admin-bff",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "BFF service for the Community Plugins Admin RHOAI dashboard plugin",
   "main": "dist/server.js",
   "scripts": {

bff/src/app.ts

@@ -17,6 +17,7 @@ app.use(express.json({ limit: '100kb' }));
 
 app.get('/api/health', (_req, res) => res.json({ status: 'ok' }));
 app.get('/api/config', (_req, res) => res.json({
+  bffNamespace: process.env.POD_NAMESPACE || 'cp-plugins-admin',
   dashboardNamespace: process.env.DASHBOARD_NAMESPACE || 'redhat-ods-applications',
   dashboardDeployment: process.env.DASHBOARD_DEPLOYMENT || 'rhods-dashboard',
 }));

bff/src/routes/catalog.ts

@@ -24,6 +24,7 @@ function buildCatalogPlugin(
   if (metadata.install) {
     install = {
       method: metadata.install.method,
+      namespace: metadata.install.namespace,
       helm: metadata.install.helm
         ? { chartPath: metadata.install.helm.chart_path, registry: metadata.install.helm.registry }
         : undefined,

bff/src/routes/lifecycle.ts

@@ -75,17 +75,23 @@ function sendSSE(
     'X-Accel-Buffering': 'no',
   });
 
+  const heartbeat = setInterval(() => {
+    res.write(': keepalive\n\n');
+  }, 15_000);
+
   const onProgress: LifecycleProgressCallback = (steps) => {
     const data = JSON.stringify({ steps: steps.map(s => ({ ...s })) });
     res.write(`event: progress\ndata: ${data}\n\n`);
   };
 
   serviceFn(onProgress)
     .then((result) => {
+      clearInterval(heartbeat);
       res.write(`event: complete\ndata: ${JSON.stringify(result)}\n\n`);
       res.end();
     })
     .catch(() => {
+      clearInterval(heartbeat);
       const fallback: LifecycleResponse = {
         success: false,
         message: 'Operation failed',

bff/src/server.ts

@@ -6,7 +6,7 @@ const PORT = parseInt(process.env.PORT || '3000', 10);
 app.listen(PORT, () => {
   try {
     const baseUrl = getK8sBaseUrl();
-    console.log(`BFF listening on port ${PORT}`);
+    console.log(`BFF listening on port ${PORT} (namespace: ${process.env.POD_NAMESPACE ?? 'unknown'})`);
     console.log(`K8s API target: ${baseUrl}`);
   } catch {
     console.error(`BFF listening on port ${PORT}`);

bff/src/services/helmService.ts

@@ -4,7 +4,7 @@ import * as os from 'os';
 import * as path from 'path';
 import { getK8sBaseUrl } from '../utils/k8sClient';
 
-const HELM_TIMEOUT_MS = 120_000;
+const HELM_TIMEOUT_MS = 330_000;
 const HELM_BIN = process.env.HELM_BIN || 'helm';
 
 export interface HelmRelease {

bff/src/services/lifecycleService.ts

@@ -37,6 +37,7 @@ function markFailed(step: LifecycleStep, error: string): void {
 async function resolvePluginChart(pluginName: string): Promise<{
   chart: string;
   repo: string;
+  namespace?: string;
   mfName: string;
   hasBff: boolean;
   routePath: string;
@@ -61,12 +62,13 @@ async function resolvePluginChart(pluginName: string): Promise<{
     throw new Error(`Plugin "${pluginName}" has no Helm chart configured`);
   }
 
+  const ns = metadata.install.namespace;
   const mfName = metadata.remote?.spec?.name ?? metadata.remote?.spec?.scope ?? kebabToCamelScope(pluginName);
   const hasBff = !!metadata.bff_image;
   const routeSpec = metadata.remote?.spec?.paths?.find((p) => p.type === 'route');
   const routePath = routeSpec?.path ?? `/${pluginName}`;
 
-  return { chart, repo: regEntry.repo, mfName, hasBff, routePath };
+  return { chart, repo: regEntry.repo, namespace: ns, mfName, hasBff, routePath };
 }
 
 export async function installPlugin(
@@ -83,19 +85,20 @@ export async function installPlugin(
   ];
   onProgress?.(steps);
 
+  let pluginInfo: Awaited<ReturnType<typeof resolvePluginChart>> | undefined;
   try {
     markRunning(steps[0]);
     onProgress?.(steps);
-    const pluginInfo = await resolvePluginChart(pluginName);
+    pluginInfo = await resolvePluginChart(pluginName);
     markCompleted(steps[0]);
     onProgress?.(steps);
 
-    const ns = namespace ?? pluginName;
+    const ns = namespace ?? pluginInfo.namespace ?? pluginName;
     const releaseName = pluginName;
 
     markRunning(steps[1]);
     onProgress?.(steps);
-    await helmInstall(releaseName, pluginInfo.chart, ns, token, values);
+    await helmInstall(releaseName, pluginInfo.chart, ns, token, { namespace: ns, ...values });
     markCompleted(steps[1]);
     onProgress?.(steps);
 
@@ -132,7 +135,7 @@ export async function installPlugin(
 
     const helmStep = steps.find((s) => s.id === 'helm-install');
     if (helmStep && (helmStep.status === 'completed' || helmStep.status === 'failed')) {
-      const ns = namespace ?? pluginName;
+      const ns = namespace ?? pluginInfo?.namespace ?? pluginName;
       const cleanupStep = createStep('cleanup', 'Rolling back Helm release');
       steps.push(cleanupStep);
       markRunning(cleanupStep);
@@ -174,11 +177,11 @@ export async function upgradePlugin(
     markCompleted(steps[0]);
     onProgress?.(steps);
 
-    const ns = namespace ?? (await discoverReleaseNamespace(pluginName, token)) ?? pluginName;
+    const ns = namespace ?? (await discoverReleaseNamespace(pluginName, token)) ?? pluginInfo.namespace ?? pluginName;
 
     markRunning(steps[1]);
     onProgress?.(steps);
-    await helmUpgrade(pluginName, pluginInfo.chart, ns, token, values);
+    await helmUpgrade(pluginName, pluginInfo.chart, ns, token, { namespace: ns, ...values });
     markCompleted(steps[1]);
     onProgress?.(steps);
 
@@ -284,7 +287,7 @@ export async function enablePlugin(
     markRunning(steps[1]);
     onProgress?.(steps);
 
-    const ns = (await discoverReleaseNamespace(pluginName, token)) ?? pluginName;
+    const ns = (await discoverReleaseNamespace(pluginName, token)) ?? pluginInfo.namespace ?? pluginName;
     const mfEntry: ModuleFederationEntry = {
       name: pluginInfo.mfName,
       backend: {

bff/src/types/catalog.ts

@@ -23,6 +23,7 @@ export interface PluginImage {
 
 export interface PluginInstall {
   method: 'automatic' | 'assisted' | 'manual';
+  namespace?: string;
   helm?: {
     chart_path?: string;
     registry?: string;
@@ -99,6 +100,7 @@ export interface CatalogPluginRemote {
 
 export interface CatalogPluginInstall {
   method: 'automatic' | 'assisted' | 'manual';
+  namespace?: string;
   helm?: {
     chartPath?: string;
     registry?: string;

chart/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: community-plugins-admin-chart
 description: A Helm chart for deploying the RHOAI Community Plugins Admin plugin
 type: application
-version: 0.1.1
-appVersion: "0.1.1"
+version: 0.1.2
+appVersion: "0.1.2"
 keywords:
   - rhoai
   - openshift-ai

chart/templates/_helpers.tpl

@@ -1,3 +1,10 @@
+{{/*
+Target namespace for all namespaced resources.
+*/}}
+{{- define "community-plugins-admin.namespace" -}}
+{{- .Values.namespace | default .Release.Namespace }}
+{{- end }}
+
 {{/*
 Expand the name of the chart.
 */}}

chart/templates/bff-clusterrolebinding.yaml

@@ -17,5 +17,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ $saName }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ include "community-plugins-admin.namespace" . }}
 {{- end }}

chart/templates/bff-deployment.yaml

@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "community-plugins-admin.fullname" . }}-bff
+  namespace: {{ include "community-plugins-admin.namespace" . }}
   labels:
     {{- include "community-plugins-admin.labels" . | nindent 4 }}
     app.kubernetes.io/component: bff
@@ -48,6 +49,10 @@ spec:
               containerPort: {{ .Values.bff.service.targetPort }}
               protocol: TCP
           env:
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
             - name: DASHBOARD_NAMESPACE
               value: {{ .Values.bff.dashboardNamespace | quote }}
             - name: DASHBOARD_DEPLOYMENT

chart/templates/bff-service.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "community-plugins-admin.fullname" . }}-bff
+  namespace: {{ include "community-plugins-admin.namespace" . }}
   labels:
     {{- include "community-plugins-admin.labels" . | nindent 4 }}
     app.kubernetes.io/component: bff