Merge pull request #2968 from alphagov/sadm-env

Search Admin: Update Discovery Engine configuration
alphagov · Feb 5, 2025 · d372fee · d372fee
2 parents c20db9c + 51f396a
commit d372fee
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/charts/app-config/values-integration.yaml b/charts/app-config/values-integration.yaml
@@ -2903,16 +2903,11 @@ govukApplications:
             secretKeyRef:
               name: search-admin-google-cloud-discovery-engine-configuration
               key: DISCOVERY_ENGINE_DATASTORE
-        - name: DISCOVERY_ENGINE_ENGINE
+        - name: DISCOVERY_ENGINE_DEFAULT_COLLECTION_NAME
           valueFrom:
             secretKeyRef:
               name: search-admin-google-cloud-discovery-engine-configuration
-              key: DISCOVERY_ENGINE_ENGINE
-        - name: DISCOVERY_ENGINE_SERVING_CONFIG
-          valueFrom:
-            secretKeyRef:
-              name: search-admin-google-cloud-discovery-engine-configuration
-              key: DISCOVERY_ENGINE_SERVING_CONFIG
+              key: DISCOVERY_ENGINE_DEFAULT_COLLECTION_NAME
 
   - name: search-api
     helmValues:

diff --git a/charts/app-config/values-production.yaml b/charts/app-config/values-production.yaml
@@ -2804,16 +2804,11 @@ govukApplications:
             secretKeyRef:
               name: search-admin-google-cloud-discovery-engine-configuration
               key: DISCOVERY_ENGINE_DATASTORE
-        - name: DISCOVERY_ENGINE_ENGINE
+        - name: DISCOVERY_ENGINE_DEFAULT_COLLECTION_NAME
           valueFrom:
             secretKeyRef:
               name: search-admin-google-cloud-discovery-engine-configuration
-              key: DISCOVERY_ENGINE_ENGINE
-        - name: DISCOVERY_ENGINE_SERVING_CONFIG
-          valueFrom:
-            secretKeyRef:
-              name: search-admin-google-cloud-discovery-engine-configuration
-              key: DISCOVERY_ENGINE_SERVING_CONFIG
+              key: DISCOVERY_ENGINE_DEFAULT_COLLECTION_NAME
 
   - name: search-api
     helmValues:

diff --git a/charts/app-config/values-staging.yaml b/charts/app-config/values-staging.yaml
@@ -2782,16 +2782,11 @@ govukApplications:
             secretKeyRef:
               name: search-admin-google-cloud-discovery-engine-configuration
               key: DISCOVERY_ENGINE_DATASTORE
-        - name: DISCOVERY_ENGINE_ENGINE
+        - name: DISCOVERY_ENGINE_DEFAULT_COLLECTION_NAME
           valueFrom:
             secretKeyRef:
               name: search-admin-google-cloud-discovery-engine-configuration
-              key: DISCOVERY_ENGINE_ENGINE
-        - name: DISCOVERY_ENGINE_SERVING_CONFIG
-          valueFrom:
-            secretKeyRef:
-              name: search-admin-google-cloud-discovery-engine-configuration
-              key: DISCOVERY_ENGINE_SERVING_CONFIG
+              key: DISCOVERY_ENGINE_DEFAULT_COLLECTION_NAME
 
   - name: search-api
     helmValues: