diff --git a/.gitea/workflows/deploy-labs.yaml b/.gitea/workflows/deploy-labs.yaml index d63565b..e07ad4c 100644 --- a/.gitea/workflows/deploy-labs.yaml +++ b/.gitea/workflows/deploy-labs.yaml @@ -1,10 +1,7 @@ -name: Deploy to Orchestrator +name: Deploy to Orchestrator (lab) +# Dispatch only until the lab path is proven. deploy.yml already deploys on every build. on: - workflow_run: - workflows: ["Build and Push to ACR"] - types: [completed] - branches: [ "dev", "staging", "prod" ] workflow_dispatch: inputs: environment: @@ -32,7 +29,9 @@ env: # scaffolded app. That constraint turned out not to be real -- `octl create project`, # `octl create runner-rule` and `octl create environment` are all runtime operations, so # the workflow below builds the whole thing on first deploy and needs no repository change. - PROJECT_ID: demo-vivek-11 + # Its own project, NOT demo-vivek-11. Sharing it would reuse deploy.yml's runner rule (the dev + # apps runner) and overwrite the dev workload with this file. + PROJECT_ID: demo-vivek-11-lab # The runner a project's workloads execute on. This is NOT cosmetic: the Kubernetes and # Helm providers are ambient, so a workload lands in whichever cluster its runner lives in, # and Terraform state is keyed per runner. A project bound to the wrong runner deploys to @@ -110,7 +109,7 @@ jobs: # # Neither create is idempotent, so both fall through to a read on the second run. octl create project "$PROJECT_ID" \ - --set display_name='demo-vivek-11' || \ + --set display_name='demo-vivek-11 (lab)' || \ octl get project "$PROJECT_ID" # The runner rule is what routes this project's deployments to the apps cluster. diff --git a/score-lab.yaml b/score-lab.yaml index 9f38cfd..3612d50 100644 --- a/score-lab.yaml +++ b/score-lab.yaml @@ -18,7 +18,6 @@ containers: OTEL_METRICS_EXPORTER: "otlp" OTEL_TRACES_EXPORTER: "otlp" OTEL_LOGS_EXPORTER: "none" - DATABASE_URL: "postgresql://${resources.db.username}:${resources.db.password}@${resources.db.hostname}:${resources.db.port}/${resources.db.database}" service: ports: @@ -36,5 +35,7 @@ resources: hostname: demo-vivek-11.apps.lab.crucible.kyndemo.live service_name: demo-vivek-11 service_port: 80 + # No database until one exists on the lab: CloudNativePG is not installed there. When it is + # restored, add back DATABASE_URL using ${resources.db.hostname} and ${resources.db.database}. # db: # type: postgres