Merge pull request GoogleCloudPlatform#2675 from yuwenma/update-doc

doc: correct the term "deprecated" in Hierarchy Controller
xiaoweim · Sep 11, 2024 · 598be97 · 598be97
2 parents eda5abe + d83cfa5
commit 598be97
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 30 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"`
 
-	/* **DEPRECATED** Configuring Hierarchy Controller through the configmanagement feature is no longer recommended. Use https://github.com/kubernetes-sigs/hierarchical-namespaces instead. */
+	/* Hierarchy Controller is no longer available. 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
@@ -229,10 +229,8 @@ spec:
                         type: string
                     type: object
                   hierarchyController:
-                    description: '**DEPRECATED** Configuring Hierarchy Controller
-                      through the configmanagement feature is no longer recommended.
-                      Use https://github.com/kubernetes-sigs/hierarchical-namespaces
-                      instead.'
+                    description: Hierarchy Controller is no longer available. Use
+                      https://github.com/kubernetes-sigs/hierarchical-namespaces instead.
                     properties:
                       enableHierarchicalResourceQuota:
                         description: Whether hierarchical resource quota is enabled

diff --git a/...bfeaturemembership/config-management-feature-membership/gkehub_v1beta1_gkehubfeature.yaml b/...bfeaturemembership/config-management-feature-membership/gkehub_v1beta1_gkehubfeature.yaml
@@ -16,8 +16,6 @@ apiVersion: gkehub.cnrm.cloud.google.com/v1beta1
 kind: GKEHubFeature
 metadata:
   name: gkehubfeaturemembership-dep-acm
-  # The GKEHubFeature is a global resource in your project.
-  # In case you might have configured the resource using other clients like gcloud, abandon the resource when deleted.
   annotations:
     cnrm.cloud.google.com/deletion-policy: abandon
 spec:

diff --git a/crds/gkehub_v1beta1_gkehubfeaturemembership.yaml b/crds/gkehub_v1beta1_gkehubfeaturemembership.yaml
@@ -242,8 +242,7 @@ spec:
                         type: string
                     type: object
                   hierarchyController:
-                    description: '**DEPRECATED** Configuring Hierarchy Controller
-                      through the configmanagement feature is no longer recommended.
+                    description: 'Hierarchy Controller is no longer available.
                       Use https://github.com/kubernetes-sigs/hierarchical-namespaces
                       instead.'
                     properties:

diff --git a/install-bundles/install-bundle-autopilot-gcp-identity/crds.yaml b/install-bundles/install-bundle-autopilot-gcp-identity/crds.yaml
@@ -79143,8 +79143,7 @@ spec:
                         type: string
                     type: object
                   hierarchyController:
-                    description: '**DEPRECATED** Configuring Hierarchy Controller
-                      through the configmanagement feature is no longer recommended.
+                    description: 'Hierarchy Controller is no longer available.
                       Use https://github.com/kubernetes-sigs/hierarchical-namespaces
                       instead.'
                     properties:

diff --git a/install-bundles/install-bundle-autopilot-namespaced/crds.yaml b/install-bundles/install-bundle-autopilot-namespaced/crds.yaml
@@ -79143,8 +79143,7 @@ spec:
                         type: string
                     type: object
                   hierarchyController:
-                    description: '**DEPRECATED** Configuring Hierarchy Controller
-                      through the configmanagement feature is no longer recommended.
+                    description: 'Hierarchy Controller is no longer available.
                       Use https://github.com/kubernetes-sigs/hierarchical-namespaces
                       instead.'
                     properties:

diff --git a/install-bundles/install-bundle-autopilot-workload-identity/crds.yaml b/install-bundles/install-bundle-autopilot-workload-identity/crds.yaml
@@ -79143,8 +79143,7 @@ spec:
                         type: string
                     type: object
                   hierarchyController:
-                    description: '**DEPRECATED** Configuring Hierarchy Controller
-                      through the configmanagement feature is no longer recommended.
+                    description: 'Hierarchy Controller is no longer available.
                       Use https://github.com/kubernetes-sigs/hierarchical-namespaces
                       instead.'
                     properties:

diff --git a/install-bundles/install-bundle-gcp-identity/crds.yaml b/install-bundles/install-bundle-gcp-identity/crds.yaml
@@ -79143,8 +79143,7 @@ spec:
                         type: string
                     type: object
                   hierarchyController:
-                    description: '**DEPRECATED** Configuring Hierarchy Controller
-                      through the configmanagement feature is no longer recommended.
+                    description: 'Hierarchy Controller is no longer available.
                       Use https://github.com/kubernetes-sigs/hierarchical-namespaces
                       instead.'
                     properties:

diff --git a/install-bundles/install-bundle-namespaced/crds.yaml b/install-bundles/install-bundle-namespaced/crds.yaml
@@ -79143,8 +79143,7 @@ spec:
                         type: string
                     type: object
                   hierarchyController:
-                    description: '**DEPRECATED** Configuring Hierarchy Controller
-                      through the configmanagement feature is no longer recommended.
+                    description: 'Hierarchy Controller is no longer available.
                       Use https://github.com/kubernetes-sigs/hierarchical-namespaces
                       instead.'
                     properties:

diff --git a/install-bundles/install-bundle-workload-identity/crds.yaml b/install-bundles/install-bundle-workload-identity/crds.yaml
@@ -79143,8 +79143,7 @@ spec:
                         type: string
                     type: object
                   hierarchyController:
-                    description: '**DEPRECATED** Configuring Hierarchy Controller
-                      through the configmanagement feature is no longer recommended.
+                    description: 'Hierarchy Controller is no longer available.
                       Use https://github.com/kubernetes-sigs/hierarchical-namespaces
                       instead.'
                     properties:

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/operator/autopilot-channels/packages/configconnector/1.122.0/crds.yaml b/operator/autopilot-channels/packages/configconnector/1.122.0/crds.yaml
@@ -79143,8 +79143,7 @@ spec:
                         type: string
                     type: object
                   hierarchyController:
-                    description: '**DEPRECATED** Configuring Hierarchy Controller
-                      through the configmanagement feature is no longer recommended.
+                    description: 'Hierarchy Controller is no longer available.
                       Use https://github.com/kubernetes-sigs/hierarchical-namespaces
                       instead.'
                     properties:

diff --git a/operator/channels/packages/configconnector/1.122.0/crds.yaml b/operator/channels/packages/configconnector/1.122.0/crds.yaml
@@ -79143,8 +79143,7 @@ spec:
                         type: string
                     type: object
                   hierarchyController:
-                    description: '**DEPRECATED** Configuring Hierarchy Controller
-                      through the configmanagement feature is no longer recommended.
+                    description: 'Hierarchy Controller is no longer available.
                       Use https://github.com/kubernetes-sigs/hierarchical-namespaces
                       instead.'
                     properties:

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 %}**DEPRECATED** Configuring Hierarchy Controller through the configmanagement feature is no longer recommended. Use https://github.com/kubernetes-sigs/hierarchical-namespaces instead.{% endverbatim %}</p>
+            <p>{% verbatim %}Hierarchy Controller is no longer available. Use https://github.com/kubernetes-sigs/hierarchical-namespaces instead.{% endverbatim %}</p>
         </td>
     </tr>
     <tr>
@@ -1120,8 +1120,6 @@ apiVersion: gkehub.cnrm.cloud.google.com/v1beta1
 kind: GKEHubFeature
 metadata:
   name: gkehubfeaturemembership-dep-acm
-  # The GKEHubFeature is a global resource in your project.
-  # In case you might have configured the resource using other clients like gcloud, abandon the resource when deleted.
   annotations:
     cnrm.cloud.google.com/deletion-policy: abandon
 spec: