From 01eea9189c797a15c2d64d10fad8aaa774d74415 Mon Sep 17 00:00:00 2001 From: hejianpeng Date: Fri, 29 Jul 2022 11:30:57 +0800 Subject: [PATCH] support CRD category Signed-off-by: hejianpeng --- .../bases/networking.karmada.io_multiclusteringresses.yaml | 2 ++ .../bases/policy.karmada.io_clusteroverridepolicies.yaml | 2 ++ .../bases/policy.karmada.io_clusterpropagationpolicies.yaml | 2 ++ .../bases/policy.karmada.io_federatedresourcequotas.yaml | 2 ++ .../_crds/bases/policy.karmada.io_overridepolicies.yaml | 2 ++ .../_crds/bases/policy.karmada.io_propagationpolicies.yaml | 2 ++ .../_crds/bases/work.karmada.io_clusterresourcebindings.yaml | 2 ++ .../karmada/_crds/bases/work.karmada.io_resourcebindings.yaml | 2 ++ charts/karmada/_crds/bases/work.karmada.io_works.yaml | 2 ++ pkg/apis/networking/v1alpha1/ingress_types.go | 2 +- pkg/apis/policy/v1alpha1/federatedresourcequota_types.go | 1 + pkg/apis/policy/v1alpha1/override_types.go | 4 ++-- pkg/apis/policy/v1alpha1/propagation_types.go | 4 ++-- pkg/apis/work/v1alpha1/binding_types.go | 4 ++-- pkg/apis/work/v1alpha1/work_types.go | 1 + pkg/apis/work/v1alpha2/binding_types.go | 4 ++-- 16 files changed, 29 insertions(+), 9 deletions(-) diff --git a/charts/karmada/_crds/bases/networking.karmada.io_multiclusteringresses.yaml b/charts/karmada/_crds/bases/networking.karmada.io_multiclusteringresses.yaml index 61418511e..69c504520 100644 --- a/charts/karmada/_crds/bases/networking.karmada.io_multiclusteringresses.yaml +++ b/charts/karmada/_crds/bases/networking.karmada.io_multiclusteringresses.yaml @@ -9,6 +9,8 @@ metadata: spec: group: networking.karmada.io names: + categories: + - karmada-io kind: MultiClusterIngress listKind: MultiClusterIngressList plural: multiclusteringresses diff --git a/charts/karmada/_crds/bases/policy.karmada.io_clusteroverridepolicies.yaml b/charts/karmada/_crds/bases/policy.karmada.io_clusteroverridepolicies.yaml index 7f584164e..fd96eb7f2 100644 --- a/charts/karmada/_crds/bases/policy.karmada.io_clusteroverridepolicies.yaml +++ b/charts/karmada/_crds/bases/policy.karmada.io_clusteroverridepolicies.yaml @@ -9,6 +9,8 @@ metadata: spec: group: policy.karmada.io names: + categories: + - karmada-io kind: ClusterOverridePolicy listKind: ClusterOverridePolicyList plural: clusteroverridepolicies diff --git a/charts/karmada/_crds/bases/policy.karmada.io_clusterpropagationpolicies.yaml b/charts/karmada/_crds/bases/policy.karmada.io_clusterpropagationpolicies.yaml index ab0830221..93869b4ac 100644 --- a/charts/karmada/_crds/bases/policy.karmada.io_clusterpropagationpolicies.yaml +++ b/charts/karmada/_crds/bases/policy.karmada.io_clusterpropagationpolicies.yaml @@ -9,6 +9,8 @@ metadata: spec: group: policy.karmada.io names: + categories: + - karmada-io kind: ClusterPropagationPolicy listKind: ClusterPropagationPolicyList plural: clusterpropagationpolicies diff --git a/charts/karmada/_crds/bases/policy.karmada.io_federatedresourcequotas.yaml b/charts/karmada/_crds/bases/policy.karmada.io_federatedresourcequotas.yaml index 8a76d3398..950849408 100644 --- a/charts/karmada/_crds/bases/policy.karmada.io_federatedresourcequotas.yaml +++ b/charts/karmada/_crds/bases/policy.karmada.io_federatedresourcequotas.yaml @@ -9,6 +9,8 @@ metadata: spec: group: policy.karmada.io names: + categories: + - karmada-io kind: FederatedResourceQuota listKind: FederatedResourceQuotaList plural: federatedresourcequotas diff --git a/charts/karmada/_crds/bases/policy.karmada.io_overridepolicies.yaml b/charts/karmada/_crds/bases/policy.karmada.io_overridepolicies.yaml index 4d963d660..b73c2bdf3 100644 --- a/charts/karmada/_crds/bases/policy.karmada.io_overridepolicies.yaml +++ b/charts/karmada/_crds/bases/policy.karmada.io_overridepolicies.yaml @@ -9,6 +9,8 @@ metadata: spec: group: policy.karmada.io names: + categories: + - karmada-io kind: OverridePolicy listKind: OverridePolicyList plural: overridepolicies diff --git a/charts/karmada/_crds/bases/policy.karmada.io_propagationpolicies.yaml b/charts/karmada/_crds/bases/policy.karmada.io_propagationpolicies.yaml index 4095d28d6..d4645d664 100644 --- a/charts/karmada/_crds/bases/policy.karmada.io_propagationpolicies.yaml +++ b/charts/karmada/_crds/bases/policy.karmada.io_propagationpolicies.yaml @@ -9,6 +9,8 @@ metadata: spec: group: policy.karmada.io names: + categories: + - karmada-io kind: PropagationPolicy listKind: PropagationPolicyList plural: propagationpolicies diff --git a/charts/karmada/_crds/bases/work.karmada.io_clusterresourcebindings.yaml b/charts/karmada/_crds/bases/work.karmada.io_clusterresourcebindings.yaml index 36e7552bb..628f1e92f 100644 --- a/charts/karmada/_crds/bases/work.karmada.io_clusterresourcebindings.yaml +++ b/charts/karmada/_crds/bases/work.karmada.io_clusterresourcebindings.yaml @@ -9,6 +9,8 @@ metadata: spec: group: work.karmada.io names: + categories: + - karmada-io kind: ClusterResourceBinding listKind: ClusterResourceBindingList plural: clusterresourcebindings diff --git a/charts/karmada/_crds/bases/work.karmada.io_resourcebindings.yaml b/charts/karmada/_crds/bases/work.karmada.io_resourcebindings.yaml index 57a60a731..ef5e1781a 100644 --- a/charts/karmada/_crds/bases/work.karmada.io_resourcebindings.yaml +++ b/charts/karmada/_crds/bases/work.karmada.io_resourcebindings.yaml @@ -9,6 +9,8 @@ metadata: spec: group: work.karmada.io names: + categories: + - karmada-io kind: ResourceBinding listKind: ResourceBindingList plural: resourcebindings diff --git a/charts/karmada/_crds/bases/work.karmada.io_works.yaml b/charts/karmada/_crds/bases/work.karmada.io_works.yaml index 68183af46..f281c71a4 100644 --- a/charts/karmada/_crds/bases/work.karmada.io_works.yaml +++ b/charts/karmada/_crds/bases/work.karmada.io_works.yaml @@ -9,6 +9,8 @@ metadata: spec: group: work.karmada.io names: + categories: + - karmada-io kind: Work listKind: WorkList plural: works diff --git a/pkg/apis/networking/v1alpha1/ingress_types.go b/pkg/apis/networking/v1alpha1/ingress_types.go index 7f5c7d1f4..b121d8f7a 100644 --- a/pkg/apis/networking/v1alpha1/ingress_types.go +++ b/pkg/apis/networking/v1alpha1/ingress_types.go @@ -19,7 +19,7 @@ const ( // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:subresource:status -// +kubebuilder:resource:shortName=mci +// +kubebuilder:resource:shortName=mci,categories={karmada-io} // MultiClusterIngress is a collection of rules that allow inbound connections to reach the // endpoints defined by a backend. The structure of MultiClusterIngress is same as Ingress, diff --git a/pkg/apis/policy/v1alpha1/federatedresourcequota_types.go b/pkg/apis/policy/v1alpha1/federatedresourcequota_types.go index 634101232..d8efa1667 100644 --- a/pkg/apis/policy/v1alpha1/federatedresourcequota_types.go +++ b/pkg/apis/policy/v1alpha1/federatedresourcequota_types.go @@ -18,6 +18,7 @@ const ( // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +// +kubebuilder:resource:categories={karmada-io} // +kubebuilder:subresource:status // +kubebuilder:storageversion diff --git a/pkg/apis/policy/v1alpha1/override_types.go b/pkg/apis/policy/v1alpha1/override_types.go index 879ab9a87..c27600d91 100644 --- a/pkg/apis/policy/v1alpha1/override_types.go +++ b/pkg/apis/policy/v1alpha1/override_types.go @@ -27,7 +27,7 @@ const ( // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// +kubebuilder:resource:shortName=op +// +kubebuilder:resource:shortName=op,categories={karmada-io} // OverridePolicy represents the policy that overrides a group of resources to one or more clusters. type OverridePolicy struct { @@ -223,7 +223,7 @@ type OverridePolicyList struct { // +genclient // +genclient:nonNamespaced -// +kubebuilder:resource:scope="Cluster",shortName=cop +// +kubebuilder:resource:scope="Cluster",shortName=cop,categories={karmada-io} // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ClusterOverridePolicy represents the cluster-wide policy that overrides a group of resources to one or more clusters. diff --git a/pkg/apis/policy/v1alpha1/propagation_types.go b/pkg/apis/policy/v1alpha1/propagation_types.go index f7700f50d..993c32835 100644 --- a/pkg/apis/policy/v1alpha1/propagation_types.go +++ b/pkg/apis/policy/v1alpha1/propagation_types.go @@ -27,7 +27,7 @@ const ( // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// +kubebuilder:resource:shortName=pp +// +kubebuilder:resource:shortName=pp,categories={karmada-io} // PropagationPolicy represents the policy that propagates a group of resources to one or more clusters. type PropagationPolicy struct { @@ -302,7 +302,7 @@ type PropagationPolicyList struct { // +genclient // +genclient:nonNamespaced -// +kubebuilder:resource:scope="Cluster",shortName=cpp +// +kubebuilder:resource:scope="Cluster",shortName=cpp,categories={karmada-io} // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ClusterPropagationPolicy represents the cluster-wide policy that propagates a group of resources to one or more clusters. diff --git a/pkg/apis/work/v1alpha1/binding_types.go b/pkg/apis/work/v1alpha1/binding_types.go index 5d0c7d117..06b951060 100644 --- a/pkg/apis/work/v1alpha1/binding_types.go +++ b/pkg/apis/work/v1alpha1/binding_types.go @@ -9,7 +9,7 @@ import ( // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:subresource:status -// +kubebuilder:resource:shortName=rb +// +kubebuilder:resource:shortName=rb,categories={karmada-io} // ResourceBinding represents a binding of a kubernetes resource with a propagation policy. type ResourceBinding struct { @@ -119,7 +119,7 @@ type ResourceBindingList struct { // +genclient // +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// +kubebuilder:resource:scope="Cluster",shortName=crb +// +kubebuilder:resource:scope="Cluster",shortName=crb,categories={karmada-io} // +kubebuilder:subresource:status // ClusterResourceBinding represents a binding of a kubernetes resource with a ClusterPropagationPolicy. diff --git a/pkg/apis/work/v1alpha1/work_types.go b/pkg/apis/work/v1alpha1/work_types.go index 3b1650a64..ceabb9d19 100644 --- a/pkg/apis/work/v1alpha1/work_types.go +++ b/pkg/apis/work/v1alpha1/work_types.go @@ -19,6 +19,7 @@ const ( // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:subresource:status +// +kubebuilder:resource:categories={karmada-io} // +kubebuilder:printcolumn:JSONPath=`.status.conditions[?(@.type=="Applied")].status`,name="Applied",type=string // +kubebuilder:printcolumn:JSONPath=`.metadata.creationTimestamp`,name="Age",type=date diff --git a/pkg/apis/work/v1alpha2/binding_types.go b/pkg/apis/work/v1alpha2/binding_types.go index c87429997..c2ba69e96 100644 --- a/pkg/apis/work/v1alpha2/binding_types.go +++ b/pkg/apis/work/v1alpha2/binding_types.go @@ -30,7 +30,7 @@ const ( // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:subresource:status -// +kubebuilder:resource:shortName=rb +// +kubebuilder:resource:shortName=rb,categories={karmada-io} // +kubebuilder:storageversion // +kubebuilder:printcolumn:JSONPath=`.status.conditions[?(@.type=="Scheduled")].status`,name="Scheduled",type=string // +kubebuilder:printcolumn:JSONPath=`.status.conditions[?(@.type=="FullyApplied")].status`,name="FullyApplied",type=string @@ -214,7 +214,7 @@ type ResourceBindingList struct { // +genclient // +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// +kubebuilder:resource:scope="Cluster",shortName=crb +// +kubebuilder:resource:scope="Cluster",shortName=crb,categories={karmada-io} // +kubebuilder:subresource:status // +kubebuilder:storageversion // +kubebuilder:printcolumn:JSONPath=`.status.conditions[?(@.type=="Scheduled")].status`,name="Scheduled",type=string