wip

Author: williamlardier

.github/workflows/end2end.yaml

@@ -502,6 +502,7 @@ jobs:
       - name: Setup PRA test environment
         env:
           ZENKO_NAME: "${{ env.ZENKO_NAME }}-pra"
+          MANAGEMENT_INSTANCE: "${{ env.ZENKO_NAME }}"
           SETUP_IMAGE: ${{ needs.build-setup-image.outputs.image }}
           GIT_ACCESS_TOKEN: ${{ steps.app-token.outputs.token }}
         run: ./setup-tests.sh --kubeconfig ~/.kube/config

tests/@setup/setup-tests.sh

@@ -145,6 +145,8 @@ spec:
         args:
 $(for arg in "${setup_args[@]}"; do echo "        - \"${arg}\""; done)
         env:
+        - name: MANAGEMENT_INSTANCE
+          value: "${MANAGEMENT_INSTANCE}"
         - name: ENABLE_RING_TESTS
           value: "${ENABLE_RING_TESTS}"
         - name: KAFKA_IMAGE

tests/@setup/src/utils/management.ts

@@ -46,10 +46,15 @@ export interface AccountResponse {
 
 /**
  * Get management endpoint
+ * For PRA instances, the Management API endpoint is shared (only deployed on primary instance)
  * @param subdomain - Subdomain
  * @returns Management endpoint
  */
 export async function getManagementEndpoint(subdomain: string = 'zenko.local'): Promise<string> {
+    const managementInstance = process.env.MANAGEMENT_INSTANCE;
+    if (managementInstance) {
+        logger.info(`Using Management API from primary instance: ${managementInstance} (target: ${process.env.ZENKO_NAME})`);
+    }
     return `http://management.${subdomain}`;
 }
 
@@ -117,22 +122,29 @@ export async function getManagementToken(subdomain: string = 'zenko.local'): Pro
 }
 
 /**
- * Get instance ID
+ * Get instance ID from the target Zenko CR
+ * NOTE: This returns the TARGET instance's ID (e.g., PRA), which is used when creating locations
+ * @param zenkoName - Optional Zenko CR name to override ZENKO_NAME env var
  * @returns Instance ID
  */
-export async function getInstanceId(): Promise<string | null> {
+export async function getInstanceId(zenkoName?: string): Promise<string | null> {
     if (!KubernetesHelper.customObject) {
         throw new Error('KubernetesHelper not initialized');
     }
+    const targetZenkoName = zenkoName || process.env.ZENKO_NAME || 'end2end';
+    logger.debug(`Getting instanceId from Zenko CR: ${targetZenkoName}`);
+    
     const instanceId = await KubernetesHelper.customObject.getNamespacedCustomObject({
         group: 'zenko.io',
         version: 'v1alpha2',
         namespace: process.env.NAMESPACE || 'default',
         plural: 'zenkos',
-        name: process.env.ZENKO_NAME || 'end2end',
+        name: targetZenkoName,
     });
 
-    return instanceId.status?.instanceID || process.env.INSTANCE_ID;
+    const id = instanceId.status?.instanceID || process.env.INSTANCE_ID;
+    logger.info(`Using instanceId: ${id} from Zenko CR: ${targetZenkoName}`);
+    return id;
 }
 
 /**