Add short names for custom resources

Fedosin · Fedosin · commit e02dc5a90914 · 2024-01-17T11:06:59.000+01:00
diff --git a/api/v1alpha2/addonprovider_types.go b/api/v1alpha2/addonprovider_types.go
@@ -31,6 +31,7 @@ type AddonProviderStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:path=addonproviders,shortName=caap,scope=Namespaced
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="InstalledVersion",type="string",JSONPath=".status.installedVersion"
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
diff --git a/api/v1alpha2/bootstrapprovider_types.go b/api/v1alpha2/bootstrapprovider_types.go
@@ -31,6 +31,7 @@ type BootstrapProviderStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:path=bootstrapproviders,shortName=cabp,scope=Namespaced
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="InstalledVersion",type="string",JSONPath=".status.installedVersion"
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
diff --git a/api/v1alpha2/controlplaneprovider_types.go b/api/v1alpha2/controlplaneprovider_types.go
@@ -31,6 +31,7 @@ type ControlPlaneProviderStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:path=controlplaneproviders,shortName=cacpp,scope=Namespaced
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="InstalledVersion",type="string",JSONPath=".status.installedVersion"
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
diff --git a/api/v1alpha2/coreprovider_types.go b/api/v1alpha2/coreprovider_types.go
@@ -31,6 +31,7 @@ type CoreProviderStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:path=coreproviders,shortName=cacp,scope=Namespaced
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="InstalledVersion",type="string",JSONPath=".status.installedVersion"
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
diff --git a/api/v1alpha2/infrastructureprovider_types.go b/api/v1alpha2/infrastructureprovider_types.go
@@ -31,6 +31,7 @@ type InfrastructureProviderStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:path=infrastructureproviders,shortName=caip,scope=Namespaced
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="InstalledVersion",type="string",JSONPath=".status.installedVersion"
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
diff --git a/api/v1alpha2/ipamprovider_types.go b/api/v1alpha2/ipamprovider_types.go
@@ -31,6 +31,7 @@ type IPAMProviderStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:path=ipamproviders,shortName=caipamp,scope=Namespaced
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="InstalledVersion",type="string",JSONPath=".status.installedVersion"
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
diff --git a/config/crd/bases/operator.cluster.x-k8s.io_addonproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_addonproviders.yaml
@@ -11,6 +11,8 @@ spec:
     kind: AddonProvider
     listKind: AddonProviderList
     plural: addonproviders
+    shortNames:
+    - caap
     singular: addonprovider
   scope: Namespaced
   versions:
diff --git a/config/crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml
@@ -11,6 +11,8 @@ spec:
     kind: BootstrapProvider
     listKind: BootstrapProviderList
     plural: bootstrapproviders
+    shortNames:
+    - cabp
     singular: bootstrapprovider
   scope: Namespaced
   versions:
diff --git a/config/crd/bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml
@@ -11,6 +11,8 @@ spec:
     kind: ControlPlaneProvider
     listKind: ControlPlaneProviderList
     plural: controlplaneproviders
+    shortNames:
+    - cacpp
     singular: controlplaneprovider
   scope: Namespaced
   versions:
diff --git a/config/crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml
@@ -11,6 +11,8 @@ spec:
     kind: CoreProvider
     listKind: CoreProviderList
     plural: coreproviders
+    shortNames:
+    - cacp
     singular: coreprovider
   scope: Namespaced
   versions:
diff --git a/config/crd/bases/operator.cluster.x-k8s.io_infrastructureproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_infrastructureproviders.yaml
@@ -11,6 +11,8 @@ spec:
     kind: InfrastructureProvider
     listKind: InfrastructureProviderList
     plural: infrastructureproviders
+    shortNames:
+    - caip
     singular: infrastructureprovider
   scope: Namespaced
   versions:
diff --git a/config/crd/bases/operator.cluster.x-k8s.io_ipamproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_ipamproviders.yaml
@@ -11,6 +11,8 @@ spec:
     kind: IPAMProvider
     listKind: IPAMProviderList
     plural: ipamproviders
+    shortNames:
+    - caipamp
     singular: ipamprovider
   scope: Namespaced
   versions:
