Skip to content

Commit 4e94f2b

Browse files
committed
fixup! build: Sync APIs
1 parent fa7db25 commit 4e94f2b

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmachine_types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,10 @@ type CloudInit struct {
286286
// For more information on Ignition configuration, see https://coreos.github.io/butane/specs/
287287
type Ignition struct {
288288
// Version defines which version of Ignition will be used to generate bootstrap data.
289+
// Defaults to `2.3` if storageType is set to `ClusterObjectStore`.
290+
// It will be ignored if storageType is set to `UnencryptedUserData`, as the userdata defines its own version.
289291
//
290292
// +optional
291-
// +kubebuilder:default="2.3"
292293
// +kubebuilder:validation:Enum="2.3";"3.0";"3.1";"3.2";"3.3";"3.4"
293294
Version string `json:"version,omitempty"`
294295

api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmanagedclustertemplate_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type AWSManagedClusterTemplateSpec struct {
2626
}
2727

2828
// +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
3030
// +kubebuilder:storageversion
3131

3232
// AWSManagedClusterTemplate is the Schema for the AWSManagedClusterTemplates API.

0 commit comments

Comments
 (0)