Skip to content

Fix/terra alignment #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JustAGhosT wants to merge 8 commits into
base: dev
Choose a base branch
from
Open

Fix/terra alignment #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6c4a82a
docs: update architecture documentation with telemetry and model details
JustAGhosT Mar 15, 2026
0e69a2f
feat(workflows): add GitHub environment support to deployment workflows
JustAGhosT Mar 15, 2026
02a8bb7
fix(workflows): rename smoke_models_wait_sleep to smoke_models_wait_a…
JustAGhosT Mar 15, 2026
0e4fff2
fix(workflows): rename smoke_models_wait_sleep to smoke_models_wait_a…
JustAGhosT Mar 15, 2026
27e1724
feat(workflow): add smoke_models_wait_sleep parameter and update docs
JustAGhosT Mar 15, 2026
19759df
fix: spacing issues in yaml
JustAGhosT Mar 15, 2026
9be91e5
docs: add AGENTS.md with guidance for AI coding agents
JustAGhosT Mar 15, 2026
72c004c
feat(infra): add state service configuration to dev environment
JustAGhosT Mar 15, 2026
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
50 changes: 48 additions & 2 deletions .github/workflows/deploy-environment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,37 @@ on:
required: false
type: string
default: "15"
description: Wait sleep for model registration
description: Sleep seconds between model availability checks
smoke_models_wait_attempts:
required: false
type: string
default: "1"
description: Number of attempts to wait for models to become available
include_aoai_host_check:
required: false
type: boolean
default: false
description: Include AOAI endpoint host validation
environment:
required: false
type: string
default: ""
description: GitHub environment to use
secrets:
AZURE_CLIENT_ID:
required: true
AZURE_TENANT_ID:
required: true
AZURE_SUBSCRIPTION_ID:
required: true
TF_BACKEND_RG:
required: true
TF_BACKEND_SA:
required: true
TF_BACKEND_CONTAINER:
required: true
EXPECTED_AOAI_ENDPOINT_HOST:
required: false
AZURE_OPENAI_ENDPOINT:
required: true
AZURE_OPENAI_API_KEY:
Expand All @@ -49,8 +73,25 @@ on:
required: true
AIGATEWAY_KEY:
required: true
STATE_SERVICE_CONTAINER_IMAGE:
required: false
STATE_SERVICE_SHARED_TOKEN:
required: false
STATE_SERVICE_REGISTRY_PASSWORD:
required: false
DASHBOARD_CONTAINER_IMAGE:
required: false
GRAFANA_URL:
required: false

env:
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
TF_BACKEND_RG: ${{ secrets.TF_BACKEND_RG }}
TF_BACKEND_SA: ${{ secrets.TF_BACKEND_SA }}
TF_BACKEND_CONTAINER: ${{ secrets.TF_BACKEND_CONTAINER }}
EXPECTED_AOAI_ENDPOINT_HOST: ${{ secrets.EXPECTED_AOAI_ENDPOINT_HOST }}
TF_VAR_env: ${{ inputs.env_name }}
TF_VAR_projname: "aigateway"
TF_VAR_location: "southafricanorth"
Expand All @@ -64,10 +105,15 @@ env:
TF_VAR_codex_api_version: ${{ inputs.codex_api_version }}
TF_VAR_embedding_deployment: "text-embedding-3-large"
TF_VAR_embeddings_api_version: "2024-02-01"
TF_VAR_state_service_container_image: ${{ secrets.STATE_SERVICE_CONTAINER_IMAGE }}
TF_VAR_secrets_expiration_date: "2027-03-31T00:00:00Z"
TF_VAR_dashboard_container_image: ${{ secrets.DASHBOARD_CONTAINER_IMAGE || 'ghcr.io/phoenixvc/ai-gateway-dashboard:latest' }}
TF_VAR_grafana_url: ${{ secrets.GRAFANA_URL }}

jobs:
deploy:
runs-on: ubuntu-latest
environment: ${{ inputs.environment || inputs.env_name }}
defaults:
run:
working-directory: ${{ inputs.terraform_working_directory }}
Expand Down Expand Up @@ -208,7 +254,7 @@ jobs:
aoai_api_key: ${{ env.TF_VAR_azure_openai_api_key }}
max_attempts: "3"
retry_sleep: ${{ inputs.smoke_retry_sleep }}
models_wait_attempts: ${{ if(inputs.env_name == 'prod', '3', '1') }}
models_wait_attempts: ${{ inputs.smoke_models_wait_attempts }}
models_wait_sleep: ${{ inputs.smoke_models_wait_sleep }}