diff --git a/test/e2e/resources/full-chart-install.yaml b/test/e2e/resources/full-chart-install.yaml
@@ -27,6 +27,8 @@ spec:
     kind: AddonProvider
     listKind: AddonProviderList
     plural: addonproviders
+    shortNames:
+    - caap
     singular: addonprovider
   scope: Namespaced
   versions:
@@ -1591,6 +1593,8 @@ spec:
     kind: BootstrapProvider
     listKind: BootstrapProviderList
     plural: bootstrapproviders
+    shortNames:
+    - cabp
     singular: bootstrapprovider
   scope: Namespaced
   versions:
@@ -4684,6 +4688,8 @@ spec:
     kind: ControlPlaneProvider
     listKind: ControlPlaneProviderList
     plural: controlplaneproviders
+    shortNames:
+    - cacpp
     singular: controlplaneprovider
   scope: Namespaced
   versions:
@@ -7781,6 +7787,8 @@ spec:
     kind: CoreProvider
     listKind: CoreProviderList
     plural: coreproviders
+    shortNames:
+    - cacp
     singular: coreprovider
   scope: Namespaced
   versions:
@@ -10874,6 +10882,8 @@ spec:
     kind: InfrastructureProvider
     listKind: InfrastructureProviderList
     plural: infrastructureproviders
+    shortNames:
+    - caip
     singular: infrastructureprovider
   scope: Namespaced
   versions:
@@ -13971,6 +13981,8 @@ spec:
     kind: IPAMProvider
     listKind: IPAMProviderList
     plural: ipamproviders
+    shortNames:
+    - caipamp
     singular: ipamprovider
   scope: Namespaced
   versions:

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ type AddonProviderStatus struct {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`// +kubebuilder:object:root=true`
	`34`	`+// +kubebuilder:resource:path=addonproviders,shortName=caap,scope=Namespaced`
`34`	`35`	`// +kubebuilder:subresource:status`
`35`	`36`	`// +kubebuilder:printcolumn:name="InstalledVersion",type="string",JSONPath=".status.installedVersion"`
`36`	`37`	`// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ type BootstrapProviderStatus struct {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`// +kubebuilder:object:root=true`
	`34`	`+// +kubebuilder:resource:path=bootstrapproviders,shortName=cabp,scope=Namespaced`
`34`	`35`	`// +kubebuilder:subresource:status`
`35`	`36`	`// +kubebuilder:printcolumn:name="InstalledVersion",type="string",JSONPath=".status.installedVersion"`
`36`	`37`	`// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ type ControlPlaneProviderStatus struct {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`// +kubebuilder:object:root=true`
	`34`	`+// +kubebuilder:resource:path=controlplaneproviders,shortName=cacpp,scope=Namespaced`
`34`	`35`	`// +kubebuilder:subresource:status`
`35`	`36`	`// +kubebuilder:printcolumn:name="InstalledVersion",type="string",JSONPath=".status.installedVersion"`
`36`	`37`	`// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ type CoreProviderStatus struct {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`// +kubebuilder:object:root=true`
	`34`	`+// +kubebuilder:resource:path=coreproviders,shortName=cacp,scope=Namespaced`
`34`	`35`	`// +kubebuilder:subresource:status`
`35`	`36`	`// +kubebuilder:printcolumn:name="InstalledVersion",type="string",JSONPath=".status.installedVersion"`
`36`	`37`	`// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ type InfrastructureProviderStatus struct {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`// +kubebuilder:object:root=true`
	`34`	`+// +kubebuilder:resource:path=infrastructureproviders,shortName=caip,scope=Namespaced`
`34`	`35`	`// +kubebuilder:subresource:status`
`35`	`36`	`// +kubebuilder:printcolumn:name="InstalledVersion",type="string",JSONPath=".status.installedVersion"`
`36`	`37`	`// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ type IPAMProviderStatus struct {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`// +kubebuilder:object:root=true`
	`34`	`+// +kubebuilder:resource:path=ipamproviders,shortName=caipamp,scope=Namespaced`
`34`	`35`	`// +kubebuilder:subresource:status`
`35`	`36`	`// +kubebuilder:printcolumn:name="InstalledVersion",type="string",JSONPath=".status.installedVersion"`
`36`	`37`	`// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"`