Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deploy-aws-lambda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# - AWS_ROLE_TO_ASSUME: IAM role ARN for OIDC keyless auth
#
# Triggered by:
# - Pushes to main or feat/multicloud-web-frontend branch
# - Pushes to main branch
# - Manual workflow dispatch with environment selection
# - Release creation (auto-deploy to prod)
# - Workflow call from other workflows
Expand All @@ -32,7 +32,7 @@ concurrency:

on:
push:
branches: [main, feat/multicloud-web-frontend]
branches: [main]
paths:
- 'cmd/**'
- 'internal/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# - KEY_VAULT_NAME: Azure Key Vault name
#
# Triggered by:
# - Pushes to main or feat/multicloud-web-frontend branch
# - Pushes to main branch
# - Manual workflow dispatch
# - Workflow call from deploy-all.yml

Expand All @@ -32,7 +32,7 @@ concurrency:

on:
push:
branches: [main, feat/multicloud-web-frontend]
branches: [main]
workflow_dispatch:
inputs:
environment:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-gcp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# - ARTIFACT_REGISTRY_REPO: Artifact Registry repository name (default: cudly)
#
# Triggered by:
# - Pushes to main or feat/multicloud-web-frontend branch
# - Pushes to main branch
# - Manual workflow dispatch
# - Workflow call from deploy-all.yml

Expand All @@ -30,7 +30,7 @@ concurrency:

on:
push:
branches: [main, feat/multicloud-web-frontend]
branches: [main]
workflow_dispatch:
inputs:
environment:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/frontend-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ name: Frontend build (PR)
on:
pull_request:
branches:
- feat/multicloud-web-frontend
- main
paths:
- "frontend/**"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: pre-commit

on:
pull_request:
branches: [main, feat/multicloud-web-frontend]
branches: [main]
push:
branches: [main, feat/multicloud-web-frontend]
branches: [main]

permissions:
contents: read
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -469,8 +469,7 @@ no separate web server process.

### Capabilities and limitations

The web interface is part of the `feat/multicloud-web-frontend` branch and is
not yet merged to `main`. The dashboard is operational for AWS workloads; Azure
The web interface is included in `main`. The dashboard is operational for AWS workloads; Azure
and GCP support in the web UI follows the same maturity as the CLI providers
(both are experimental). Specifically:

Expand Down
10 changes: 0 additions & 10 deletions terraform/environments/azure/ci-cd-permissions/sp.tf
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,3 @@ resource "azuread_application_federated_identity_credential" "github_pr" {
subject = "repo:${var.github_repo}:pull_request"
}

resource "azuread_application_federated_identity_credential" "github_feat_multicloud" {
count = var.github_repo != "" ? 1 : 0

application_id = azuread_application.cudly_deploy.id
display_name = "github-actions-feat-multicloud"
description = "GitHub Actions OIDC — ${var.github_repo} feat/multicloud-web-frontend branch"
audiences = ["api://AzureADTokenExchange"]
issuer = "https://token.actions.githubusercontent.com"
subject = "repo:${var.github_repo}:ref:refs/heads/feat/multicloud-web-frontend"
}
Loading