From 5851a6c4a951986602bf1a7fe567787ce66d7586 Mon Sep 17 00:00:00 2001 From: Amine Hilaly Date: Tue, 26 Apr 2022 16:52:32 +0200 Subject: [PATCH] Add additional print columns to `Repository` CRD --- apis/v1alpha1/ack-generate-metadata.yaml | 8 ++++---- apis/v1alpha1/generator.yaml | 9 +++++++++ apis/v1alpha1/repository.go | 2 ++ config/crd/bases/ecr.services.k8s.aws_repositories.yaml | 9 ++++++++- generator.yaml | 9 +++++++++ helm/crds/ecr.services.k8s.aws_repositories.yaml | 9 ++++++++- 6 files changed, 40 insertions(+), 6 deletions(-) diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 1ea29de..69834eb 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,13 +1,13 @@ ack_generate_info: - build_date: "2022-04-20T20:24:26Z" + build_date: "2022-04-26T14:51:43Z" build_hash: ec6a51dc81164f0ee81c10e403bef9c00571384a go_version: go1.17.6 - version: v0.18.4-1-gec6a51d -api_directory_checksum: eb0e738ff4033343e16d5f30accb673360632793 + version: v0.18.4-1-gec6a51d-dirty +api_directory_checksum: 60f01be220cbe886766da65ac22bd0b54c06790b api_version: v1alpha1 aws_sdk_go_version: v1.42.0 generator_config_info: - file_checksum: 0d4da9376313edcb86631a3fdfebc2db0f795a2d + file_checksum: 0912b2aa4677e438672a906c5d7a80ccc2486230 original_file_name: generator.yaml last_modification: reason: API generation diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml index 5b7fa32..3e68112 100644 --- a/apis/v1alpha1/generator.yaml +++ b/apis/v1alpha1/generator.yaml @@ -1,5 +1,7 @@ resources: Repository: + print: + order_by: index fields: Name: is_primary_key: true @@ -20,6 +22,13 @@ resources: is_ignored: true RegistryID: late_initialize: {} + print: + name: REGISTRY-ID + index: 0 + ImageTagMutability: + print: + name: IMAGE-TAG-MUTABILITY + index: 1 renames: operations: CreateRepository: diff --git a/apis/v1alpha1/repository.go b/apis/v1alpha1/repository.go index 0b056f4..c695725 100644 --- a/apis/v1alpha1/repository.go +++ b/apis/v1alpha1/repository.go @@ -81,6 +81,8 @@ type RepositoryStatus struct { // Repository is the Schema for the Repositories API // +kubebuilder:object:root=true // +kubebuilder:subresource:status +// +kubebuilder:printcolumn:name="REGISTRY-ID",type=string,priority=0,JSONPath=`.spec.registryID` +// +kubebuilder:printcolumn:name="IMAGE-TAG-MUTABILITY",type=string,priority=0,JSONPath=`.spec.imageTagMutability` type Repository struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/config/crd/bases/ecr.services.k8s.aws_repositories.yaml b/config/crd/bases/ecr.services.k8s.aws_repositories.yaml index c62fb21..2fb0b42 100644 --- a/config/crd/bases/ecr.services.k8s.aws_repositories.yaml +++ b/config/crd/bases/ecr.services.k8s.aws_repositories.yaml @@ -16,7 +16,14 @@ spec: singular: repository scope: Namespaced versions: - - name: v1alpha1 + - additionalPrinterColumns: + - jsonPath: .spec.registryID + name: REGISTRY-ID + type: string + - jsonPath: .spec.imageTagMutability + name: IMAGE-TAG-MUTABILITY + type: string + name: v1alpha1 schema: openAPIV3Schema: description: Repository is the Schema for the Repositories API diff --git a/generator.yaml b/generator.yaml index 5b7fa32..3e68112 100644 --- a/generator.yaml +++ b/generator.yaml @@ -1,5 +1,7 @@ resources: Repository: + print: + order_by: index fields: Name: is_primary_key: true @@ -20,6 +22,13 @@ resources: is_ignored: true RegistryID: late_initialize: {} + print: + name: REGISTRY-ID + index: 0 + ImageTagMutability: + print: + name: IMAGE-TAG-MUTABILITY + index: 1 renames: operations: CreateRepository: diff --git a/helm/crds/ecr.services.k8s.aws_repositories.yaml b/helm/crds/ecr.services.k8s.aws_repositories.yaml index c62fb21..2fb0b42 100644 --- a/helm/crds/ecr.services.k8s.aws_repositories.yaml +++ b/helm/crds/ecr.services.k8s.aws_repositories.yaml @@ -16,7 +16,14 @@ spec: singular: repository scope: Namespaced versions: - - name: v1alpha1 + - additionalPrinterColumns: + - jsonPath: .spec.registryID + name: REGISTRY-ID + type: string + - jsonPath: .spec.imageTagMutability + name: IMAGE-TAG-MUTABILITY + type: string + name: v1alpha1 schema: openAPIV3Schema: description: Repository is the Schema for the Repositories API