Skip to content

Commit c28c692

Browse files
author
Benjamin Huo
authored
Merge pull request #51 from keladhruv/master
Add client to fluentbit-operator
2 parents 21a0d27 + 4b8716c commit c28c692

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2523
-141
lines changed

‎Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ vet:
5656
# Generate code
5757
generate: controller-gen
5858
$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths="./..."
59+
./hack/update-codegen.sh
5960

6061
# Build all docker images for amd64 and arm64
6162
build: build-op

‎api/v1alpha2/filter_types.go ‎api/fluentbitoperator/v1alpha2/filter_types.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ package v1alpha2
1818
import (
1919
"bytes"
2020
"fmt"
21-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
23-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins/filter"
2421
"reflect"
22+
23+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
24+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
25+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins/filter"
2526
)
2627

2728
// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
@@ -57,6 +58,7 @@ type FilterItem struct {
5758
}
5859

5960
// +kubebuilder:object:root=true
61+
// +genclient
6062

6163
// Filter defines a Filter configuration.
6264
type Filter struct {

‎api/v1alpha2/fluentbit_types.go ‎api/fluentbitoperator/v1alpha2/fluentbit_types.go

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ type FluentBitStatus struct {
5656

5757
// +kubebuilder:object:root=true
5858
// +kubebuilder:resource:shortName=fb
59+
// +genclient
5960

6061
// FluentBit is the Schema for the fluentbits API
6162
type FluentBit struct {

‎api/v1alpha2/fluentbitconfig_types.go ‎api/fluentbitoperator/v1alpha2/fluentbitconfig_types.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ package v1alpha2
1818
import (
1919
"bytes"
2020
"fmt"
21+
2122
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
23+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
2324
)
2425

2526
// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
@@ -66,6 +67,7 @@ type Service struct {
6667

6768
// +kubebuilder:object:root=true
6869
// +kubebuilder:resource:shortName=fbc
70+
// +genclient
6971

7072
// FluentBitConfig is the Schema for the fluentbitconfigs API
7173
type FluentBitConfig struct {

‎api/v1alpha2/groupversion_info.go ‎api/fluentbitoperator/v1alpha2/groupversion_info.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ import (
2424
)
2525

2626
var (
27-
// GroupVersion is group version used to register these objects
28-
GroupVersion = schema.GroupVersion{Group: "logging.kubesphere.io", Version: "v1alpha2"}
27+
// SchemeGroupVersion is group version used to register these objects
28+
SchemeGroupVersion = schema.GroupVersion{Group: "logging.kubesphere.io", Version: "v1alpha2"}
2929

3030
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
31-
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
31+
SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
3232

3333
// AddToScheme adds the types in this group-version to the given scheme.
3434
AddToScheme = SchemeBuilder.AddToScheme

‎api/v1alpha2/input_types.go ‎api/fluentbitoperator/v1alpha2/input_types.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ package v1alpha2
1818
import (
1919
"bytes"
2020
"fmt"
21-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
23-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins/input"
2421
"reflect"
22+
23+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
24+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
25+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins/input"
2526
)
2627

2728
// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
@@ -38,6 +39,7 @@ type InputSpec struct {
3839
}
3940

4041
// +kubebuilder:object:root=true
42+
// +genclient
4143

4244
// Input is the Schema for the inputs API
4345
type Input struct {

‎api/v1alpha2/output_types.go ‎api/fluentbitoperator/v1alpha2/output_types.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"reflect"
2222

2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
24-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
25-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins/output"
24+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
25+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins/output"
2626
)
2727

2828
// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
@@ -59,6 +59,7 @@ type OutputSpec struct {
5959
}
6060

6161
// +kubebuilder:object:root=true
62+
// +genclient
6263

6364
// Output is the Schema for the outputs API
6465
type Output struct {

‎api/v1alpha2/parser_types.go ‎api/fluentbitoperator/v1alpha2/parser_types.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ package v1alpha2
1818
import (
1919
"bytes"
2020
"fmt"
21-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
23-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins/parser"
2421
"reflect"
22+
23+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
24+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
25+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins/parser"
2526
)
2627

2728
// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
@@ -55,6 +56,7 @@ type Decorder struct {
5556
}
5657

5758
// +kubebuilder:object:root=true
59+
// +genclient
5860

5961
// Parser is the Schema for the parsers API
6062
type Parser struct {

‎api/v1alpha2/plugins/configmap_types.go ‎api/fluentbitoperator/v1alpha2/plugins/configmap_types.go

File renamed without changes.

‎api/v1alpha2/plugins/filter/grep_types.go ‎api/fluentbitoperator/v1alpha2/plugins/filter/grep_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package filter
22

3-
import "kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
3+
import "kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
44

55
// +kubebuilder:object:generate:=true
66

‎api/v1alpha2/plugins/filter/kubernetes_types.go ‎api/fluentbitoperator/v1alpha2/plugins/filter/kubernetes_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package filter
22

33
import (
44
"fmt"
5-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
5+
6+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
67
)
78

89
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/filter/lua_types.go ‎api/fluentbitoperator/v1alpha2/plugins/filter/lua_types.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package filter
22

33
import (
4+
"strconv"
5+
46
v1 "k8s.io/api/core/v1"
5-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
7+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
68
"kubesphere.io/fluentbit-operator/pkg/utils"
7-
"strconv"
89
)
910

1011
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/filter/modify_types.go ‎api/fluentbitoperator/v1alpha2/plugins/filter/modify_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package filter
22

33
import (
44
"fmt"
5-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
5+
6+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
67
)
78

89
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/filter/nest_types.go ‎api/fluentbitoperator/v1alpha2/plugins/filter/nest_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package filter
22

33
import (
4-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
4+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
55
)
66

77
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/filter/parser_types.go ‎api/fluentbitoperator/v1alpha2/plugins/filter/parser_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ package filter
22

33
import (
44
"fmt"
5-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
65
"strings"
6+
7+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
78
)
89

910
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/filter/recordmodifier_types.go ‎api/fluentbitoperator/v1alpha2/plugins/filter/recordmodifier_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package filter
22

3-
import "kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
3+
import "kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
44

55
// +kubebuilder:object:generate:=true
66

‎api/v1alpha2/plugins/filter/zz_generated.deepcopy.go ‎api/fluentbitoperator/v1alpha2/plugins/filter/zz_generated.deepcopy.go

File renamed without changes.

‎api/v1alpha2/plugins/input/dummy_types.go ‎api/fluentbitoperator/v1alpha2/plugins/input/dummy_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package input
22

33
import (
44
"fmt"
5-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
5+
6+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
67
)
78

89
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/input/systemd_types.go ‎api/fluentbitoperator/v1alpha2/plugins/input/systemd_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package input
22

33
import (
4-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
4+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
55
)
66

77
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/input/tail_types.go ‎api/fluentbitoperator/v1alpha2/plugins/input/tail_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package input
22

33
import (
44
"fmt"
5-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
5+
6+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
67
)
78

89
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/input/zz_generated.deepcopy.go ‎api/fluentbitoperator/v1alpha2/plugins/input/zz_generated.deepcopy.go

File renamed without changes.

‎api/v1alpha2/plugins/interface.go ‎api/fluentbitoperator/v1alpha2/plugins/interface.go

File renamed without changes.

‎api/v1alpha2/plugins/output/elasticsearch_types.go ‎api/fluentbitoperator/v1alpha2/plugins/output/elasticsearch_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package output
22

33
import (
44
"fmt"
5-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
5+
6+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
67
)
78

89
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/output/file_types.go ‎api/fluentbitoperator/v1alpha2/plugins/output/file_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package output
22

33
import (
4-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
4+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
55
)
66

77
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/output/forward_types.go ‎api/fluentbitoperator/v1alpha2/plugins/output/forward_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package output
22

33
import (
44
"fmt"
5-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
5+
6+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
67
)
78

89
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/output/http_types.go ‎api/fluentbitoperator/v1alpha2/plugins/output/http_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package output
22

33
import (
44
"fmt"
5-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
5+
6+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
67
)
78

89
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/output/kafka_types.go ‎api/fluentbitoperator/v1alpha2/plugins/output/kafka_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package output
22

33
import (
44
"fmt"
5-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
5+
6+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
67
)
78

89
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/output/loki_types.go ‎api/fluentbitoperator/v1alpha2/plugins/output/loki_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package output
22

33
import (
44
"fmt"
5-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
5+
6+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
67
"kubesphere.io/fluentbit-operator/pkg/utils"
78
)
89

‎api/v1alpha2/plugins/output/null_types.go ‎api/fluentbitoperator/v1alpha2/plugins/output/null_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package output
22

33
import (
4-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
4+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
55
)
66

77
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/output/stdout_types.go ‎api/fluentbitoperator/v1alpha2/plugins/output/stdout_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package output
22

33
import (
4-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
4+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
55
)
66

77
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/output/syslog_types.go ‎api/fluentbitoperator/v1alpha2/plugins/output/syslog_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package output
33
import (
44
"fmt"
55

6-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
6+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
77
)
88

99
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/output/tcp_types.go ‎api/fluentbitoperator/v1alpha2/plugins/output/tcp_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package output
22

33
import (
44
"fmt"
5-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
5+
6+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
67
)
78

89
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/output/zz_generated.deepcopy.go ‎api/fluentbitoperator/v1alpha2/plugins/output/zz_generated.deepcopy.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v1alpha2/plugins/parser/json_types.go ‎api/fluentbitoperator/v1alpha2/plugins/parser/json_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package parser
22

33
import (
44
"fmt"
5-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
5+
6+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
67
)
78

89
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/parser/logfmt_types.go ‎api/fluentbitoperator/v1alpha2/plugins/parser/logfmt_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package parser
22

33
import (
4-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
4+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
55
)
66

77
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/parser/lstv_types.go ‎api/fluentbitoperator/v1alpha2/plugins/parser/lstv_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package parser
22

33
import (
44
"fmt"
5-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
5+
6+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
67
)
78

89
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/parser/regex_types.go ‎api/fluentbitoperator/v1alpha2/plugins/parser/regex_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package parser
22

33
import (
44
"fmt"
5-
"kubesphere.io/fluentbit-operator/api/v1alpha2/plugins"
5+
6+
"kubesphere.io/fluentbit-operator/api/fluentbitoperator/v1alpha2/plugins"
67
)
78

89
// +kubebuilder:object:generate:=true

‎api/v1alpha2/plugins/parser/zz_generated.deepcopy.go ‎api/fluentbitoperator/v1alpha2/plugins/parser/zz_generated.deepcopy.go

File renamed without changes.

‎api/v1alpha2/plugins/secret_types.go ‎api/fluentbitoperator/v1alpha2/plugins/secret_types.go

File renamed without changes.

‎api/v1alpha2/plugins/tls_types.go ‎api/fluentbitoperator/v1alpha2/plugins/tls_types.go

File renamed without changes.

‎api/v1alpha2/plugins/zz_generated.deepcopy.go ‎api/fluentbitoperator/v1alpha2/plugins/zz_generated.deepcopy.go

File renamed without changes.

‎api/v1alpha2/zz_generated.deepcopy.go ‎api/fluentbitoperator/v1alpha2/zz_generated.deepcopy.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)