Skip to content

Commit 22a6b67

Browse files
committed
Remove ip and ir shortNames to avoid conflicts
Removes 'ip' and 'ir' aliases to prevent conflicts with existing resources as suggested in the review: - 'ip' conflicts with ipaddresses resource - 'ir' is too short and may cause confusion Remaining shortNames: - ImageRepository: imgrepo, imagerepo - ImagePolicy: imgpol, imagepol Signed-off-by: cappyzawa <[email protected]>
1 parent affdaa3 commit 22a6b67

File tree

4 files changed

+2
-4
lines changed

4 files changed

+2
-4
lines changed

api/v1beta2/imagepolicy_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func (in *ImagePolicy) SetConditions(conditions []metav1.Condition) {
205205
// +kubebuilder:storageversion
206206
// +kubebuilder:object:root=true
207207
// +kubebuilder:subresource:status
208-
// +kubebuilder:resource:shortName=imgpol;imagepol;ip
208+
// +kubebuilder:resource:shortName=imgpol;imagepol
209209
// +kubebuilder:printcolumn:name="LatestImage",type=string,JSONPath=`.status.latestImage`
210210

211211
// ImagePolicy is the Schema for the imagepolicies API

api/v1beta2/imagerepository_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ func (in ImageRepository) GetRequeueAfter() time.Duration {
197197
// +kubebuilder:storageversion
198198
// +kubebuilder:object:root=true
199199
// +kubebuilder:subresource:status
200-
// +kubebuilder:resource:shortName=imgrepo;imagerepo;ir
200+
// +kubebuilder:resource:shortName=imgrepo;imagerepo
201201
// +kubebuilder:printcolumn:name="Last scan",type=string,JSONPath=`.status.lastScanResult.scanTime`
202202
// +kubebuilder:printcolumn:name="Tags",type=string,JSONPath=`.status.lastScanResult.tagCount`
203203

config/crd/bases/image.toolkit.fluxcd.io_imagepolicies.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ spec:
1414
shortNames:
1515
- imgpol
1616
- imagepol
17-
- ip
1817
singular: imagepolicy
1918
scope: Namespaced
2019
versions:

config/crd/bases/image.toolkit.fluxcd.io_imagerepositories.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ spec:
1414
shortNames:
1515
- imgrepo
1616
- imagerepo
17-
- ir
1817
singular: imagerepository
1918
scope: Namespaced
2019
versions:

0 commit comments

Comments
 (0)