Skip to content

Commit 7118ba6

Browse files
fixup deployment
1 parent 3a8187e commit 7118ba6

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

.github/workflows/end2end.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ jobs:
653653
GCP_SECRET_KEY: ${{ secrets.AWS_GCP_BACKEND_SECRET_KEY }}
654654
run: |
655655
if [[ "${{ env.ENABLE_RING_TESTS }}" == "true" ]]; then
656-
./setup-tests.sh --kubeconfig ~/.kube/config -- setup --metadata
656+
./setup-tests.sh --kubeconfig ~/.kube/config
657657
else
658658
./setup-tests.sh --kubeconfig ~/.kube/config -- setup --rbac --dns --buckets --locations --accounts --endpoints --workflows --tls
659659
fi

tests/@setup/src/cli.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -273,20 +273,12 @@ async function runSetup(options: any) {
273273
}
274274

275275
if (options.metadata) {
276-
if (!setupFlags.rbac) {
277-
tasks.push({
278-
name: 'RBAC', fn: async () => {
279-
await setupRBAC({
280-
namespace: options.namespace || 'default',
281-
});
282-
setupFlags.rbac = true;
283-
logger.debug('RBAC setup flag set (auto-enabled for metadata)');
284-
}
285-
});
286-
}
287-
288276
tasks.push({
289277
name: 'Metadata Service', fn: () => {
278+
if (!setupFlags.rbac) {
279+
throw new Error('RBAC setup is required before metadata setup');
280+
}
281+
290282
return setupMetadata({
291283
gitAccessToken: options.gitAccessToken || process.env.GIT_ACCESS_TOKEN,
292284
namespace: options.metadataNamespace || 'metadata',

0 commit comments

Comments
 (0)