gc: update bootstrap templates

provider/partition-gc/bootstrap/data_baremetal.sh

@@ -139,7 +139,7 @@ baremetal_system_partition_data() {
       "sensitive": false,
       "value": "${INDEXER_AUGMENTER_ENABLED}"
     },
-    "policy-service-enabled": {
+    "featureFlag.policy.enabled": {
       "sensitive": false,
       "value": "${POLICY_SERVICE_ENABLED}"
     },

provider/partition-gc/bootstrap/data_gc.sh

@@ -78,15 +78,19 @@ gc_system_partition_data() {
       "sensitive": false,
       "value": "${PROJECT_ID}-system-schema"
     },
-    "system.eds.enabled": {
+    "system.featureFlag.eds.enabled": {
       "sensitive": false,
       "value": "${EDS_ENABLED}"
     },
-    "featureFlag.opa.enabled": {
+    "system.featureFlag.opa.enabled": {
       "sensitive": false,
       "value": "${POLICY_SERVICE_ENABLED}"
     },
-    "featureFlag.autocomplete.enabled": {
+    "system.featureFlag.policy.enabled": {
+      "sensitive": false,
+      "value": "${POLICY_SERVICE_ENABLED}"
+    },
+    "system.featureFlag.autocomplete.enabled": {
       "sensitive": false,
       "value": "${AUTOCOMPLETE_ENABLED}"
     }
@@ -99,10 +103,6 @@ gc_additional_partition_data() {
   cat <<EOF
 {
   "properties": {
-    "policy-service-enabled": {
-      "sensitive": false,
-      "value": "${POLICY_SERVICE_ENABLED}"
-    },
     "kubernetes-secret-name": {
       "sensitive": false,
       "value": "eds-${DATA_PARTITION_ID_VALUE}"
@@ -119,7 +119,7 @@ gc_additional_partition_data() {
       "sensitive": false,
       "value": "${PROJECT_ID}-${DATA_PARTITION_ID_VALUE}-schema"
     },
-    "eds.enabled": {
+    "featureFlag.eds.enabled": {
       "sensitive": false,
       "value": "${EDS_ENABLED}"
     },
@@ -127,6 +127,10 @@ gc_additional_partition_data() {
       "sensitive": false,
       "value": "${POLICY_SERVICE_ENABLED}"
     },
+    "featureFlag.policy.enabled": {
+      "sensitive": false,
+      "value": "${POLICY_SERVICE_ENABLED}"
+    },
     "featureFlag.autocomplete.enabled": {
       "sensitive": false,
       "value": "${AUTOCOMPLETE_ENABLED}"