Merge pull request #5663 from k8s-infra-cherrypick-robot/cherry-pick-5662-to-release-2.9

k8s-ci-robot · web-flow · commit 6066097a1e1f · 2025-09-10T08:55:58.000-07:00
[release-2.9] 🐛 Fix AWSManagedClusterTemplate short name
diff --git a/api/v1beta2/awsmanagedclustertemplate_types.go b/api/v1beta2/awsmanagedclustertemplate_types.go
@@ -26,7 +26,7 @@ type AWSManagedClusterTemplateSpec struct {
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:path=awsmanagedclustertemplates,scope=Namespaced,categories=cluster-api,shortName=amct
+// +kubebuilder:resource:path=awsmanagedclustertemplates,scope=Namespaced,categories=cluster-api,shortName=awsmct
 // +kubebuilder:storageversion
 
 // AWSManagedClusterTemplate is the Schema for the AWSManagedClusterTemplates API.
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedclustertemplates.yaml
@@ -14,7 +14,7 @@ spec:
     listKind: AWSManagedClusterTemplateList
     plural: awsmanagedclustertemplates
     shortNames:
-    - amct
+    - awsmct
     singular: awsmanagedclustertemplate
   scope: Namespaced
   versions:

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ type AWSManagedClusterTemplateSpec struct {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`// +kubebuilder:object:root=true`
`29`		`-// +kubebuilder:resource:path=awsmanagedclustertemplates,scope=Namespaced,categories=cluster-api,shortName=amct`
	`29`	`+// +kubebuilder:resource:path=awsmanagedclustertemplates,scope=Namespaced,categories=cluster-api,shortName=awsmct`
`30`	`30`	`// +kubebuilder:storageversion`
`31`	`31`
`32`	`32`	`// AWSManagedClusterTemplate is the Schema for the AWSManagedClusterTemplates API.`