Merge pull request GoogleCloudPlatform#3456 from acpana/acpana/fix-so…

…me-shortnames fix:shortnames: worstationcluster
nb-goog · Jan 8, 2025 · 416bc83 · 416bc83
2 parents eacb025 + c57b41c
commit 416bc83
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/apis/workstations/v1alpha1/cluster_types.go b/apis/workstations/v1alpha1/cluster_types.go
@@ -151,7 +151,7 @@ type WorkstationClusterObservedState struct {
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:resource:categories=gcp
+// +kubebuilder:resource:categories=gcp,shortName=gcpworkstationcluster;gcpworkstationclusters
 // +kubebuilder:subresource:status
 // +kubebuilder:metadata:labels="cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/system=true"
 // +kubebuilder:printcolumn:name="Age",JSONPath=".metadata.creationTimestamp",type="date"

diff --git a/apis/workstations/v1beta1/cluster_types.go b/apis/workstations/v1beta1/cluster_types.go
@@ -151,7 +151,7 @@ type WorkstationClusterObservedState struct {
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:resource:categories=gcp
+// +kubebuilder:resource:categories=gcp,shortName=gcpworkstationcluster;gcpworkstationclusters
 // +kubebuilder:subresource:status
 // +kubebuilder:metadata:labels="cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/system=true"
 // +kubebuilder:printcolumn:name="Age",JSONPath=".metadata.creationTimestamp",type="date"

diff --git a/...o_v1_customresourcedefinition_workstationclusters.workstations.cnrm.cloud.google.com.yaml b/...o_v1_customresourcedefinition_workstationclusters.workstations.cnrm.cloud.google.com.yaml
@@ -16,6 +16,9 @@ spec:
     kind: WorkstationCluster
     listKind: WorkstationClusterList
     plural: workstationclusters
+    shortNames:
+    - gcpworkstationcluster
+    - gcpworkstationclusters
     singular: workstationcluster
   preserveUnknownFields: false
   scope: Namespaced

diff --git a/...s/resource-reference/generated/resource-docs/workstations/workstationcluster.md b/...s/resource-reference/generated/resource-docs/workstations/workstationcluster.md
@@ -30,7 +30,7 @@
 </tr>
 <tr>
 <td>{{product_name_short}} Resource Short Names</td>
-<td>workstationcluster</td>
+<td>gcpworkstationcluster<br>gcpworkstationclusters<br>workstationcluster</td>
 </tr>
 <tr>
 <td>{{product_name_short}} Service Name</td>

diff --git a/tests/apichecks/testdata/exceptions/shortnames.txt b/tests/apichecks/testdata/exceptions/shortnames.txt
@@ -11,5 +11,4 @@
 [shortnames] crd=networkconnectivityserviceconnectionpolicies.networkconnectivity.cnrm.cloud.google.com: missing shortnames
 [shortnames] crd=privilegedaccessmanagerentitlements.privilegedaccessmanager.cnrm.cloud.google.com: missing shortnames
 [shortnames] crd=redisclusters.redis.cnrm.cloud.google.com: missing shortnames
-[shortnames] crd=validatingwebhookconfigurationcustomizations.customize.core.cnrm.cloud.google.com: missing shortnames
-[shortnames] crd=workstationclusters.workstations.cnrm.cloud.google.com: missing shortnames
+[shortnames] crd=validatingwebhookconfigurationcustomizations.customize.core.cnrm.cloud.google.com: missing shortnames