Moving the version to under the parent field configmanagement

GoogleCloudPlatform · Dec 14, 2023 · 4ab36d5 · 4ab36d5
1 parent 3a3b389
commit 4ab36d5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/mmv1/products/gkehub2/Feature.yaml b/mmv1/products/gkehub2/Feature.yaml
@@ -215,6 +215,9 @@ 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 +277,7 @@ properties:
                   - !ruby/object:Api::Type::String
                     name: version
                     description: 'Version of ACM installed'
+                    deprecation_message: The configmanagement.config_sync.oci.version field is deprecated and will be removed in a future major release. Please use configmanagement.version field to specify the version of ACM installed instead.
       - !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
@@ -460,6 +460,7 @@ resource "google_gke_hub_feature" "feature" {
   location = "global"
   fleet_default_member_config {
     configmanagement {
+      version = "1.16.0"
       config_sync {
         source_format = "hierarchy"
         git {
@@ -486,6 +487,7 @@ resource "google_gke_hub_feature" "feature" {
   location = "global"
   fleet_default_member_config {
     configmanagement {
+      version = "1.16.1"
       config_sync {
         source_format = "unstructured"
         oci {