Merge pull request #894 from Nordix/resource_shorter_names

k8s-ci-robot · web-flow · commit 868f0580e152 · 2021-06-09T20:35:27.000-07:00
Add resource shortNames
diff --git a/api/v1alpha3/openstackcluster_types.go b/api/v1alpha3/openstackcluster_types.go
@@ -140,7 +140,7 @@ type OpenStackClusterStatus struct {
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:path=openstackclusters,scope=Namespaced,categories=cluster-api
+// +kubebuilder:resource:path=openstackclusters,scope=Namespaced,categories=cluster-api,shortName=osc
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this OpenStackCluster belongs"
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.ready",description="Cluster infrastructure is ready for OpenStack instances"
diff --git a/api/v1alpha3/openstackmachine_types.go b/api/v1alpha3/openstackmachine_types.go
@@ -128,7 +128,7 @@ type OpenStackMachineStatus struct {
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:path=openstackmachines,scope=Namespaced,categories=cluster-api
+// +kubebuilder:resource:path=openstackmachines,scope=Namespaced,categories=cluster-api,shortName=osm
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this OpenStackMachine belongs"
 // +kubebuilder:printcolumn:name="InstanceState",type="string",JSONPath=".status.instanceState",description="OpenStack instance state"
diff --git a/api/v1alpha3/openstackmachinetemplate_types.go b/api/v1alpha3/openstackmachinetemplate_types.go
@@ -26,7 +26,7 @@ type OpenStackMachineTemplateSpec struct {
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:path=openstackmachinetemplates,scope=Namespaced,categories=cluster-api
+// +kubebuilder:resource:path=openstackmachinetemplates,scope=Namespaced,categories=cluster-api,shortName=osmt
 
 // OpenStackMachineTemplate is the Schema for the openstackmachinetemplates API.
 type OpenStackMachineTemplate struct {
diff --git a/api/v1alpha4/openstackcluster_types.go b/api/v1alpha4/openstackcluster_types.go
@@ -136,7 +136,7 @@ type OpenStackClusterStatus struct {
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:path=openstackclusters,scope=Namespaced,categories=cluster-api
+// +kubebuilder:resource:path=openstackclusters,scope=Namespaced,categories=cluster-api,shortName=osc
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this OpenStackCluster belongs"
diff --git a/api/v1alpha4/openstackmachine_types.go b/api/v1alpha4/openstackmachine_types.go
@@ -129,7 +129,7 @@ type OpenStackMachineStatus struct {
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:path=openstackmachines,scope=Namespaced,categories=cluster-api
+// +kubebuilder:resource:path=openstackmachines,scope=Namespaced,categories=cluster-api,shortName=osm
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this OpenStackMachine belongs"
diff --git a/api/v1alpha4/openstackmachinetemplate_types.go b/api/v1alpha4/openstackmachinetemplate_types.go
@@ -26,7 +26,7 @@ type OpenStackMachineTemplateSpec struct {
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:path=openstackmachinetemplates,scope=Namespaced,categories=cluster-api
+// +kubebuilder:resource:path=openstackmachinetemplates,scope=Namespaced,categories=cluster-api,shortName=osmt
 // +kubebuilder:storageversion
 
 // OpenStackMachineTemplate is the Schema for the openstackmachinetemplates API.
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml
@@ -15,6 +15,8 @@ spec:
     kind: OpenStackCluster
     listKind: OpenStackClusterList
     plural: openstackclusters
+    shortNames:
+    - osc
     singular: openstackcluster
   scope: Namespaced
   versions:
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml
@@ -15,6 +15,8 @@ spec:
     kind: OpenStackMachine
     listKind: OpenStackMachineList
     plural: openstackmachines
+    shortNames:
+    - osm
     singular: openstackmachine
   scope: Namespaced
   versions:
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachinetemplates.yaml
@@ -15,6 +15,8 @@ spec:
     kind: OpenStackMachineTemplate
     listKind: OpenStackMachineTemplateList
     plural: openstackmachinetemplates
+    shortNames:
+    - osmt
     singular: openstackmachinetemplate
   scope: Namespaced
   versions:

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ type OpenStackClusterStatus struct {`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`// +kubebuilder:object:root=true`
`143`		`-// +kubebuilder:resource:path=openstackclusters,scope=Namespaced,categories=cluster-api`
	`143`	`+// +kubebuilder:resource:path=openstackclusters,scope=Namespaced,categories=cluster-api,shortName=osc`
`144`	`144`	`// +kubebuilder:subresource:status`
`145`	`145`	`// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this OpenStackCluster belongs"`
`146`	`146`	`// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.ready",description="Cluster infrastructure is ready for OpenStack instances"`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ type OpenStackMachineStatus struct {`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`// +kubebuilder:object:root=true`
`131`		`-// +kubebuilder:resource:path=openstackmachines,scope=Namespaced,categories=cluster-api`
	`131`	`+// +kubebuilder:resource:path=openstackmachines,scope=Namespaced,categories=cluster-api,shortName=osm`
`132`	`132`	`// +kubebuilder:subresource:status`
`133`	`133`	`// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this OpenStackMachine belongs"`
`134`	`134`	`// +kubebuilder:printcolumn:name="InstanceState",type="string",JSONPath=".status.instanceState",description="OpenStack instance state"`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ type OpenStackMachineTemplateSpec struct {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`// +kubebuilder:object:root=true`
`29`		`-// +kubebuilder:resource:path=openstackmachinetemplates,scope=Namespaced,categories=cluster-api`
	`29`	`+// +kubebuilder:resource:path=openstackmachinetemplates,scope=Namespaced,categories=cluster-api,shortName=osmt`
`30`	`30`
`31`	`31`	`// OpenStackMachineTemplate is the Schema for the openstackmachinetemplates API.`
`32`	`32`	`type OpenStackMachineTemplate struct {`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ type OpenStackClusterStatus struct {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`// +kubebuilder:object:root=true`
`139`		`-// +kubebuilder:resource:path=openstackclusters,scope=Namespaced,categories=cluster-api`
	`139`	`+// +kubebuilder:resource:path=openstackclusters,scope=Namespaced,categories=cluster-api,shortName=osc`
`140`	`140`	`// +kubebuilder:storageversion`
`141`	`141`	`// +kubebuilder:subresource:status`
`142`	`142`	`// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this OpenStackCluster belongs"`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ type OpenStackMachineStatus struct {`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`// +kubebuilder:object:root=true`
`132`		`-// +kubebuilder:resource:path=openstackmachines,scope=Namespaced,categories=cluster-api`
	`132`	`+// +kubebuilder:resource:path=openstackmachines,scope=Namespaced,categories=cluster-api,shortName=osm`
`133`	`133`	`// +kubebuilder:storageversion`
`134`	`134`	`// +kubebuilder:subresource:status`
`135`	`135`	`// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this OpenStackMachine belongs"`