Skip to content

Commit

Permalink
Merge pull request #395 from Fedosin/feat-short-names
Browse files Browse the repository at this point in the history
⚠️ Add short names for custom resources
  • Loading branch information
k8s-ci-robot authored Jan 17, 2024
2 parents f9b8ae9 + e02dc5a commit 6f7c927
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 0 deletions.
1 change: 1 addition & 0 deletions api/v1alpha2/addonprovider_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha2/bootstrapprovider_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha2/controlplaneprovider_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha2/coreprovider_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha2/infrastructureprovider_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha2/ipamprovider_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ spec:
kind: AddonProvider
listKind: AddonProviderList
plural: addonproviders
shortNames:
- caap
singular: addonprovider
scope: Namespaced
versions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ spec:
kind: BootstrapProvider
listKind: BootstrapProviderList
plural: bootstrapproviders
shortNames:
- cabp
singular: bootstrapprovider
scope: Namespaced
versions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ spec:
kind: ControlPlaneProvider
listKind: ControlPlaneProviderList
plural: controlplaneproviders
shortNames:
- cacpp
singular: controlplaneprovider
scope: Namespaced
versions:
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ spec:
kind: CoreProvider
listKind: CoreProviderList
plural: coreproviders
shortNames:
- cacp
singular: coreprovider
scope: Namespaced
versions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ spec:
kind: InfrastructureProvider
listKind: InfrastructureProviderList
plural: infrastructureproviders
shortNames:
- caip
singular: infrastructureprovider
scope: Namespaced
versions:
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/operator.cluster.x-k8s.io_ipamproviders.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ spec:
kind: IPAMProvider
listKind: IPAMProviderList
plural: ipamproviders
shortNames:
- caipamp
singular: ipamprovider
scope: Namespaced
versions:
Expand Down
12 changes: 12 additions & 0 deletions test/e2e/resources/full-chart-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ spec:
kind: AddonProvider
listKind: AddonProviderList
plural: addonproviders
shortNames:
- caap
singular: addonprovider
scope: Namespaced
versions:
Expand Down Expand Up @@ -1591,6 +1593,8 @@ spec:
kind: BootstrapProvider
listKind: BootstrapProviderList
plural: bootstrapproviders
shortNames:
- cabp
singular: bootstrapprovider
scope: Namespaced
versions:
Expand Down Expand Up @@ -4684,6 +4688,8 @@ spec:
kind: ControlPlaneProvider
listKind: ControlPlaneProviderList
plural: controlplaneproviders
shortNames:
- cacpp
singular: controlplaneprovider
scope: Namespaced
versions:
Expand Down Expand Up @@ -7781,6 +7787,8 @@ spec:
kind: CoreProvider
listKind: CoreProviderList
plural: coreproviders
shortNames:
- cacp
singular: coreprovider
scope: Namespaced
versions:
Expand Down Expand Up @@ -10874,6 +10882,8 @@ spec:
kind: InfrastructureProvider
listKind: InfrastructureProviderList
plural: infrastructureproviders
shortNames:
- caip
singular: infrastructureprovider
scope: Namespaced
versions:
Expand Down Expand Up @@ -13971,6 +13981,8 @@ spec:
kind: IPAMProvider
listKind: IPAMProviderList
plural: ipamproviders
shortNames:
- caipamp
singular: ipamprovider
scope: Namespaced
versions:
Expand Down

0 comments on commit 6f7c927

Please sign in to comment.