Merge pull request #41 from daniel-hutao/patch-1

Benjamin Huo · web-flow · commit 5b0e28d8fe86 · 2021-02-07T11:31:47.000+08:00
Add shortNames for FluentBit FluentBitConfig CRDs
diff --git a/api/v1alpha2/fluentbit_types.go b/api/v1alpha2/fluentbit_types.go
@@ -51,6 +51,7 @@ type FluentBitStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:shortName=fb
 
 // FluentBit is the Schema for the fluentbits API
 type FluentBit struct {
diff --git a/api/v1alpha2/fluentbitconfig_types.go b/api/v1alpha2/fluentbitconfig_types.go
@@ -65,6 +65,7 @@ type Service struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:shortName=fbc
 
 // FluentBitConfig is the Schema for the fluentbitconfigs API
 type FluentBitConfig struct {
diff --git a/config/crd/bases/logging.kubesphere.io_fluentbitconfigs.yaml b/config/crd/bases/logging.kubesphere.io_fluentbitconfigs.yaml
@@ -13,6 +13,8 @@ spec:
     kind: FluentBitConfig
     listKind: FluentBitConfigList
     plural: fluentbitconfigs
+    shortNames:
+    - fbc
     singular: fluentbitconfig
   scope: Namespaced
   validation:
diff --git a/config/crd/bases/logging.kubesphere.io_fluentbits.yaml b/config/crd/bases/logging.kubesphere.io_fluentbits.yaml
@@ -13,6 +13,8 @@ spec:
     kind: FluentBit
     listKind: FluentBitList
     plural: fluentbits
+    shortNames:
+    - fb
     singular: fluentbit
   scope: Namespaced
   validation:
diff --git a/manifests/setup/fluentbit-operator-crd.yaml b/manifests/setup/fluentbit-operator-crd.yaml

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ type FluentBitStatus struct {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`// +kubebuilder:object:root=true`
	`54`	`+// +kubebuilder:resource:shortName=fb`
`54`	`55`
`55`	`56`	`// FluentBit is the Schema for the fluentbits API`
`56`	`57`	`type FluentBit struct {`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ type Service struct {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`// +kubebuilder:object:root=true`
	`68`	`+// +kubebuilder:resource:shortName=fbc`
`68`	`69`
`69`	`70`	`// FluentBitConfig is the Schema for the fluentbitconfigs API`
`70`	`71`	`type FluentBitConfig struct {`