Gonrg 9804 management eds via partition

devops/gc/deploy/templates/configmap-bootstrap.yaml

@@ -12,7 +12,6 @@ data:
   POLICY_SERVICE_ENABLED: {{ .Values.data.policyServiceEnabled | quote }}
   PARTITION_SUFFIX: {{ .Values.data.partitionSuffix | quote }}
   DATA_PARTITION_ID: {{ .Values.global.dataPartitionId | quote }}
-  OPA_ENABLED: {{ .Values.data.opaEnabled | quote }}
   {{- if .Values.global.onPremEnabled }}
   ENVIRONMENT: "anthos"
   SERVICE_ACCOUNT: {{ printf "%s@service.local" .Values.data.datafierSa | quote }}

devops/gc/deploy/values.yaml

@@ -18,10 +18,9 @@ data:
   minioExternalEndpoint: "" # use only if external minio is configured
   minioIgnoreCertCheck: "false"
   indexerAugmenterEnabled: "false"
-  policyServiceEnabled: "false"
-  edsEnabled: "true"
+  policyServiceEnabled: "true"
+  edsEnabled: "false"
   minioUIEndpoint: "http://minio:9001"
-  opaEnabled: "true"
   # deployments
   requestsCpu: "5m"
   requestsMemory: "350Mi"

devops/gc/pipeline/override-stages.yml

@@ -34,6 +34,7 @@ gc-deploy: # reuse common deploy job for test deployment
       --set data.dataPartitionId=test
       --set data.partitionNamespace=partition-test
       --set istio.sidecarInject=false
+      --set data.edsEnabled=true
     GC_SA_EMAIL: $GC_SA_GKE_EMAIL
 
 gc-test:
@@ -77,7 +78,8 @@ gc-verified-deploy: # verified deploy after tests
     GC_HELM_NAMESPACE: default
     GC_TENANT: osdu
     # GC_HELM_SETS is blanked since values from gc-deploy is not compatible
-    GC_HELM_SETS: ""
+    GC_HELM_SETS: >-
+      --set data.edsEnabled=true
 
 # Baremetal jobs
 gc-baremetal-deploy-test-env: #infra deploy for on-prem install

provider/partition-gc/bootstrap/data_baremetal.sh

@@ -11,6 +11,10 @@ baremetal_system_partition_data() {
       "sensitive": false,
       "value": "${BUCKET_PREFIX}"
     },
+    "eds.enabled": {
+      "sensitive": false,
+      "value": "${EDS_ENABLED}"
+    },
     "serviceAccount": {
       "sensitive": false,
       "value": "${SERVICE_ACCOUNT}"
@@ -169,7 +173,7 @@ baremetal_system_partition_data() {
     },
     "featureFlag.opa.enabled": {
       "sensitive": false,
-      "value": "${OPA_ENABLED}"
+      "value": "${POLICY_SERVICE_ENABLED}"
     },
     "wellbore-dms-bucket": {
       "sensitive": false,

provider/partition-gc/bootstrap/data_gc.sh

@@ -84,7 +84,7 @@ gc_system_partition_data() {
     },
     "featureFlag.opa.enabled": {
       "sensitive": false,
-      "value": "${OPA_ENABLED}"
+      "value": "${POLICY_SERVICE_ENABLED}"
     }
   }
 }
@@ -121,7 +121,7 @@ gc_additional_partition_data() {
     },
     "featureFlag.opa.enabled": {
       "sensitive": false,
-      "value": "${OPA_ENABLED}"
+      "value": "${POLICY_SERVICE_ENABLED}"
     }
   }
 }