wip

Author: williamlardier

.github/workflows/end2end.yaml

@@ -491,6 +491,12 @@ jobs:
         with:
           git_access_token: ${{ steps.app-token.outputs.token }}
           zenko_name: ${{ env.ZENKO_NAME }}
+      - name: Setup test environment
+        env:
+          SETUP_IMAGE: ${{ needs.build-setup-image.outputs.image }}
+          GIT_ACCESS_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: ./setup-tests.sh --kubeconfig ~/.kube/config
+        working-directory: ./tests/@setup
       - name: Prepare PRA environment
         run: bash prepare-pra.sh
         working-directory: ./.github/scripts/end2end
@@ -499,14 +505,6 @@ jobs:
         env:
           ZENKO_MONGODB_DATABASE: pradb
         working-directory: ./.github/scripts/end2end
-      - 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
-        working-directory: ./tests/@setup
       - name: Add Keycloak pra user and assign StorageManager role
         shell: bash
         run: bash keycloak-helper.sh add-user default ${{ env.ZENKO_NAME }}-pra

tests/@setup/setup-tests.sh

@@ -145,8 +145,6 @@ 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,15 +46,10 @@ 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}`;
 }
 
@@ -122,29 +117,24 @@ export async function getManagementToken(subdomain: string = 'zenko.local'): Pro
 }
 
 /**
- * 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
+ * Get instance ID from the Zenko CR
  * @returns Instance ID
  */
-export async function getInstanceId(zenkoName?: string): Promise<string | null> {
+export async function getInstanceId(): 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 zenkoName = process.env.ZENKO_NAME || 'end2end';
 
     const instanceId = await KubernetesHelper.customObject.getNamespacedCustomObject({
         group: 'zenko.io',
         version: 'v1alpha2',
         namespace: process.env.NAMESPACE || 'default',
         plural: 'zenkos',
-        name: targetZenkoName,
+        name: zenkoName,
     });
 
-    const id = instanceId.status?.instanceID || process.env.INSTANCE_ID;
-    logger.info(`Using instanceId: ${id} from Zenko CR: ${targetZenkoName}`);
-    return id;
+    return instanceId.status?.instanceID || process.env.INSTANCE_ID;
 }
 
 /**