From 6e086301359ee8cf9a7409d75566257fe76c5d78 Mon Sep 17 00:00:00 2001 From: lucas-phillips28 Date: Mon, 4 Nov 2024 10:41:43 +0000 Subject: [PATCH] Remove env vars used in ams impl --- apps/pre/pre-api-cron-cleanup-live-events/demo.yaml | 1 - apps/pre/pre-api-cron-cleanup-live-events/stg.yaml | 1 - apps/pre/pre-api-cron-cleanup-live-events/test.yaml | 1 - apps/pre/pre-api-cron-cleanup-streaming-locators/demo.yaml | 1 - apps/pre/pre-api-cron-cleanup-streaming-locators/stg.yaml | 1 - apps/pre/pre-api-cron-cleanup-streaming-locators/test.yaml | 1 - apps/pre/pre-api/demo.yaml | 3 --- apps/pre/pre-api/prod.yaml | 3 --- apps/pre/pre-api/stg.yaml | 3 --- apps/pre/pre-api/test.yaml | 3 --- 10 files changed, 18 deletions(-) diff --git a/apps/pre/pre-api-cron-cleanup-live-events/demo.yaml b/apps/pre/pre-api-cron-cleanup-live-events/demo.yaml index 2888e87da06..c291e420f08 100644 --- a/apps/pre/pre-api-cron-cleanup-live-events/demo.yaml +++ b/apps/pre/pre-api-cron-cleanup-live-events/demo.yaml @@ -11,6 +11,5 @@ spec: schedule: "30 17 * * *" # 5:30 PM UTC image: sdshmctspublic.azurecr.io/pre/api:prod-1f92c13-20241023071636 # {"$imagepolicy": "flux-system:pre-api"} environment: - AZURE_SUBSCRIPTION_ID: c68a4bed-4c3d-4956-af51-4ae164c1957c PLATFORM_ENV_TAG: Demo MEDIA_SERVICE: MediaKind diff --git a/apps/pre/pre-api-cron-cleanup-live-events/stg.yaml b/apps/pre/pre-api-cron-cleanup-live-events/stg.yaml index b823e444268..555e1c309ad 100644 --- a/apps/pre/pre-api-cron-cleanup-live-events/stg.yaml +++ b/apps/pre/pre-api-cron-cleanup-live-events/stg.yaml @@ -11,6 +11,5 @@ spec: schedule: "30 17 * * *" # 5:30 PM UTC image: sdshmctspublic.azurecr.io/pre/api:prod-1f92c13-20241023071636 # {"$imagepolicy": "flux-system:pre-api"} environment: - AZURE_SUBSCRIPTION_ID: 74dacd4f-a248-45bb-a2f0-af700dc4cf68 PLATFORM_ENV_TAG: Staging MEDIA_SERVICE: MediaKind diff --git a/apps/pre/pre-api-cron-cleanup-live-events/test.yaml b/apps/pre/pre-api-cron-cleanup-live-events/test.yaml index 6ec38d1efb5..e7cad6d3a6f 100644 --- a/apps/pre/pre-api-cron-cleanup-live-events/test.yaml +++ b/apps/pre/pre-api-cron-cleanup-live-events/test.yaml @@ -11,6 +11,5 @@ spec: schedule: "30 17 * * *" # 5:30 PM UTC image: sdshmctspublic.azurecr.io/pre/api:prod-1f92c13-20241023071636 # {"$imagepolicy": "flux-system:pre-api"} environment: - AZURE_SUBSCRIPTION_ID: 3eec5bde-7feb-4566-bfb6-805df6e10b90 PLATFORM_ENV_TAG: Test MEDIA_SERVICE: MediaKind diff --git a/apps/pre/pre-api-cron-cleanup-streaming-locators/demo.yaml b/apps/pre/pre-api-cron-cleanup-streaming-locators/demo.yaml index 81ca52e9efe..d523f232d35 100644 --- a/apps/pre/pre-api-cron-cleanup-streaming-locators/demo.yaml +++ b/apps/pre/pre-api-cron-cleanup-streaming-locators/demo.yaml @@ -11,6 +11,5 @@ spec: schedule: "30 18 * * *" # 6:30 PM UTC image: sdshmctspublic.azurecr.io/pre/api:prod-1f92c13-20241023071636 # {"$imagepolicy": "flux-system:pre-api"} environment: - AZURE_SUBSCRIPTION_ID: c68a4bed-4c3d-4956-af51-4ae164c1957c PLATFORM_ENV_TAG: Demo MEDIA_SERVICE: MediaKind diff --git a/apps/pre/pre-api-cron-cleanup-streaming-locators/stg.yaml b/apps/pre/pre-api-cron-cleanup-streaming-locators/stg.yaml index 427caecacda..237d66c862d 100644 --- a/apps/pre/pre-api-cron-cleanup-streaming-locators/stg.yaml +++ b/apps/pre/pre-api-cron-cleanup-streaming-locators/stg.yaml @@ -11,6 +11,5 @@ spec: schedule: "30 18 * * *" # 6:30 PM UTC image: sdshmctspublic.azurecr.io/pre/api:prod-1f92c13-20241023071636 # {"$imagepolicy": "flux-system:pre-api"} environment: - AZURE_SUBSCRIPTION_ID: 74dacd4f-a248-45bb-a2f0-af700dc4cf68 PLATFORM_ENV_TAG: Staging MEDIA_SERVICE: MediaKind diff --git a/apps/pre/pre-api-cron-cleanup-streaming-locators/test.yaml b/apps/pre/pre-api-cron-cleanup-streaming-locators/test.yaml index b0ab60db735..7eda59ee743 100644 --- a/apps/pre/pre-api-cron-cleanup-streaming-locators/test.yaml +++ b/apps/pre/pre-api-cron-cleanup-streaming-locators/test.yaml @@ -11,6 +11,5 @@ spec: schedule: "30 18 * * *" # 6:30 PM UTC image: sdshmctspublic.azurecr.io/pre/api:prod-1f92c13-20241023071636 # {"$imagepolicy": "flux-system:pre-api"} environment: - AZURE_SUBSCRIPTION_ID: 3eec5bde-7feb-4566-bfb6-805df6e10b90 PLATFORM_ENV_TAG: Test MEDIA_SERVICE: MediaKind diff --git a/apps/pre/pre-api/demo.yaml b/apps/pre/pre-api/demo.yaml index 0043a5153c3..91422ab9def 100644 --- a/apps/pre/pre-api/demo.yaml +++ b/apps/pre/pre-api/demo.yaml @@ -10,8 +10,5 @@ spec: replicas: 2 ingressHost: pre-api.demo.platform.hmcts.net environment: - AZURE_MEDIA_SERVICES_ACCOUNT_NAME: preamsdemo - AZURE_RESOURCE_GROUP: pre-demo - AZURE_SUBSCRIPTION_ID: c68a4bed-4c3d-4956-af51-4ae164c1957c PLATFORM_ENV_TAG: Demo MEDIA_SERVICE: MediaKind \ No newline at end of file diff --git a/apps/pre/pre-api/prod.yaml b/apps/pre/pre-api/prod.yaml index dc768bbdfde..b6800253fb8 100644 --- a/apps/pre/pre-api/prod.yaml +++ b/apps/pre/pre-api/prod.yaml @@ -10,9 +10,6 @@ spec: replicas: 2 ingressHost: pre-api.platform.hmcts.net environment: - AZURE_MEDIA_SERVICES_ACCOUNT_NAME: preamsprod - AZURE_RESOURCE_GROUP: pre-prod - AZURE_SUBSCRIPTION_ID: 5ca62022-6aa2-4cee-aaa7-e7536c8d566c PLATFORM_ENV_TAG: Production MEDIA_SERVICE: MediaKind TRIGGER: init-1 diff --git a/apps/pre/pre-api/stg.yaml b/apps/pre/pre-api/stg.yaml index 4c0b1571aef..dda8a280fa1 100644 --- a/apps/pre/pre-api/stg.yaml +++ b/apps/pre/pre-api/stg.yaml @@ -9,9 +9,6 @@ spec: java: ingressHost: pre-api.staging.platform.hmcts.net environment: - AZURE_MEDIA_SERVICES_ACCOUNT_NAME: preamsstg - AZURE_RESOURCE_GROUP: pre-stg - AZURE_SUBSCRIPTION_ID: 74dacd4f-a248-45bb-a2f0-af700dc4cf68 PLATFORM_ENV_TAG: Staging AZURE_INGEST_SA: preingestsastg AZURE_FINAL_SA: prefinalsastg diff --git a/apps/pre/pre-api/test.yaml b/apps/pre/pre-api/test.yaml index ecab3592720..df6515c6cbe 100644 --- a/apps/pre/pre-api/test.yaml +++ b/apps/pre/pre-api/test.yaml @@ -9,7 +9,4 @@ spec: java: ingressHost: pre-api.test.platform.hmcts.net environment: - AZURE_MEDIA_SERVICES_ACCOUNT_NAME: preamstest - AZURE_RESOURCE_GROUP: pre-test - AZURE_SUBSCRIPTION_ID: 3eec5bde-7feb-4566-bfb6-805df6e10b90 PLATFORM_ENV_TAG: Testing \ No newline at end of file