- name: Smoke test shared state API (dashboard proxy)
Expand Down
45 changes: 42 additions & 3 deletions .github/workflows/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ jobs:
name: Deploy dev
needs: plan
if: github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'dev'
environment: dev
uses: ./.github/workflows/deploy-environment.yaml
with:
env_name: dev
Expand All @@ -160,19 +159,32 @@ jobs:
terraform_working_directory: infra/env/dev
smoke_retry_sleep: "10"
smoke_models_wait_sleep: "15"
smoke_models_wait_attempts: "1"
include_aoai_host_check: false
environment: dev
secrets:
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
TF_BACKEND_RG: ${{ secrets.TF_BACKEND_RG }}
TF_BACKEND_SA: ${{ secrets.TF_BACKEND_SA }}
TF_BACKEND_CONTAINER: ${{ secrets.TF_BACKEND_CONTAINER }}
EXPECTED_AOAI_ENDPOINT_HOST: ${{ secrets.EXPECTED_AOAI_ENDPOINT_HOST }}
AZURE_OPENAI_ENDPOINT: ${{ secrets.AZURE_OPENAI_ENDPOINT }}
AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
AZURE_OPENAI_EMBEDDING_ENDPOINT: ${{ secrets.AZURE_OPENAI_EMBEDDING_ENDPOINT }}
AZURE_OPENAI_EMBEDDING_API_KEY: ${{ secrets.AZURE_OPENAI_EMBEDDING_API_KEY }}
AIGATEWAY_KEY: ${{ secrets.AIGATEWAY_KEY }}
STATE_SERVICE_CONTAINER_IMAGE: ${{ vars.STATE_SERVICE_CONTAINER_IMAGE }}
STATE_SERVICE_SHARED_TOKEN: ${{ secrets.STATE_SERVICE_SHARED_TOKEN }}
STATE_SERVICE_REGISTRY_PASSWORD: ${{ secrets.STATE_SERVICE_REGISTRY_PASSWORD }}
DASHBOARD_CONTAINER_IMAGE: ${{ vars.DASHBOARD_CONTAINER_IMAGE }}
GRAFANA_URL: ${{ secrets.GRAFANA_URL }}

deploy-staging:
name: Deploy staging
needs: plan
if: github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main' && contains(join(github.event.pull_request.labels.*.name, ','), 'run-staging')
environment: staging
uses: ./.github/workflows/deploy-environment.yaml
with:
env_name: staging
Expand All @@ -182,19 +194,32 @@ jobs:
terraform_working_directory: infra/env/staging
smoke_retry_sleep: "10"
smoke_models_wait_sleep: "15"
smoke_models_wait_attempts: "1"
include_aoai_host_check: false
environment: staging
secrets:
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
TF_BACKEND_RG: ${{ secrets.TF_BACKEND_RG }}
TF_BACKEND_SA: ${{ secrets.TF_BACKEND_SA }}
TF_BACKEND_CONTAINER: ${{ secrets.TF_BACKEND_CONTAINER }}
EXPECTED_AOAI_ENDPOINT_HOST: ${{ secrets.EXPECTED_AOAI_ENDPOINT_HOST }}
AZURE_OPENAI_ENDPOINT: ${{ secrets.AZURE_OPENAI_ENDPOINT }}
AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
AZURE_OPENAI_EMBEDDING_ENDPOINT: ${{ secrets.AZURE_OPENAI_EMBEDDING_ENDPOINT }}
AZURE_OPENAI_EMBEDDING_API_KEY: ${{ secrets.AZURE_OPENAI_EMBEDDING_API_KEY }}
AIGATEWAY_KEY: ${{ secrets.AIGATEWAY_KEY }}
STATE_SERVICE_CONTAINER_IMAGE: ${{ vars.STATE_SERVICE_CONTAINER_IMAGE }}
STATE_SERVICE_SHARED_TOKEN: ${{ secrets.STATE_SERVICE_SHARED_TOKEN }}
STATE_SERVICE_REGISTRY_PASSWORD: ${{ secrets.STATE_SERVICE_REGISTRY_PASSWORD }}
DASHBOARD_CONTAINER_IMAGE: ${{ vars.DASHBOARD_CONTAINER_IMAGE }}
GRAFANA_URL: ${{ secrets.GRAFANA_URL }}

deploy-prod:
name: Deploy prod
needs: plan
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && github.ref == 'refs/heads/main')
environment: prod
uses: ./.github/workflows/deploy-environment.yaml
with:
env_name: prod
Expand All @@ -204,12 +229,26 @@ jobs:
terraform_working_directory: infra/env/prod
smoke_retry_sleep: "15"
smoke_models_wait_sleep: "30"
smoke_models_wait_attempts: "3"
include_aoai_host_check: true
environment: prod
secrets:
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
TF_BACKEND_RG: ${{ secrets.TF_BACKEND_RG }}
TF_BACKEND_SA: ${{ secrets.TF_BACKEND_SA }}
TF_BACKEND_CONTAINER: ${{ secrets.TF_BACKEND_CONTAINER }}
EXPECTED_AOAI_ENDPOINT_HOST: ${{ secrets.EXPECTED_AOAI_ENDPOINT_HOST }}
AZURE_OPENAI_ENDPOINT: ${{ secrets.AZURE_OPENAI_ENDPOINT }}
AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
AZURE_OPENAI_EMBEDDING_ENDPOINT: ${{ secrets.AZURE_OPENAI_EMBEDDING_ENDPOINT }}
AZURE_OPENAI_EMBEDDING_API_KEY: ${{ secrets.AZURE_OPENAI_EMBEDDING_API_KEY }}
AIGATEWAY_KEY: ${{ secrets.AIGATEWAY_KEY }}
STATE_SERVICE_CONTAINER_IMAGE: ${{ vars.STATE_SERVICE_CONTAINER_IMAGE }}
STATE_SERVICE_SHARED_TOKEN: ${{ secrets.STATE_SERVICE_SHARED_TOKEN }}
STATE_SERVICE_REGISTRY_PASSWORD: ${{ secrets.STATE_SERVICE_REGISTRY_PASSWORD }}
DASHBOARD_CONTAINER_IMAGE: ${{ vars.DASHBOARD_CONTAINER_IMAGE }}
GRAFANA_URL: ${{ secrets.GRAFANA_URL }}

# Legacy inline deployments removed - see deploy-environment.yaml
Loading
Loading