From 617cca41c65236cbbb39730359cdcda653fde17a Mon Sep 17 00:00:00 2001
From: Shuya Ma <87669292+shuyama1@users.noreply.github.com>
Date: Thu, 14 Dec 2023 12:05:39 -0800
Subject: [PATCH] Revert "The version field should be under configmanagement
 instead of under oci" (#9645)

---
 mmv1/products/gkehub2/Feature.yaml                          | 6 +++---
 .../services/gkehub2/resource_gke_hub_feature_test.go.erb   | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mmv1/products/gkehub2/Feature.yaml b/mmv1/products/gkehub2/Feature.yaml
index b3968b337586..67be3b1efc02 100644
--- a/mmv1/products/gkehub2/Feature.yaml
+++ b/mmv1/products/gkehub2/Feature.yaml
@@ -215,9 +215,6 @@ properties:
         name: configmanagement
         description: Config Management spec
         properties:
-          - !ruby/object:Api::Type::String
-            name: version
-            description: 'Version of ACM installed'
           - !ruby/object:Api::Type::NestedObject
             name: configSync
             description: 'ConfigSync configuration for the cluster'
@@ -274,6 +271,9 @@ properties:
                   - !ruby/object:Api::Type::String
                     name: syncWaitSecs
                     description: 'Period in seconds between consecutive syncs. Default: 15'
+                  - !ruby/object:Api::Type::String
+                    name: version
+                    description: 'Version of ACM installed'
       - !ruby/object:Api::Type::NestedObject
         name: policycontroller
         description: Policy Controller spec
diff --git a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb
index 5af1d572cfd7..f2c14b2d223f 100644
--- a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb
+++ b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb
@@ -460,7 +460,6 @@ resource "google_gke_hub_feature" "feature" {
   location = "global"
   fleet_default_member_config {
     configmanagement {
-      version = "1.16.0"
       config_sync {
         source_format = "hierarchy"
         git {
@@ -487,7 +486,6 @@ resource "google_gke_hub_feature" "feature" {
   location = "global"
   fleet_default_member_config {
     configmanagement {
-      version = "1.16.1"
       config_sync {
         source_format = "unstructured"
         oci {