Merge pull request #77 from wanjunlei/release-0.7

Benjamin Huo · web-flow · commit c0dcaf2c9172 · 2021-07-08T17:26:11.000+08:00
fix bug operator may crash when load plugin
diff --git a/api/fluentbitoperator/v1alpha2/filter_types.go b/api/fluentbitoperator/v1alpha2/filter_types.go
@@ -82,7 +82,7 @@ func (list FilterList) Load(sl plugins.SecretLoader) (string, error) {
 
 	for _, item := range list.Items {
 		merge := func(p plugins.Plugin) error {
-			if reflect.ValueOf(p).IsNil() {
+			if p == nil || reflect.ValueOf(p).IsNil() {
 				return nil
 			}
 
diff --git a/api/fluentbitoperator/v1alpha2/input_types.go b/api/fluentbitoperator/v1alpha2/input_types.go
@@ -66,7 +66,7 @@ func (list InputList) Load(sl plugins.SecretLoader) (string, error) {
 
 	for _, item := range list.Items {
 		merge := func(p plugins.Plugin) error {
-			if reflect.ValueOf(p).IsNil() {
+			if p == nil || reflect.ValueOf(p).IsNil() {
 				return nil
 			}
 
diff --git a/api/fluentbitoperator/v1alpha2/output_types.go b/api/fluentbitoperator/v1alpha2/output_types.go
@@ -86,7 +86,7 @@ func (list OutputList) Load(sl plugins.SecretLoader) (string, error) {
 
 	for _, item := range list.Items {
 		merge := func(p plugins.Plugin) error {
-			if reflect.ValueOf(p).IsNil() {
+			if p == nil || reflect.ValueOf(p).IsNil() {
 				return nil
 			}
 
diff --git a/api/fluentbitoperator/v1alpha2/parser_types.go b/api/fluentbitoperator/v1alpha2/parser_types.go
@@ -80,7 +80,7 @@ func (list ParserList) Load(sl plugins.SecretLoader) (string, error) {
 
 	for _, item := range list.Items {
 		merge := func(p plugins.Plugin) error {
-			if reflect.ValueOf(p).IsNil() {
+			if p == nil || reflect.ValueOf(p).IsNil() {
 				return nil
 			}
 
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
`@@ -82,7 +82,7 @@ func (list FilterList) Load(sl plugins.SecretLoader) (string, error) {`
`82`	`82`
`83`	`83`	`for _, item := range list.Items {`
`84`	`84`	`merge := func(p plugins.Plugin) error {`
`85`		`- if reflect.ValueOf(p).IsNil() {`
	`85`	`+ if p == nil \|\| reflect.ValueOf(p).IsNil() {`
`86`	`86`	`return nil`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func (list InputList) Load(sl plugins.SecretLoader) (string, error) {`
`66`	`66`
`67`	`67`	`for _, item := range list.Items {`
`68`	`68`	`merge := func(p plugins.Plugin) error {`
`69`		`- if reflect.ValueOf(p).IsNil() {`
	`69`	`+ if p == nil \|\| reflect.ValueOf(p).IsNil() {`
`70`	`70`	`return nil`
`71`	`71`	`}`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ func (list OutputList) Load(sl plugins.SecretLoader) (string, error) {`
`86`	`86`
`87`	`87`	`for _, item := range list.Items {`
`88`	`88`	`merge := func(p plugins.Plugin) error {`
`89`		`- if reflect.ValueOf(p).IsNil() {`
	`89`	`+ if p == nil \|\| reflect.ValueOf(p).IsNil() {`
`90`	`90`	`return nil`
`91`	`91`	`}`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ func (list ParserList) Load(sl plugins.SecretLoader) (string, error) {`
`80`	`80`
`81`	`81`	`for _, item := range list.Items {`
`82`	`82`	`merge := func(p plugins.Plugin) error {`
`83`		`- if reflect.ValueOf(p).IsNil() {`
	`83`	`+ if p == nil \|\| reflect.ValueOf(p).IsNil() {`
`84`	`84`	`return nil`
`85`	`85`	`}`
`86`	`86`