Merge pull request fluent#269 from wenchajun/shortname

add its shortname for each CRD
wenchajun · Apr 25, 2022 · 8a06643 · 8a06643
2 parents 09563bb + c738592
commit 8a06643
Show file tree

Hide file tree

Showing 26 changed files with 72 additions and 6 deletions.
diff --git a/apis/fluentbit/v1alpha2/clusterfilter_types.go b/apis/fluentbit/v1alpha2/clusterfilter_types.go
@@ -69,7 +69,7 @@ type FilterItem struct {
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:scope=Cluster
+// +kubebuilder:resource:shortName=cfbf,scope=Cluster
 // +genclient
 // +genclient:nonNamespaced
 

diff --git a/apis/fluentbit/v1alpha2/clusterinput_types.go b/apis/fluentbit/v1alpha2/clusterinput_types.go
@@ -44,7 +44,7 @@ type InputSpec struct {
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:scope=Cluster
+// +kubebuilder:resource:shortName=cfbi,scope=Cluster
 // +genclient
 // +genclient:nonNamespaced
 

diff --git a/apis/fluentbit/v1alpha2/clusteroutput_types.go b/apis/fluentbit/v1alpha2/clusteroutput_types.go
@@ -72,7 +72,7 @@ type OutputSpec struct {
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:scope=Cluster
+// +kubebuilder:resource:shortName=cfbo,scope=Cluster
 // +genclient
 // +genclient:nonNamespaced
 

diff --git a/apis/fluentbit/v1alpha2/clusterparser_types.go b/apis/fluentbit/v1alpha2/clusterparser_types.go
@@ -58,7 +58,7 @@ type Decorder struct {
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:scope=Cluster
+// +kubebuilder:resource:shortName=cfbp,scope=Cluster
 // +genclient
 // +genclient:nonNamespaced
 

diff --git a/apis/fluentd/v1alpha1/clusterfilter_types.go b/apis/fluentd/v1alpha1/clusterfilter_types.go
@@ -34,7 +34,7 @@ type ClusterFilterStatus struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:scope=Cluster
+// +kubebuilder:resource:shortName=cfdf,scope=Cluster
 // +genclient
 // +genclient:nonNamespaced
 

diff --git a/apis/fluentd/v1alpha1/clusteroutput_types.go b/apis/fluentd/v1alpha1/clusteroutput_types.go
@@ -34,7 +34,7 @@ type ClusterOutputStatus struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:scope=Cluster
+// +kubebuilder:resource:shortName=cfdo,scope=Cluster
 // +genclient
 // +genclient:nonNamespaced
 

diff --git a/apis/fluentd/v1alpha1/filter_types.go b/apis/fluentd/v1alpha1/filter_types.go
@@ -34,6 +34,7 @@ type FilterStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:resource:shortName=fdf
 //+genclient
 
 // Filter is the Schema for the filters API

diff --git a/apis/fluentd/v1alpha1/output_types.go b/apis/fluentd/v1alpha1/output_types.go
@@ -37,6 +37,7 @@ type OutputStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:resource:shortName=fdo
 //+genclient
 
 // Output is the Schema for the outputs API

diff --git a/charts/fluent-operator/crds/fluentbit.fluent.io_clusterfilters.yaml b/charts/fluent-operator/crds/fluentbit.fluent.io_clusterfilters.yaml
@@ -13,6 +13,8 @@ spec:
     kind: ClusterFilter
     listKind: ClusterFilterList
     plural: clusterfilters
+    shortNames:
+    - cfbf
     singular: clusterfilter
   scope: Cluster
   versions:

diff --git a/charts/fluent-operator/crds/fluentbit.fluent.io_clusterinputs.yaml b/charts/fluent-operator/crds/fluentbit.fluent.io_clusterinputs.yaml
@@ -13,6 +13,8 @@ spec:
     kind: ClusterInput
     listKind: ClusterInputList
     plural: clusterinputs
+    shortNames:
+    - cfbi
     singular: clusterinput
   scope: Cluster
   versions:

diff --git a/charts/fluent-operator/crds/fluentbit.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/crds/fluentbit.fluent.io_clusteroutputs.yaml
@@ -13,6 +13,8 @@ spec:
     kind: ClusterOutput
     listKind: ClusterOutputList
     plural: clusteroutputs
+    shortNames:
+    - cfbo
     singular: clusteroutput
   scope: Cluster
   versions:

diff --git a/charts/fluent-operator/crds/fluentbit.fluent.io_clusterparsers.yaml b/charts/fluent-operator/crds/fluentbit.fluent.io_clusterparsers.yaml
@@ -13,6 +13,8 @@ spec:
     kind: ClusterParser
     listKind: ClusterParserList
     plural: clusterparsers
+    shortNames:
+    - cfbp
     singular: clusterparser
   scope: Cluster
   versions:

diff --git a/charts/fluent-operator/crds/fluentd.fluent.io_clusterfilters.yaml b/charts/fluent-operator/crds/fluentd.fluent.io_clusterfilters.yaml
@@ -13,6 +13,8 @@ spec:
     kind: ClusterFilter
     listKind: ClusterFilterList
     plural: clusterfilters
+    shortNames:
+    - cfdf
     singular: clusterfilter
   scope: Cluster
   versions:

diff --git a/charts/fluent-operator/crds/fluentd.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/crds/fluentd.fluent.io_clusteroutputs.yaml
@@ -13,6 +13,8 @@ spec:
     kind: ClusterOutput
     listKind: ClusterOutputList
     plural: clusteroutputs
+    shortNames:
+    - cfdo
     singular: clusteroutput
   scope: Cluster
   versions:

diff --git a/charts/fluent-operator/crds/fluentd.fluent.io_filters.yaml b/charts/fluent-operator/crds/fluentd.fluent.io_filters.yaml
@@ -13,6 +13,8 @@ spec:
     kind: Filter
     listKind: FilterList
     plural: filters
+    shortNames:
+    - fdf
     singular: filter
   scope: Namespaced
   versions:

diff --git a/charts/fluent-operator/crds/fluentd.fluent.io_outputs.yaml b/charts/fluent-operator/crds/fluentd.fluent.io_outputs.yaml
@@ -13,6 +13,8 @@ spec:
     kind: Output
     listKind: OutputList
     plural: outputs
+    shortNames:
+    - fdo
     singular: output
   scope: Namespaced
   versions:

diff --git a/config/crd/bases/fluentbit.fluent.io_clusterfilters.yaml b/config/crd/bases/fluentbit.fluent.io_clusterfilters.yaml
@@ -13,6 +13,8 @@ spec:
     kind: ClusterFilter
     listKind: ClusterFilterList
     plural: clusterfilters
+    shortNames:
+    - cfbf
     singular: clusterfilter
   scope: Cluster
   versions:

diff --git a/config/crd/bases/fluentbit.fluent.io_clusterinputs.yaml b/config/crd/bases/fluentbit.fluent.io_clusterinputs.yaml
@@ -13,6 +13,8 @@ spec:
     kind: ClusterInput
     listKind: ClusterInputList
     plural: clusterinputs
+    shortNames:
+    - cfbi
     singular: clusterinput
   scope: Cluster
   versions:

diff --git a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
@@ -13,6 +13,8 @@ spec:
     kind: ClusterOutput
     listKind: ClusterOutputList
     plural: clusteroutputs
+    shortNames:
+    - cfbo
     singular: clusteroutput
   scope: Cluster
   versions:

diff --git a/config/crd/bases/fluentbit.fluent.io_clusterparsers.yaml b/config/crd/bases/fluentbit.fluent.io_clusterparsers.yaml
@@ -13,6 +13,8 @@ spec:
     kind: ClusterParser
     listKind: ClusterParserList
     plural: clusterparsers
+    shortNames:
+    - cfbp
     singular: clusterparser
   scope: Cluster
   versions:

diff --git a/config/crd/bases/fluentd.fluent.io_clusterfilters.yaml b/config/crd/bases/fluentd.fluent.io_clusterfilters.yaml
@@ -13,6 +13,8 @@ spec:
     kind: ClusterFilter
     listKind: ClusterFilterList
     plural: clusterfilters
+    shortNames:
+    - cfdf
     singular: clusterfilter
   scope: Cluster
   versions:

diff --git a/config/crd/bases/fluentd.fluent.io_clusteroutputs.yaml b/config/crd/bases/fluentd.fluent.io_clusteroutputs.yaml
@@ -13,6 +13,8 @@ spec:
     kind: ClusterOutput
     listKind: ClusterOutputList
     plural: clusteroutputs
+    shortNames:
+    - cfdo
     singular: clusteroutput
   scope: Cluster
   versions:

diff --git a/config/crd/bases/fluentd.fluent.io_filters.yaml b/config/crd/bases/fluentd.fluent.io_filters.yaml
@@ -13,6 +13,8 @@ spec:
     kind: Filter
     listKind: FilterList
     plural: filters
+    shortNames:
+    - fdf
     singular: filter
   scope: Namespaced
   versions:

diff --git a/config/crd/bases/fluentd.fluent.io_outputs.yaml b/config/crd/bases/fluentd.fluent.io_outputs.yaml
@@ -13,6 +13,8 @@ spec:
     kind: Output
     listKind: OutputList
     plural: outputs
+    shortNames:
+    - fdo
     singular: output
   scope: Namespaced
   versions:

diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
@@ -10,6 +10,8 @@ spec:
     kind: ClusterFilter
     listKind: ClusterFilterList
     plural: clusterfilters
+    shortNames:
+    - cfbf
     singular: clusterfilter
   scope: Cluster
   versions:
@@ -526,6 +528,8 @@ spec:
     kind: ClusterFilter
     listKind: ClusterFilterList
     plural: clusterfilters
+    shortNames:
+    - cfdf
     singular: clusterfilter
   scope: Cluster
   versions:
@@ -1421,6 +1425,8 @@ spec:
     kind: ClusterInput
     listKind: ClusterInputList
     plural: clusterinputs
+    shortNames:
+    - cfbi
     singular: clusterinput
   scope: Cluster
   versions:
@@ -1703,6 +1709,8 @@ spec:
     kind: ClusterOutput
     listKind: ClusterOutputList
     plural: clusteroutputs
+    shortNames:
+    - cfbo
     singular: clusteroutput
   scope: Cluster
   versions:
@@ -3032,6 +3040,8 @@ spec:
     kind: ClusterOutput
     listKind: ClusterOutputList
     plural: clusteroutputs
+    shortNames:
+    - cfdo
     singular: clusteroutput
   scope: Cluster
   versions:
@@ -4221,6 +4231,8 @@ spec:
     kind: ClusterParser
     listKind: ClusterParserList
     plural: clusterparsers
+    shortNames:
+    - cfbp
     singular: clusterparser
   scope: Cluster
   versions:
@@ -4334,6 +4346,8 @@ spec:
     kind: Filter
     listKind: FilterList
     plural: filters
+    shortNames:
+    - fdf
     singular: filter
   scope: Namespaced
   versions:
@@ -10615,6 +10629,8 @@ spec:
     kind: Output
     listKind: OutputList
     plural: outputs
+    shortNames:
+    - fdo
     singular: output
   scope: Namespaced
   versions:

diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
@@ -10,6 +10,8 @@ spec:
     kind: ClusterFilter
     listKind: ClusterFilterList
     plural: clusterfilters
+    shortNames:
+    - cfbf
     singular: clusterfilter
   scope: Cluster
   versions:
@@ -526,6 +528,8 @@ spec:
     kind: ClusterFilter
     listKind: ClusterFilterList
     plural: clusterfilters
+    shortNames:
+    - cfdf
     singular: clusterfilter
   scope: Cluster
   versions:
@@ -1421,6 +1425,8 @@ spec:
     kind: ClusterInput
     listKind: ClusterInputList
     plural: clusterinputs
+    shortNames:
+    - cfbi
     singular: clusterinput
   scope: Cluster
   versions:
@@ -1703,6 +1709,8 @@ spec:
     kind: ClusterOutput
     listKind: ClusterOutputList
     plural: clusteroutputs
+    shortNames:
+    - cfbo
     singular: clusteroutput
   scope: Cluster
   versions:
@@ -3032,6 +3040,8 @@ spec:
     kind: ClusterOutput
     listKind: ClusterOutputList
     plural: clusteroutputs
+    shortNames:
+    - cfdo
     singular: clusteroutput
   scope: Cluster
   versions:
@@ -4221,6 +4231,8 @@ spec:
     kind: ClusterParser
     listKind: ClusterParserList
     plural: clusterparsers
+    shortNames:
+    - cfbp
     singular: clusterparser
   scope: Cluster
   versions:
@@ -4334,6 +4346,8 @@ spec:
     kind: Filter
     listKind: FilterList
     plural: filters
+    shortNames:
+    - fdf
     singular: filter
   scope: Namespaced
   versions:
@@ -10615,6 +10629,8 @@ spec:
     kind: Output
     listKind: OutputList
     plural: outputs
+    shortNames:
+    - fdo
     singular: output
   scope: Namespaced
   versions: