Merge pull request GoogleCloudPlatform#2521 from haiyanmeng/acm-hnc-d…

…eprecation Add a note for deprecating Hierarchy Controller in Config Management feature
gemmahou · Aug 16, 2024 · 04a4757 · 04a4757
2 parents 8611d44 + a7808f3
commit 04a4757
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/apis/gkehub/v1beta1/gkehubfeaturemembership_types.go b/apis/gkehub/v1beta1/gkehubfeaturemembership_types.go
@@ -70,7 +70,7 @@ type FeaturemembershipConfigmanagement struct {
 	// +optional
 	ConfigSync *FeaturemembershipConfigSync `json:"configSync,omitempty"`
 
-	/* Hierarchy Controller configuration for the cluster. */
+	/* **DEPRECATED** Configuring Hierarchy Controller through the configmanagement feature is no longer recommended. Use https://github.com/kubernetes-sigs/hierarchical-namespaces instead. */
 	// +optional
 	HierarchyController *FeaturemembershipHierarchyController `json:"hierarchyController,omitempty"`
 

diff --git a/...io_v1_customresourcedefinition_gkehubfeaturememberships.gkehub.cnrm.cloud.google.com.yaml b/...io_v1_customresourcedefinition_gkehubfeaturememberships.gkehub.cnrm.cloud.google.com.yaml
@@ -233,7 +233,10 @@ spec:
                         type: string
                     type: object
                   hierarchyController:
-                    description: Hierarchy Controller configuration for the cluster.
+                    description: '**DEPRECATED** Configuring Hierarchy Controller
+                      through the configmanagement feature is no longer recommended.
+                      Use https://github.com/kubernetes-sigs/hierarchical-namespaces
+                      instead.'
                     properties:
                       enableHierarchicalResourceQuota:
                         description: Whether hierarchical resource quota is enabled

diff --git a/mockgcp/generated/mockgcp/cloud/gkehub/v1beta/configmanagement/configmanagement.pb.go b/mockgcp/generated/mockgcp/cloud/gkehub/v1beta/configmanagement/configmanagement.pb.go
diff --git a/pkg/clients/generated/apis/gkehub/v1beta1/gkehubfeaturemembership_types.go b/pkg/clients/generated/apis/gkehub/v1beta1/gkehubfeaturemembership_types.go
diff --git a/...cs/resource-reference/generated/resource-docs/gkehub/gkehubfeaturemembership.md b/...cs/resource-reference/generated/resource-docs/gkehub/gkehubfeaturemembership.md
@@ -474,7 +474,7 @@ projectRef:
         </td>
         <td>
             <p><code class="apitype">object</code></p>
-            <p>{% verbatim %}Hierarchy Controller configuration for the cluster.{% endverbatim %}</p>
+            <p>{% verbatim %}**DEPRECATED** Configuring Hierarchy Controller through the configmanagement feature is no longer recommended. Use https://github.com/kubernetes-sigs/hierarchical-namespaces instead.{% endverbatim %}</p>
         </td>
     </tr>
     <tr>
-Original file line number
+Diff line change
@@ Expand Up / @@ -474,7 +474,7 @@ projectRef: @@
             </td>
             <td>
                 <p><code class="apitype">object</code></p>
-                <p>{% verbatim %}Hierarchy Controller configuration for the cluster.{% endverbatim %}</p>
+                <p>{% verbatim %}**DEPRECATED** Configuring Hierarchy Controller through the configmanagement feature is no longer recommended. Use https://github.com/kubernetes-sigs/hierarchical-namespaces instead.{% endverbatim %}</p>
             </td>
         </tr>
         <tr>
@@ Expand Down @@