diff --git a/apis/fluentbit/v1alpha2/clusterfilter_types.go b/apis/fluentbit/v1alpha2/clusterfilter_types.go index 11976b0e1..95878b6aa 100644 --- a/apis/fluentbit/v1alpha2/clusterfilter_types.go +++ b/apis/fluentbit/v1alpha2/clusterfilter_types.go @@ -22,10 +22,10 @@ import ( "reflect" "sort" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/custom" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/filter" - "github.com/fluent/fluent-operator/v2/pkg/utils" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/custom" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/filter" + "github.com/fluent/fluent-operator/v3/pkg/utils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/fluentbit/v1alpha2/clusterfilter_types_test.go b/apis/fluentbit/v1alpha2/clusterfilter_types_test.go index b4a32d238..809fc426f 100644 --- a/apis/fluentbit/v1alpha2/clusterfilter_types_test.go +++ b/apis/fluentbit/v1alpha2/clusterfilter_types_test.go @@ -3,8 +3,8 @@ package v1alpha2 import ( "testing" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/filter" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/filter" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go b/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go index 54c1d3f9f..06661f557 100644 --- a/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go +++ b/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go @@ -23,10 +23,10 @@ import ( "sort" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/output" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" - "github.com/fluent/fluent-operator/v2/pkg/utils" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/output" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/pkg/utils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types_test.go b/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types_test.go index b34391622..a40002bbd 100644 --- a/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types_test.go +++ b/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types_test.go @@ -2,17 +2,18 @@ package v1alpha2 import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/multilineparser" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/parser" "testing" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/multilineparser" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/parser" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/custom" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/filter" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/input" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/output" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/custom" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/filter" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/input" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/output" . "github.com/onsi/gomega" ) diff --git a/apis/fluentbit/v1alpha2/clusterinput_types.go b/apis/fluentbit/v1alpha2/clusterinput_types.go index c7abc3d2f..7024fd46b 100644 --- a/apis/fluentbit/v1alpha2/clusterinput_types.go +++ b/apis/fluentbit/v1alpha2/clusterinput_types.go @@ -22,10 +22,10 @@ import ( "reflect" "sort" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/custom" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/input" - "github.com/fluent/fluent-operator/v2/pkg/utils" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/custom" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/input" + "github.com/fluent/fluent-operator/v3/pkg/utils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" ) diff --git a/apis/fluentbit/v1alpha2/clusterinput_types_test.go b/apis/fluentbit/v1alpha2/clusterinput_types_test.go index 1303fa0fe..dce9316f4 100644 --- a/apis/fluentbit/v1alpha2/clusterinput_types_test.go +++ b/apis/fluentbit/v1alpha2/clusterinput_types_test.go @@ -3,8 +3,8 @@ package v1alpha2 import ( "testing" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/input" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/input" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/fluentbit/v1alpha2/clustermultilineparser_types.go b/apis/fluentbit/v1alpha2/clustermultilineparser_types.go index dfb61a51d..0199ea3fb 100644 --- a/apis/fluentbit/v1alpha2/clustermultilineparser_types.go +++ b/apis/fluentbit/v1alpha2/clustermultilineparser_types.go @@ -22,8 +22,8 @@ import ( "reflect" "sort" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/multilineparser" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/multilineparser" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/fluentbit/v1alpha2/clustermultilineparser_types_test.go b/apis/fluentbit/v1alpha2/clustermultilineparser_types_test.go index dc5aa883b..d1eae9f73 100644 --- a/apis/fluentbit/v1alpha2/clustermultilineparser_types_test.go +++ b/apis/fluentbit/v1alpha2/clustermultilineparser_types_test.go @@ -1,11 +1,12 @@ package v1alpha2 import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/multilineparser" + "testing" + + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/multilineparser" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "testing" ) var clusterMultilineParserExpected = `[MULTILINE_PARSER] diff --git a/apis/fluentbit/v1alpha2/clusteroutput_types.go b/apis/fluentbit/v1alpha2/clusteroutput_types.go index ad0737426..e8940c2f3 100644 --- a/apis/fluentbit/v1alpha2/clusteroutput_types.go +++ b/apis/fluentbit/v1alpha2/clusteroutput_types.go @@ -22,10 +22,10 @@ import ( "reflect" "sort" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/custom" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/output" - "github.com/fluent/fluent-operator/v2/pkg/utils" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/custom" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/output" + "github.com/fluent/fluent-operator/v3/pkg/utils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" ) diff --git a/apis/fluentbit/v1alpha2/clusteroutput_types_test.go b/apis/fluentbit/v1alpha2/clusteroutput_types_test.go index d7105389e..ac850cb98 100644 --- a/apis/fluentbit/v1alpha2/clusteroutput_types_test.go +++ b/apis/fluentbit/v1alpha2/clusteroutput_types_test.go @@ -3,8 +3,8 @@ package v1alpha2 import ( "testing" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/output" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/output" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/fluentbit/v1alpha2/clusterparser_types.go b/apis/fluentbit/v1alpha2/clusterparser_types.go index 3b4d22731..8f2fff663 100644 --- a/apis/fluentbit/v1alpha2/clusterparser_types.go +++ b/apis/fluentbit/v1alpha2/clusterparser_types.go @@ -22,8 +22,8 @@ import ( "reflect" "sort" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/parser" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/parser" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/fluentbit/v1alpha2/filter_types.go b/apis/fluentbit/v1alpha2/filter_types.go index 2d2eb8572..d63392c20 100644 --- a/apis/fluentbit/v1alpha2/filter_types.go +++ b/apis/fluentbit/v1alpha2/filter_types.go @@ -22,8 +22,8 @@ import ( "reflect" "sort" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/pkg/utils" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/pkg/utils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/fluentbit/v1alpha2/filter_types_test.go b/apis/fluentbit/v1alpha2/filter_types_test.go index 073d99aa1..2fa193978 100644 --- a/apis/fluentbit/v1alpha2/filter_types_test.go +++ b/apis/fluentbit/v1alpha2/filter_types_test.go @@ -3,8 +3,8 @@ package v1alpha2 import ( "testing" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/filter" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/filter" . "github.com/onsi/gomega" ) diff --git a/apis/fluentbit/v1alpha2/multilineparser_types.go b/apis/fluentbit/v1alpha2/multilineparser_types.go index ec662e6b1..8b4836fa5 100644 --- a/apis/fluentbit/v1alpha2/multilineparser_types.go +++ b/apis/fluentbit/v1alpha2/multilineparser_types.go @@ -19,10 +19,11 @@ package v1alpha2 import ( "bytes" "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "reflect" "sort" + + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // +kubebuilder:object:root=true diff --git a/apis/fluentbit/v1alpha2/multilineparser_types_test.go b/apis/fluentbit/v1alpha2/multilineparser_types_test.go index 6e637057b..f6f51ee03 100644 --- a/apis/fluentbit/v1alpha2/multilineparser_types_test.go +++ b/apis/fluentbit/v1alpha2/multilineparser_types_test.go @@ -1,11 +1,12 @@ package v1alpha2 import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/multilineparser" + "testing" + + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/multilineparser" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "testing" ) var multilineParserExpected = `[MULTILINE_PARSER] diff --git a/apis/fluentbit/v1alpha2/output_types.go b/apis/fluentbit/v1alpha2/output_types.go index 97d3a191f..6a9111d31 100644 --- a/apis/fluentbit/v1alpha2/output_types.go +++ b/apis/fluentbit/v1alpha2/output_types.go @@ -19,12 +19,13 @@ package v1alpha2 import ( "bytes" "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/custom" - "github.com/fluent/fluent-operator/v2/pkg/utils" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "reflect" "sort" + + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/custom" + "github.com/fluent/fluent-operator/v3/pkg/utils" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! diff --git a/apis/fluentbit/v1alpha2/parser_types.go b/apis/fluentbit/v1alpha2/parser_types.go index 08eb997c8..d83e7ca6d 100644 --- a/apis/fluentbit/v1alpha2/parser_types.go +++ b/apis/fluentbit/v1alpha2/parser_types.go @@ -20,10 +20,11 @@ import ( "bytes" "crypto/md5" "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "reflect" "sort" + + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! diff --git a/apis/fluentbit/v1alpha2/plugins/common_types.go b/apis/fluentbit/v1alpha2/plugins/common_types.go index e673bed95..d9ac7eae5 100644 --- a/apis/fluentbit/v1alpha2/plugins/common_types.go +++ b/apis/fluentbit/v1alpha2/plugins/common_types.go @@ -2,7 +2,8 @@ package plugins import ( "encoding/json" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/custom/custom_types.go b/apis/fluentbit/v1alpha2/plugins/custom/custom_types.go index aa8d5c6f2..9b7d81bc9 100644 --- a/apis/fluentbit/v1alpha2/plugins/custom/custom_types.go +++ b/apis/fluentbit/v1alpha2/plugins/custom/custom_types.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" - "github.com/fluent/fluent-operator/v2/pkg/utils" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/pkg/utils" "sigs.k8s.io/yaml" ) diff --git a/apis/fluentbit/v1alpha2/plugins/filter/aws_types.go b/apis/fluentbit/v1alpha2/plugins/filter/aws_types.go index 604962dee..3916f953e 100644 --- a/apis/fluentbit/v1alpha2/plugins/filter/aws_types.go +++ b/apis/fluentbit/v1alpha2/plugins/filter/aws_types.go @@ -3,8 +3,8 @@ package filter import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/filter/grep_types.go b/apis/fluentbit/v1alpha2/plugins/filter/grep_types.go index 7bcfd61ab..2dc6b2b33 100644 --- a/apis/fluentbit/v1alpha2/plugins/filter/grep_types.go +++ b/apis/fluentbit/v1alpha2/plugins/filter/grep_types.go @@ -1,8 +1,8 @@ package filter import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/filter/kubernetes_types.go b/apis/fluentbit/v1alpha2/plugins/filter/kubernetes_types.go index 4ee7961e4..b383049d6 100644 --- a/apis/fluentbit/v1alpha2/plugins/filter/kubernetes_types.go +++ b/apis/fluentbit/v1alpha2/plugins/filter/kubernetes_types.go @@ -4,8 +4,8 @@ import ( "crypto/md5" "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/filter/log_to_metrics_types.go b/apis/fluentbit/v1alpha2/plugins/filter/log_to_metrics_types.go index 5c8c892c5..11d9c943b 100644 --- a/apis/fluentbit/v1alpha2/plugins/filter/log_to_metrics_types.go +++ b/apis/fluentbit/v1alpha2/plugins/filter/log_to_metrics_types.go @@ -2,8 +2,9 @@ package filter import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/filter/lua_types.go b/apis/fluentbit/v1alpha2/plugins/filter/lua_types.go index 7025b1a15..44f2eae45 100644 --- a/apis/fluentbit/v1alpha2/plugins/filter/lua_types.go +++ b/apis/fluentbit/v1alpha2/plugins/filter/lua_types.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" v1 "k8s.io/api/core/v1" ) diff --git a/apis/fluentbit/v1alpha2/plugins/filter/modify_types.go b/apis/fluentbit/v1alpha2/plugins/filter/modify_types.go index 6c3f7d672..9b1461822 100644 --- a/apis/fluentbit/v1alpha2/plugins/filter/modify_types.go +++ b/apis/fluentbit/v1alpha2/plugins/filter/modify_types.go @@ -3,8 +3,8 @@ package filter import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/filter/modify_types_test.go b/apis/fluentbit/v1alpha2/plugins/filter/modify_types_test.go index b735c9ee8..4dde6f4f7 100644 --- a/apis/fluentbit/v1alpha2/plugins/filter/modify_types_test.go +++ b/apis/fluentbit/v1alpha2/plugins/filter/modify_types_test.go @@ -3,8 +3,8 @@ package filter import ( "testing" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" . "github.com/onsi/gomega" ) diff --git a/apis/fluentbit/v1alpha2/plugins/filter/multiline_types.go b/apis/fluentbit/v1alpha2/plugins/filter/multiline_types.go index 5b60c6124..82a2fcd61 100644 --- a/apis/fluentbit/v1alpha2/plugins/filter/multiline_types.go +++ b/apis/fluentbit/v1alpha2/plugins/filter/multiline_types.go @@ -3,8 +3,8 @@ package filter import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/filter/nest_types.go b/apis/fluentbit/v1alpha2/plugins/filter/nest_types.go index d4453634e..f34de22ca 100644 --- a/apis/fluentbit/v1alpha2/plugins/filter/nest_types.go +++ b/apis/fluentbit/v1alpha2/plugins/filter/nest_types.go @@ -1,8 +1,8 @@ package filter import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/filter/parser_types.go b/apis/fluentbit/v1alpha2/plugins/filter/parser_types.go index dfdfbcfb3..e317c4de6 100644 --- a/apis/fluentbit/v1alpha2/plugins/filter/parser_types.go +++ b/apis/fluentbit/v1alpha2/plugins/filter/parser_types.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/filter/recordmodifier_types.go b/apis/fluentbit/v1alpha2/plugins/filter/recordmodifier_types.go index cea8d776a..71a7f9a23 100644 --- a/apis/fluentbit/v1alpha2/plugins/filter/recordmodifier_types.go +++ b/apis/fluentbit/v1alpha2/plugins/filter/recordmodifier_types.go @@ -1,8 +1,8 @@ package filter import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/filter/recordmodifier_types_test.go b/apis/fluentbit/v1alpha2/plugins/filter/recordmodifier_types_test.go index 819cf659a..d35b65863 100644 --- a/apis/fluentbit/v1alpha2/plugins/filter/recordmodifier_types_test.go +++ b/apis/fluentbit/v1alpha2/plugins/filter/recordmodifier_types_test.go @@ -3,8 +3,8 @@ package filter import ( "testing" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" . "github.com/onsi/gomega" ) diff --git a/apis/fluentbit/v1alpha2/plugins/filter/rewritetag_types.go b/apis/fluentbit/v1alpha2/plugins/filter/rewritetag_types.go index 2bd8154bd..bd68a7519 100644 --- a/apis/fluentbit/v1alpha2/plugins/filter/rewritetag_types.go +++ b/apis/fluentbit/v1alpha2/plugins/filter/rewritetag_types.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/filter/throttle_types.go b/apis/fluentbit/v1alpha2/plugins/filter/throttle_types.go index 5cac6a320..db9b858a2 100644 --- a/apis/fluentbit/v1alpha2/plugins/filter/throttle_types.go +++ b/apis/fluentbit/v1alpha2/plugins/filter/throttle_types.go @@ -3,8 +3,8 @@ package filter import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/filter/wasm.go b/apis/fluentbit/v1alpha2/plugins/filter/wasm.go index 93228c1e2..4ced562d4 100644 --- a/apis/fluentbit/v1alpha2/plugins/filter/wasm.go +++ b/apis/fluentbit/v1alpha2/plugins/filter/wasm.go @@ -1,8 +1,8 @@ package filter import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/collectd.go b/apis/fluentbit/v1alpha2/plugins/input/collectd.go index 505a34987..5647bb5fc 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/collectd.go +++ b/apis/fluentbit/v1alpha2/plugins/input/collectd.go @@ -3,8 +3,8 @@ package input import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/dummy_types.go b/apis/fluentbit/v1alpha2/plugins/input/dummy_types.go index f8a77c17c..31ed85060 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/dummy_types.go +++ b/apis/fluentbit/v1alpha2/plugins/input/dummy_types.go @@ -3,8 +3,8 @@ package input import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/exec_wasi_types.go b/apis/fluentbit/v1alpha2/plugins/input/exec_wasi_types.go index e17233aa6..ac52ba4af 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/exec_wasi_types.go +++ b/apis/fluentbit/v1alpha2/plugins/input/exec_wasi_types.go @@ -3,8 +3,8 @@ package input import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/fluent_bit_metrics_types.go b/apis/fluentbit/v1alpha2/plugins/input/fluent_bit_metrics_types.go index 94f3d0fd7..024b01181 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/fluent_bit_metrics_types.go +++ b/apis/fluentbit/v1alpha2/plugins/input/fluent_bit_metrics_types.go @@ -2,8 +2,9 @@ package input import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/forward.go b/apis/fluentbit/v1alpha2/plugins/input/forward.go index 604dcabba..e54ab5853 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/forward.go +++ b/apis/fluentbit/v1alpha2/plugins/input/forward.go @@ -3,8 +3,8 @@ package input import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/http.go b/apis/fluentbit/v1alpha2/plugins/input/http.go index 9348bc44b..e0daf32c1 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/http.go +++ b/apis/fluentbit/v1alpha2/plugins/input/http.go @@ -3,8 +3,8 @@ package input import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/kubernetes_events_types.go b/apis/fluentbit/v1alpha2/plugins/input/kubernetes_events_types.go index d1a55c0c9..85ad7069a 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/kubernetes_events_types.go +++ b/apis/fluentbit/v1alpha2/plugins/input/kubernetes_events_types.go @@ -3,8 +3,8 @@ package input import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/mqtt.go b/apis/fluentbit/v1alpha2/plugins/input/mqtt.go index 9602e105e..9e40430de 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/mqtt.go +++ b/apis/fluentbit/v1alpha2/plugins/input/mqtt.go @@ -3,8 +3,8 @@ package input import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/nginx.go b/apis/fluentbit/v1alpha2/plugins/input/nginx.go index 4d607653e..3c16339f6 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/nginx.go +++ b/apis/fluentbit/v1alpha2/plugins/input/nginx.go @@ -3,8 +3,8 @@ package input import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/node_exporter_metrics_types.go b/apis/fluentbit/v1alpha2/plugins/input/node_exporter_metrics_types.go index 3bba6165f..15b3a2bd5 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/node_exporter_metrics_types.go +++ b/apis/fluentbit/v1alpha2/plugins/input/node_exporter_metrics_types.go @@ -1,8 +1,8 @@ package input import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/open_telemetry_types.go b/apis/fluentbit/v1alpha2/plugins/input/open_telemetry_types.go index ca866e330..a36b63b94 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/open_telemetry_types.go +++ b/apis/fluentbit/v1alpha2/plugins/input/open_telemetry_types.go @@ -3,8 +3,8 @@ package input import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/prometheus_scrape_metrics_type.go b/apis/fluentbit/v1alpha2/plugins/input/prometheus_scrape_metrics_type.go index f2b68b50e..124b3be7d 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/prometheus_scrape_metrics_type.go +++ b/apis/fluentbit/v1alpha2/plugins/input/prometheus_scrape_metrics_type.go @@ -2,9 +2,10 @@ package input import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" "strings" + + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/statsd.go b/apis/fluentbit/v1alpha2/plugins/input/statsd.go index c81592353..7e5dc2653 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/statsd.go +++ b/apis/fluentbit/v1alpha2/plugins/input/statsd.go @@ -3,8 +3,8 @@ package input import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/syslog.go b/apis/fluentbit/v1alpha2/plugins/input/syslog.go index 27b2121b5..0cf0b202e 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/syslog.go +++ b/apis/fluentbit/v1alpha2/plugins/input/syslog.go @@ -3,8 +3,8 @@ package input import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/systemd_types.go b/apis/fluentbit/v1alpha2/plugins/input/systemd_types.go index 5e86575b2..288a1a0a8 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/systemd_types.go +++ b/apis/fluentbit/v1alpha2/plugins/input/systemd_types.go @@ -1,8 +1,8 @@ package input import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/tail_types.go b/apis/fluentbit/v1alpha2/plugins/input/tail_types.go index d974d75d0..33dd67071 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/tail_types.go +++ b/apis/fluentbit/v1alpha2/plugins/input/tail_types.go @@ -3,8 +3,8 @@ package input import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/tcp.go b/apis/fluentbit/v1alpha2/plugins/input/tcp.go index 5aec983cc..03a1ca28e 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/tcp.go +++ b/apis/fluentbit/v1alpha2/plugins/input/tcp.go @@ -3,8 +3,8 @@ package input import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/udp.go b/apis/fluentbit/v1alpha2/plugins/input/udp.go index af3001bd7..18f0601d1 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/udp.go +++ b/apis/fluentbit/v1alpha2/plugins/input/udp.go @@ -2,8 +2,9 @@ package input import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/input/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/plugins/input/zz_generated.deepcopy.go index 399a574b1..9be65078e 100644 --- a/apis/fluentbit/v1alpha2/plugins/input/zz_generated.deepcopy.go +++ b/apis/fluentbit/v1alpha2/plugins/input/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package input import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/apis/fluentbit/v1alpha2/plugins/interface.go b/apis/fluentbit/v1alpha2/plugins/interface.go index f21ebad28..1adc6a3bd 100644 --- a/apis/fluentbit/v1alpha2/plugins/interface.go +++ b/apis/fluentbit/v1alpha2/plugins/interface.go @@ -1,6 +1,6 @@ package plugins -import "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" +import "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" // +kubebuilder:object:generate=false diff --git a/apis/fluentbit/v1alpha2/plugins/multilineparser/multilineparser_types.go b/apis/fluentbit/v1alpha2/plugins/multilineparser/multilineparser_types.go index 285ac9ad6..00844ef8f 100644 --- a/apis/fluentbit/v1alpha2/plugins/multilineparser/multilineparser_types.go +++ b/apis/fluentbit/v1alpha2/plugins/multilineparser/multilineparser_types.go @@ -2,8 +2,9 @@ package multilineparser import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/net_types.go b/apis/fluentbit/v1alpha2/plugins/net_types.go index 96f166324..4d5adaa19 100644 --- a/apis/fluentbit/v1alpha2/plugins/net_types.go +++ b/apis/fluentbit/v1alpha2/plugins/net_types.go @@ -3,7 +3,7 @@ package plugins import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/azure_blob_types.go b/apis/fluentbit/v1alpha2/plugins/output/azure_blob_types.go index 4cd143bdf..5985f88ab 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/azure_blob_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/azure_blob_types.go @@ -1,8 +1,8 @@ package output import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/azure_log_analytics_types.go b/apis/fluentbit/v1alpha2/plugins/output/azure_log_analytics_types.go index f84a4ffec..457388498 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/azure_log_analytics_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/azure_log_analytics_types.go @@ -3,8 +3,8 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/cloudwatch_types.go b/apis/fluentbit/v1alpha2/plugins/output/cloudwatch_types.go index e5641d32a..4a646fba5 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/cloudwatch_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/cloudwatch_types.go @@ -2,8 +2,9 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/datadog_types.go b/apis/fluentbit/v1alpha2/plugins/output/datadog_types.go index b417dbcd6..f7ac27339 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/datadog_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/datadog_types.go @@ -3,8 +3,8 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/datadog_types_test.go b/apis/fluentbit/v1alpha2/plugins/output/datadog_types_test.go index b68a70482..c45d62973 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/datadog_types_test.go +++ b/apis/fluentbit/v1alpha2/plugins/output/datadog_types_test.go @@ -3,8 +3,8 @@ package output import ( "testing" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" . "github.com/onsi/gomega" ) diff --git a/apis/fluentbit/v1alpha2/plugins/output/elasticsearch_types.go b/apis/fluentbit/v1alpha2/plugins/output/elasticsearch_types.go index d6d30eb32..ad9339370 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/elasticsearch_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/elasticsearch_types.go @@ -3,8 +3,8 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/file_types.go b/apis/fluentbit/v1alpha2/plugins/output/file_types.go index d5f6dd467..388df8d3f 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/file_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/file_types.go @@ -1,8 +1,8 @@ package output import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/firehose_types.go b/apis/fluentbit/v1alpha2/plugins/output/firehose_types.go index 166533e9e..46c06e8a1 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/firehose_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/firehose_types.go @@ -3,8 +3,8 @@ package output import ( "strconv" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/forward_types.go b/apis/fluentbit/v1alpha2/plugins/output/forward_types.go index 1a90661d0..cac9cc0f7 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/forward_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/forward_types.go @@ -3,8 +3,8 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/gelf_types.go b/apis/fluentbit/v1alpha2/plugins/output/gelf_types.go index ac2cecb5c..5c88660ae 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/gelf_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/gelf_types.go @@ -3,8 +3,8 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/gelf_types_test.go b/apis/fluentbit/v1alpha2/plugins/output/gelf_types_test.go index 1777d4bba..c7e32fe24 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/gelf_types_test.go +++ b/apis/fluentbit/v1alpha2/plugins/output/gelf_types_test.go @@ -3,8 +3,8 @@ package output import ( "testing" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" . "github.com/onsi/gomega" ) diff --git a/apis/fluentbit/v1alpha2/plugins/output/http_types.go b/apis/fluentbit/v1alpha2/plugins/output/http_types.go index f43901cbb..4c103ff8b 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/http_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/http_types.go @@ -3,8 +3,8 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go b/apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go index 99f28b074..32e4c95ca 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/influxdb_types_test.go b/apis/fluentbit/v1alpha2/plugins/output/influxdb_types_test.go index c0e925480..73c1f0612 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/influxdb_types_test.go +++ b/apis/fluentbit/v1alpha2/plugins/output/influxdb_types_test.go @@ -3,8 +3,8 @@ package output import ( "testing" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" . "github.com/onsi/gomega" ) diff --git a/apis/fluentbit/v1alpha2/plugins/output/kafka_types.go b/apis/fluentbit/v1alpha2/plugins/output/kafka_types.go index 764e6e470..713fa5624 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/kafka_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/kafka_types.go @@ -3,8 +3,8 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/kinesis_types.go b/apis/fluentbit/v1alpha2/plugins/output/kinesis_types.go index 64b61c560..2fd0347a9 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/kinesis_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/kinesis_types.go @@ -2,8 +2,9 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/kinesis_types_test.go b/apis/fluentbit/v1alpha2/plugins/output/kinesis_types_test.go index 65db782a9..19d315c07 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/kinesis_types_test.go +++ b/apis/fluentbit/v1alpha2/plugins/output/kinesis_types_test.go @@ -1,10 +1,11 @@ package output import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" - "github.com/onsi/gomega" "testing" + + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" + "github.com/onsi/gomega" ) func TestOutput_Kinesis_Params(t *testing.T) { diff --git a/apis/fluentbit/v1alpha2/plugins/output/loki_types.go b/apis/fluentbit/v1alpha2/plugins/output/loki_types.go index f9fdaef0b..99ab2e973 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/loki_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/loki_types.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/null_types.go b/apis/fluentbit/v1alpha2/plugins/output/null_types.go index ceac4f429..980dafaaf 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/null_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/null_types.go @@ -1,8 +1,8 @@ package output import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/open_search_types.go b/apis/fluentbit/v1alpha2/plugins/output/open_search_types.go index 7a1c77dae..3519a6b86 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/open_search_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/open_search_types.go @@ -3,8 +3,8 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/open_telemetry_types.go b/apis/fluentbit/v1alpha2/plugins/output/open_telemetry_types.go index e23121fba..de25b7be7 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/open_telemetry_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/open_telemetry_types.go @@ -3,8 +3,8 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/prometheus_exporter.go b/apis/fluentbit/v1alpha2/plugins/output/prometheus_exporter.go index 994472aad..b6d0c05aa 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/prometheus_exporter.go +++ b/apis/fluentbit/v1alpha2/plugins/output/prometheus_exporter.go @@ -3,8 +3,8 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/prometheus_remote_write_types.go b/apis/fluentbit/v1alpha2/plugins/output/prometheus_remote_write_types.go index 9efaa03d7..260550131 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/prometheus_remote_write_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/prometheus_remote_write_types.go @@ -3,8 +3,8 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/s3_types.go b/apis/fluentbit/v1alpha2/plugins/output/s3_types.go index 640e68148..798129a8a 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/s3_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/s3_types.go @@ -3,8 +3,8 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/s3_types_test.go b/apis/fluentbit/v1alpha2/plugins/output/s3_types_test.go index d49712e7f..297322023 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/s3_types_test.go +++ b/apis/fluentbit/v1alpha2/plugins/output/s3_types_test.go @@ -3,8 +3,8 @@ package output import ( "testing" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" . "github.com/onsi/gomega" ) diff --git a/apis/fluentbit/v1alpha2/plugins/output/splunk_types.go b/apis/fluentbit/v1alpha2/plugins/output/splunk_types.go index 0872219ab..23a58f3a3 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/splunk_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/splunk_types.go @@ -3,8 +3,8 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/stackdriver_types.go b/apis/fluentbit/v1alpha2/plugins/output/stackdriver_types.go index 66c9ed363..9db25c898 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/stackdriver_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/stackdriver_types.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/stdout_types.go b/apis/fluentbit/v1alpha2/plugins/output/stdout_types.go index 890cff6ba..84ff6a1d5 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/stdout_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/stdout_types.go @@ -1,8 +1,8 @@ package output import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/syslog_types.go b/apis/fluentbit/v1alpha2/plugins/output/syslog_types.go index 5c031dfb1..5d7abad5f 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/syslog_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/syslog_types.go @@ -3,8 +3,8 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/tcp_types.go b/apis/fluentbit/v1alpha2/plugins/output/tcp_types.go index 0fa359729..b86ea8db5 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/tcp_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/tcp_types.go @@ -3,8 +3,8 @@ package output import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go index ab0062294..bd36e928e 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go +++ b/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package output import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/apis/fluentbit/v1alpha2/plugins/params/kvs.go b/apis/fluentbit/v1alpha2/plugins/params/kvs.go index 65c99812a..ebdcc7e61 100644 --- a/apis/fluentbit/v1alpha2/plugins/params/kvs.go +++ b/apis/fluentbit/v1alpha2/plugins/params/kvs.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/fluent/fluent-operator/v2/pkg/utils" + "github.com/fluent/fluent-operator/v3/pkg/utils" ) type kvTransformFunc func(string, string) (string, string) diff --git a/apis/fluentbit/v1alpha2/plugins/parser/json_types.go b/apis/fluentbit/v1alpha2/plugins/parser/json_types.go index bd9dbc9e8..4bb3981b8 100644 --- a/apis/fluentbit/v1alpha2/plugins/parser/json_types.go +++ b/apis/fluentbit/v1alpha2/plugins/parser/json_types.go @@ -3,8 +3,8 @@ package parser import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/parser/logfmt_types.go b/apis/fluentbit/v1alpha2/plugins/parser/logfmt_types.go index f4a7ea711..98d8481ab 100644 --- a/apis/fluentbit/v1alpha2/plugins/parser/logfmt_types.go +++ b/apis/fluentbit/v1alpha2/plugins/parser/logfmt_types.go @@ -1,8 +1,8 @@ package parser import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/parser/lstv_types.go b/apis/fluentbit/v1alpha2/plugins/parser/lstv_types.go index 51ae61f3a..c7eccb262 100644 --- a/apis/fluentbit/v1alpha2/plugins/parser/lstv_types.go +++ b/apis/fluentbit/v1alpha2/plugins/parser/lstv_types.go @@ -3,8 +3,8 @@ package parser import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/parser/regex_types.go b/apis/fluentbit/v1alpha2/plugins/parser/regex_types.go index dc107a7ae..ce98e1553 100644 --- a/apis/fluentbit/v1alpha2/plugins/parser/regex_types.go +++ b/apis/fluentbit/v1alpha2/plugins/parser/regex_types.go @@ -3,8 +3,8 @@ package parser import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/plugins/tls_types.go b/apis/fluentbit/v1alpha2/plugins/tls_types.go index 2ab82f42d..2e1052a51 100644 --- a/apis/fluentbit/v1alpha2/plugins/tls_types.go +++ b/apis/fluentbit/v1alpha2/plugins/tls_types.go @@ -3,7 +3,7 @@ package plugins import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go index 8942d1cae..2e1bf58ae 100644 --- a/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go +++ b/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go @@ -21,12 +21,12 @@ limitations under the License. package v1alpha2 import ( - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/custom" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/filter" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/input" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/multilineparser" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/output" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/parser" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/custom" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/filter" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/input" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/multilineparser" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/output" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/parser" "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/apis/fluentd/v1alpha1/clusterfilter_types.go b/apis/fluentd/v1alpha1/clusterfilter_types.go index d4a20a014..6d16035e7 100644 --- a/apis/fluentd/v1alpha1/clusterfilter_types.go +++ b/apis/fluentd/v1alpha1/clusterfilter_types.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/filter" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/filter" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/fluentd/v1alpha1/clusterinput_types.go b/apis/fluentd/v1alpha1/clusterinput_types.go index 1d5347b37..ed7437cbc 100644 --- a/apis/fluentd/v1alpha1/clusterinput_types.go +++ b/apis/fluentd/v1alpha1/clusterinput_types.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/input" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/input" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/fluentd/v1alpha1/clusteroutput_types.go b/apis/fluentd/v1alpha1/clusteroutput_types.go index 7732652ef..39b61b9fa 100644 --- a/apis/fluentd/v1alpha1/clusteroutput_types.go +++ b/apis/fluentd/v1alpha1/clusteroutput_types.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/output" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/output" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/fluentd/v1alpha1/doc.go b/apis/fluentd/v1alpha1/doc.go index cdd478421..f39c6f851 100644 --- a/apis/fluentd/v1alpha1/doc.go +++ b/apis/fluentd/v1alpha1/doc.go @@ -16,4 +16,4 @@ limitations under the License. // +k8s:deepcopy-gen=package // +groupName=fluentd.fluent.io -package v1alpha1 // import "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" +package v1alpha1 // import "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" diff --git a/apis/fluentd/v1alpha1/filter_types.go b/apis/fluentd/v1alpha1/filter_types.go index e6ee5e256..6ad7b6688 100644 --- a/apis/fluentd/v1alpha1/filter_types.go +++ b/apis/fluentd/v1alpha1/filter_types.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/filter" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/filter" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/fluentd/v1alpha1/fluentd_types.go b/apis/fluentd/v1alpha1/fluentd_types.go index fd91b3d44..a19d3e9be 100644 --- a/apis/fluentd/v1alpha1/fluentd_types.go +++ b/apis/fluentd/v1alpha1/fluentd_types.go @@ -19,7 +19,7 @@ package v1alpha1 import ( "slices" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/input" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/input" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/apis/fluentd/v1alpha1/helper.go b/apis/fluentd/v1alpha1/helper.go index 9ce57899c..88eb2cda8 100644 --- a/apis/fluentd/v1alpha1/helper.go +++ b/apis/fluentd/v1alpha1/helper.go @@ -7,12 +7,12 @@ import ( "sort" "strings" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/filter" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/input" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/output" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params" - fluentdRouter "github.com/fluent/fluent-operator/v2/pkg/fluentd/router" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/filter" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/input" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/output" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/params" + fluentdRouter "github.com/fluent/fluent-operator/v3/pkg/fluentd/router" ) // +kubebuilder:object:generate=false diff --git a/apis/fluentd/v1alpha1/input_types.go b/apis/fluentd/v1alpha1/input_types.go index 33858765e..19dd44372 100644 --- a/apis/fluentd/v1alpha1/input_types.go +++ b/apis/fluentd/v1alpha1/input_types.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/input" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/input" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/fluentd/v1alpha1/output_types.go b/apis/fluentd/v1alpha1/output_types.go index 93564b13d..93fd1bb3e 100644 --- a/apis/fluentd/v1alpha1/output_types.go +++ b/apis/fluentd/v1alpha1/output_types.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/output" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/output" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/fluentd/v1alpha1/plugins/common/buffer_types.go b/apis/fluentd/v1alpha1/plugins/common/buffer_types.go index 6d990de09..61abf81f1 100644 --- a/apis/fluentd/v1alpha1/plugins/common/buffer_types.go +++ b/apis/fluentd/v1alpha1/plugins/common/buffer_types.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentd/v1alpha1/plugins/common/common_types.go b/apis/fluentd/v1alpha1/plugins/common/common_types.go index 0c1056256..2ca4e2100 100644 --- a/apis/fluentd/v1alpha1/plugins/common/common_types.go +++ b/apis/fluentd/v1alpha1/plugins/common/common_types.go @@ -3,8 +3,8 @@ package common import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/params" ) // +kubebuilder:object:generate:=true diff --git a/apis/fluentd/v1alpha1/plugins/common/format_types.go b/apis/fluentd/v1alpha1/plugins/common/format_types.go index 587aa60cd..6cf1ee5bb 100644 --- a/apis/fluentd/v1alpha1/plugins/common/format_types.go +++ b/apis/fluentd/v1alpha1/plugins/common/format_types.go @@ -3,8 +3,8 @@ package common import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/params" ) // FormatCommon defines common parameters of the format plugin diff --git a/apis/fluentd/v1alpha1/plugins/common/parse_types.go b/apis/fluentd/v1alpha1/plugins/common/parse_types.go index bb34ba93a..a34dda3be 100644 --- a/apis/fluentd/v1alpha1/plugins/common/parse_types.go +++ b/apis/fluentd/v1alpha1/plugins/common/parse_types.go @@ -3,8 +3,8 @@ package common import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/params" ) // ParseCommon defines the common parameters for the parse plugin diff --git a/apis/fluentd/v1alpha1/plugins/custom/custom_types.go b/apis/fluentd/v1alpha1/plugins/custom/custom_types.go index 70e1e9fb7..5d390fb0a 100644 --- a/apis/fluentd/v1alpha1/plugins/custom/custom_types.go +++ b/apis/fluentd/v1alpha1/plugins/custom/custom_types.go @@ -3,9 +3,10 @@ package custom import ( "bytes" "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params" "strings" + + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/params" ) type CustomPlugin struct { diff --git a/apis/fluentd/v1alpha1/plugins/filter/grep.go b/apis/fluentd/v1alpha1/plugins/filter/grep.go index 6cc28b69e..6c1e1e7dc 100644 --- a/apis/fluentd/v1alpha1/plugins/filter/grep.go +++ b/apis/fluentd/v1alpha1/plugins/filter/grep.go @@ -3,8 +3,8 @@ package filter import ( "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/params" ) // Grep defines various parameters for the grep plugin diff --git a/apis/fluentd/v1alpha1/plugins/filter/parser.go b/apis/fluentd/v1alpha1/plugins/filter/parser.go index 1e877e398..6270f7b51 100644 --- a/apis/fluentd/v1alpha1/plugins/filter/parser.go +++ b/apis/fluentd/v1alpha1/plugins/filter/parser.go @@ -1,6 +1,6 @@ package filter -import "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/common" +import "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/common" // Parser defines the parameters for filter_parser plugin type Parser struct { diff --git a/apis/fluentd/v1alpha1/plugins/filter/stdout.go b/apis/fluentd/v1alpha1/plugins/filter/stdout.go index 6a8b8eba2..95141cda8 100644 --- a/apis/fluentd/v1alpha1/plugins/filter/stdout.go +++ b/apis/fluentd/v1alpha1/plugins/filter/stdout.go @@ -1,6 +1,6 @@ package filter -import "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/common" +import "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/common" // Stdout defines the parameters for filter_stdout plugin type Stdout struct { diff --git a/apis/fluentd/v1alpha1/plugins/filter/types.go b/apis/fluentd/v1alpha1/plugins/filter/types.go index 8ace91766..e4e3dd385 100644 --- a/apis/fluentd/v1alpha1/plugins/filter/types.go +++ b/apis/fluentd/v1alpha1/plugins/filter/types.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/custom" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/custom" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/params" ) // FilterCommon defines the common parameters for the filter plugin. diff --git a/apis/fluentd/v1alpha1/plugins/input/forward.go b/apis/fluentd/v1alpha1/plugins/input/forward.go index 1afc81686..0bcf075bd 100644 --- a/apis/fluentd/v1alpha1/plugins/input/forward.go +++ b/apis/fluentd/v1alpha1/plugins/input/forward.go @@ -1,7 +1,7 @@ package input import ( - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/common" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/common" ) // Forward defines the in_forward Input plugin that listens to a TCP socket to receive the event stream. diff --git a/apis/fluentd/v1alpha1/plugins/input/http.go b/apis/fluentd/v1alpha1/plugins/input/http.go index b9ed26658..acaee1d46 100644 --- a/apis/fluentd/v1alpha1/plugins/input/http.go +++ b/apis/fluentd/v1alpha1/plugins/input/http.go @@ -1,7 +1,7 @@ package input import ( - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/common" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/common" ) // Http defines the in_http Input plugin that listens to a TCP socket to receive the event stream. diff --git a/apis/fluentd/v1alpha1/plugins/input/tail.go b/apis/fluentd/v1alpha1/plugins/input/tail.go index 3e5388018..ca47c8140 100644 --- a/apis/fluentd/v1alpha1/plugins/input/tail.go +++ b/apis/fluentd/v1alpha1/plugins/input/tail.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/common" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/common" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/params" ) // The in_tail Input plugin allows Fluentd to read events from the tail of text files. Its behavior is similar to the tail -F command. diff --git a/apis/fluentd/v1alpha1/plugins/input/types.go b/apis/fluentd/v1alpha1/plugins/input/types.go index 944945aac..5b2073289 100644 --- a/apis/fluentd/v1alpha1/plugins/input/types.go +++ b/apis/fluentd/v1alpha1/plugins/input/types.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/custom" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/custom" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/params" ) // InputCommon defines the common parameters for input plugins diff --git a/apis/fluentd/v1alpha1/plugins/interface.go b/apis/fluentd/v1alpha1/plugins/interface.go index aa0107479..68ea75eb8 100644 --- a/apis/fluentd/v1alpha1/plugins/interface.go +++ b/apis/fluentd/v1alpha1/plugins/interface.go @@ -1,6 +1,6 @@ package plugins -import "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params" +import "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/params" // +kubebuilder:object:generate=false diff --git a/apis/fluentd/v1alpha1/plugins/output/cloudwatch.go b/apis/fluentd/v1alpha1/plugins/output/cloudwatch.go index fc63dc41f..6100e8c41 100644 --- a/apis/fluentd/v1alpha1/plugins/output/cloudwatch.go +++ b/apis/fluentd/v1alpha1/plugins/output/cloudwatch.go @@ -1,7 +1,7 @@ package output import ( - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" ) // CloudWatch defines the parametes for out_cloudwatch output plugin diff --git a/apis/fluentd/v1alpha1/plugins/output/datadog.go b/apis/fluentd/v1alpha1/plugins/output/datadog.go index 536237539..074b31850 100644 --- a/apis/fluentd/v1alpha1/plugins/output/datadog.go +++ b/apis/fluentd/v1alpha1/plugins/output/datadog.go @@ -1,6 +1,6 @@ package output -import "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" +import "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" // Datadog defines the parameters for out_datadog plugin type Datadog struct { diff --git a/apis/fluentd/v1alpha1/plugins/output/es.go b/apis/fluentd/v1alpha1/plugins/output/es.go index 40962fb40..27f462a27 100644 --- a/apis/fluentd/v1alpha1/plugins/output/es.go +++ b/apis/fluentd/v1alpha1/plugins/output/es.go @@ -1,6 +1,6 @@ package output -import "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" +import "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" // Elasticsearch defines the parameters for out_es output plugin type ElasticsearchCommon struct { diff --git a/apis/fluentd/v1alpha1/plugins/output/forward.go b/apis/fluentd/v1alpha1/plugins/output/forward.go index 467f492e7..1acc64229 100644 --- a/apis/fluentd/v1alpha1/plugins/output/forward.go +++ b/apis/fluentd/v1alpha1/plugins/output/forward.go @@ -1,7 +1,7 @@ package output import ( - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/common" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/common" ) // Forward defines the out_forward Buffered Output plugin forwards events to other fluentd nodes. diff --git a/apis/fluentd/v1alpha1/plugins/output/http.go b/apis/fluentd/v1alpha1/plugins/output/http.go index c86454d09..348ce5ca9 100644 --- a/apis/fluentd/v1alpha1/plugins/output/http.go +++ b/apis/fluentd/v1alpha1/plugins/output/http.go @@ -1,7 +1,7 @@ package output import ( - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/common" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/common" ) // Http defines the parameters for out_http output plugin diff --git a/apis/fluentd/v1alpha1/plugins/output/loki.go b/apis/fluentd/v1alpha1/plugins/output/loki.go index 3a447afbb..df6980fa6 100644 --- a/apis/fluentd/v1alpha1/plugins/output/loki.go +++ b/apis/fluentd/v1alpha1/plugins/output/loki.go @@ -1,7 +1,7 @@ package output import ( - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" ) // The loki output plugin, allows to ingest your records into a Loki service. diff --git a/apis/fluentd/v1alpha1/plugins/output/opensearch.go b/apis/fluentd/v1alpha1/plugins/output/opensearch.go index a9fde019e..ae07a6336 100644 --- a/apis/fluentd/v1alpha1/plugins/output/opensearch.go +++ b/apis/fluentd/v1alpha1/plugins/output/opensearch.go @@ -1,6 +1,6 @@ package output -import "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" +import "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" // Opensearch defines the parameters for out_opensearch plugin type Opensearch struct { diff --git a/apis/fluentd/v1alpha1/plugins/output/types.go b/apis/fluentd/v1alpha1/plugins/output/types.go index 2facbef47..6333a16cd 100644 --- a/apis/fluentd/v1alpha1/plugins/output/types.go +++ b/apis/fluentd/v1alpha1/plugins/output/types.go @@ -6,10 +6,10 @@ import ( "strconv" "strings" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/common" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/custom" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/common" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/custom" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/params" ) // OutputCommon defines the common parameters for output plugin diff --git a/apis/fluentd/v1alpha1/plugins/params/model.go b/apis/fluentd/v1alpha1/plugins/params/model.go index 6d115093e..258bde471 100644 --- a/apis/fluentd/v1alpha1/plugins/params/model.go +++ b/apis/fluentd/v1alpha1/plugins/params/model.go @@ -5,7 +5,7 @@ import ( "fmt" "sort" - "github.com/fluent/fluent-operator/v2/pkg/utils" + "github.com/fluent/fluent-operator/v3/pkg/utils" ) type PluginStore struct { diff --git a/apis/fluentd/v1alpha1/tests/helper_test.go b/apis/fluentd/v1alpha1/tests/helper_test.go index 13332a1d2..1c51cc024 100644 --- a/apis/fluentd/v1alpha1/tests/helper_test.go +++ b/apis/fluentd/v1alpha1/tests/helper_test.go @@ -12,8 +12,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" ) const ( diff --git a/apis/fluentd/v1alpha1/tests/tools.go b/apis/fluentd/v1alpha1/tests/tools.go index bd2dd2cb9..e5d273b70 100644 --- a/apis/fluentd/v1alpha1/tests/tools.go +++ b/apis/fluentd/v1alpha1/tests/tools.go @@ -7,11 +7,11 @@ import ( corev1 "k8s.io/api/core/v1" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/common" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/filter" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/input" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/output" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/common" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/filter" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/input" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/output" "sigs.k8s.io/yaml" ) diff --git a/apis/fluentd/v1alpha1/zz_generated.deepcopy.go b/apis/fluentd/v1alpha1/zz_generated.deepcopy.go index a30d2a40b..8433e9545 100644 --- a/apis/fluentd/v1alpha1/zz_generated.deepcopy.go +++ b/apis/fluentd/v1alpha1/zz_generated.deepcopy.go @@ -21,9 +21,9 @@ limitations under the License. package v1alpha1 import ( - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/filter" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/input" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/output" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/filter" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/input" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/output" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/apis/generated/clientset/versioned/clientset.go b/apis/generated/clientset/versioned/clientset.go index d1d3fad25..4788e3b30 100644 --- a/apis/generated/clientset/versioned/clientset.go +++ b/apis/generated/clientset/versioned/clientset.go @@ -21,8 +21,8 @@ import ( "fmt" "net/http" - fluentbitv1alpha2 "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/typed/fluentd/v1alpha1" + fluentbitv1alpha2 "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/typed/fluentd/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/apis/generated/clientset/versioned/fake/clientset_generated.go b/apis/generated/clientset/versioned/fake/clientset_generated.go index 48713b096..273f26130 100644 --- a/apis/generated/clientset/versioned/fake/clientset_generated.go +++ b/apis/generated/clientset/versioned/fake/clientset_generated.go @@ -18,11 +18,11 @@ limitations under the License. package fake import ( - clientset "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned" - fluentbitv1alpha2 "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2" - fakefluentbitv1alpha2 "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/typed/fluentd/v1alpha1" - fakefluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake" + clientset "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned" + fluentbitv1alpha2 "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2" + fakefluentbitv1alpha2 "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/typed/fluentd/v1alpha1" + fakefluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/apis/generated/clientset/versioned/fake/register.go b/apis/generated/clientset/versioned/fake/register.go index 733f848f2..6418f514f 100644 --- a/apis/generated/clientset/versioned/fake/register.go +++ b/apis/generated/clientset/versioned/fake/register.go @@ -18,8 +18,8 @@ limitations under the License. package fake import ( - fluentbitv1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + fluentbitv1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/scheme/register.go b/apis/generated/clientset/versioned/scheme/register.go index 2c72f75c3..6ad5ecc51 100644 --- a/apis/generated/clientset/versioned/scheme/register.go +++ b/apis/generated/clientset/versioned/scheme/register.go @@ -18,8 +18,8 @@ limitations under the License. package scheme import ( - fluentbitv1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + fluentbitv1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusterfilter.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusterfilter.go index cbd403649..05a99e206 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusterfilter.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusterfilter.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusterfluentbitconfig.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusterfluentbitconfig.go index b523605c7..b9f1ec5a5 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusterfluentbitconfig.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusterfluentbitconfig.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusterinput.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusterinput.go index 6c9ac9233..2c9123a48 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusterinput.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusterinput.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clustermultilineparser.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clustermultilineparser.go index 6b2da9614..214355d54 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clustermultilineparser.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clustermultilineparser.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusteroutput.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusteroutput.go index 28e234558..54617065e 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusteroutput.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusteroutput.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusterparser.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusterparser.go index 88b65cbae..c98fe85ea 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusterparser.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/clusterparser.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/collector.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/collector.go index 2e176f1ad..06061a7cf 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/collector.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/collector.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusterfilter.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusterfilter.go index a2282a9f9..daee86b14 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusterfilter.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusterfilter.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusterfluentbitconfig.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusterfluentbitconfig.go index 848fa4983..9e92b6a1f 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusterfluentbitconfig.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusterfluentbitconfig.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusterinput.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusterinput.go index 441fbee2d..40337a46b 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusterinput.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusterinput.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clustermultilineparser.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clustermultilineparser.go index c1026af11..f831599a1 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clustermultilineparser.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clustermultilineparser.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusteroutput.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusteroutput.go index 05b05a509..b2a104f87 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusteroutput.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusteroutput.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusterparser.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusterparser.go index 785be718a..eabe523e7 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusterparser.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_clusterparser.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_collector.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_collector.go index 89ff8a506..14180595b 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_collector.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_collector.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_filter.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_filter.go index 9c7a2f43a..035348e91 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_filter.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_filter.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_fluentbit.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_fluentbit.go index 4188df4f8..e2e04ab1a 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_fluentbit.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_fluentbit.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_fluentbit_client.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_fluentbit_client.go index e2944b092..74bb60d73 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_fluentbit_client.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_fluentbit_client.go @@ -18,7 +18,7 @@ limitations under the License. package fake import ( - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_fluentbitconfig.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_fluentbitconfig.go index b1de740a2..7773a4b73 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_fluentbitconfig.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_fluentbitconfig.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_multilineparser.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_multilineparser.go index 005083269..39e00ffe7 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_multilineparser.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_multilineparser.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_output.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_output.go index 687c8a2f5..e855d2925 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_output.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_output.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_parser.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_parser.go index 8c97f056e..b9a1aac31 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_parser.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fake/fake_parser.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/filter.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/filter.go index 298d69d62..c8b52ebe1 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/filter.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/filter.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fluentbit.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fluentbit.go index f6972f6f5..749acaa10 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fluentbit.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fluentbit.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fluentbit_client.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fluentbit_client.go index bf6aa04d6..2c32b9e54 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fluentbit_client.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fluentbit_client.go @@ -20,8 +20,8 @@ package v1alpha2 import ( "net/http" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fluentbitconfig.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fluentbitconfig.go index 549c67d3d..d4ae2bfa3 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fluentbitconfig.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/fluentbitconfig.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/multilineparser.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/multilineparser.go index de5f42d43..1d98ae90a 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/multilineparser.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/multilineparser.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/output.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/output.go index 8e8960398..5d8a58e66 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/output.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/output.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/parser.go b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/parser.go index 34222906e..85538d4c3 100644 --- a/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/parser.go +++ b/apis/generated/clientset/versioned/typed/fluentbit/v1alpha2/parser.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/clusterfilter.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/clusterfilter.go index 90ede31e2..44d03d396 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/clusterfilter.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/clusterfilter.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/clusterfluentdconfig.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/clusterfluentdconfig.go index a2ee2ac8c..50a32a9a4 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/clusterfluentdconfig.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/clusterfluentdconfig.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/clusterinput.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/clusterinput.go index 410c7d57c..769a94ccf 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/clusterinput.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/clusterinput.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/clusteroutput.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/clusteroutput.go index dab56e16d..15d3f7bc7 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/clusteroutput.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/clusteroutput.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_clusterfilter.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_clusterfilter.go index dfb91a567..a33e4abbf 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_clusterfilter.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_clusterfilter.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_clusterfluentdconfig.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_clusterfluentdconfig.go index 587431c02..982800c38 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_clusterfluentdconfig.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_clusterfluentdconfig.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_clusterinput.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_clusterinput.go index 0e752dee6..76566cb31 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_clusterinput.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_clusterinput.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_clusteroutput.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_clusteroutput.go index 4dc921feb..89f9747a9 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_clusteroutput.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_clusteroutput.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_filter.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_filter.go index 35e1e0e44..83d6e8e3e 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_filter.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_filter.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_fluentd.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_fluentd.go index 74e08f8c3..429666709 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_fluentd.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_fluentd.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_fluentd_client.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_fluentd_client.go index 1fcd1bfe9..2f5f96594 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_fluentd_client.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_fluentd_client.go @@ -18,7 +18,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/typed/fluentd/v1alpha1" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/typed/fluentd/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_fluentdconfig.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_fluentdconfig.go index e822514da..cb6562656 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_fluentdconfig.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_fluentdconfig.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_input.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_input.go index 49cf47b6d..2007d4f10 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_input.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_input.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_output.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_output.go index 9af2c10a6..b146b5faa 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_output.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fake/fake_output.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/filter.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/filter.go index 4e8ef53b5..7052f5568 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/filter.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/filter.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fluentd.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fluentd.go index dfe89c907..3daa2aec8 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fluentd.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fluentd.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fluentd_client.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fluentd_client.go index 9d6139163..df0e9214b 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fluentd_client.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fluentd_client.go @@ -20,8 +20,8 @@ package v1alpha1 import ( "net/http" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" - "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" + "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fluentdconfig.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fluentdconfig.go index c62abd792..1c5af8c38 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fluentdconfig.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/fluentdconfig.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/input.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/input.go index 284125181..39aa46552 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/input.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/input.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/output.go b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/output.go index 170a9e903..9fdf248af 100644 --- a/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/output.go +++ b/apis/generated/clientset/versioned/typed/fluentd/v1alpha1/output.go @@ -21,8 +21,8 @@ import ( "context" "time" - v1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" - scheme "github.com/fluent/fluent-operator/v2/apis/generated/clientset/versioned/scheme" + v1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" + scheme "github.com/fluent/fluent-operator/v3/apis/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/cmd/fluent-manager/main.go b/cmd/fluent-manager/main.go index b8ed7b97d..7035fad7e 100644 --- a/cmd/fluent-manager/main.go +++ b/cmd/fluent-manager/main.go @@ -38,10 +38,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log/zap" - fluentbitv1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + fluentbitv1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" - "github.com/fluent/fluent-operator/v2/controllers" + "github.com/fluent/fluent-operator/v3/controllers" // +kubebuilder:scaffold:imports ) diff --git a/cmd/fluent-watcher/fluentbit/main.go b/cmd/fluent-watcher/fluentbit/main.go index a6d90fa4a..99881b1f0 100644 --- a/cmd/fluent-watcher/fluentbit/main.go +++ b/cmd/fluent-watcher/fluentbit/main.go @@ -11,7 +11,7 @@ import ( "syscall" "time" - "github.com/fluent/fluent-operator/v2/pkg/filenotify" + "github.com/fluent/fluent-operator/v3/pkg/filenotify" "github.com/fsnotify/fsnotify" "github.com/go-kit/log" "github.com/go-kit/log/level" diff --git a/cmd/fluent-watcher/fluentd/main.go b/cmd/fluent-watcher/fluentd/main.go index ca7763bdf..a89f5b2d0 100644 --- a/cmd/fluent-watcher/fluentd/main.go +++ b/cmd/fluent-watcher/fluentd/main.go @@ -12,7 +12,7 @@ import ( "syscall" "time" - "github.com/fluent/fluent-operator/v2/pkg/filenotify" + "github.com/fluent/fluent-operator/v3/pkg/filenotify" "github.com/fsnotify/fsnotify" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" diff --git a/controllers/collector_controller.go b/controllers/collector_controller.go index 833b94331..f55d3e73d 100644 --- a/controllers/collector_controller.go +++ b/controllers/collector_controller.go @@ -31,8 +31,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - fluentbitv1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - "github.com/fluent/fluent-operator/v2/pkg/operator" + fluentbitv1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + "github.com/fluent/fluent-operator/v3/pkg/operator" ) // CollectorReconciler reconciles a FluentBit object diff --git a/controllers/consts.go b/controllers/consts.go index 3561a046e..c86a9bb0a 100644 --- a/controllers/consts.go +++ b/controllers/consts.go @@ -1,8 +1,8 @@ package controllers import ( - fluentbitv1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + fluentbitv1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" ) var ( diff --git a/controllers/fluent_controller_finalizer.go b/controllers/fluent_controller_finalizer.go index 0844d4dc0..5c427f006 100644 --- a/controllers/fluent_controller_finalizer.go +++ b/controllers/fluent_controller_finalizer.go @@ -2,6 +2,7 @@ package controllers import ( "context" + rbacv1 "k8s.io/api/rbac/v1" appsv1 "k8s.io/api/apps/v1" @@ -12,9 +13,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - fluentbitv1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" - "github.com/fluent/fluent-operator/v2/pkg/operator" + fluentbitv1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" + "github.com/fluent/fluent-operator/v3/pkg/operator" ) func (r *FluentBitReconciler) addFinalizer(ctx context.Context, instance *fluentbitv1alpha2.FluentBit) error { diff --git a/controllers/fluentbit_controller.go b/controllers/fluentbit_controller.go index 91c4968df..da4d3229b 100644 --- a/controllers/fluentbit_controller.go +++ b/controllers/fluentbit_controller.go @@ -32,8 +32,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - fluentbitv1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - "github.com/fluent/fluent-operator/v2/pkg/operator" + fluentbitv1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + "github.com/fluent/fluent-operator/v3/pkg/operator" ) // FluentBitReconciler reconciles a FluentBit object diff --git a/controllers/fluentbitconfig_controller.go b/controllers/fluentbitconfig_controller.go index 1fa149e56..296bc2828 100644 --- a/controllers/fluentbitconfig_controller.go +++ b/controllers/fluentbitconfig_controller.go @@ -23,7 +23,7 @@ import ( "fmt" "os" - "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins" + "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins" "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" @@ -38,7 +38,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/handler" - fluentbitv1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + fluentbitv1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" ) // FluentBitConfigReconciler reconciles a FluentBitConfig object diff --git a/controllers/fluentd_controller.go b/controllers/fluentd_controller.go index e2ef014d9..afb6678f2 100644 --- a/controllers/fluentd_controller.go +++ b/controllers/fluentd_controller.go @@ -31,8 +31,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" - "github.com/fluent/fluent-operator/v2/pkg/operator" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" + "github.com/fluent/fluent-operator/v3/pkg/operator" ) // FluentdReconciler reconciles a Fluentd object diff --git a/controllers/fluentdconfig_controller.go b/controllers/fluentdconfig_controller.go index 2707696b0..06187c4e9 100644 --- a/controllers/fluentdconfig_controller.go +++ b/controllers/fluentdconfig_controller.go @@ -32,8 +32,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/handler" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins" ) const ( diff --git a/controllers/suite_test.go b/controllers/suite_test.go index f9bdf7952..fab97caaa 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -28,8 +28,8 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - fluentbitv1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + fluentbitv1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/go.mod b/go.mod index dc783efac..9c9fe343a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/fluent/fluent-operator/v2 +module github.com/fluent/fluent-operator/v3 go 1.22.0 @@ -60,14 +60,12 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/mod v0.19.0 // indirect golang.org/x/net v0.27.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect golang.org/x/sys v0.22.0 // indirect golang.org/x/term v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.23.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.34.1 // indirect @@ -76,8 +74,6 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.30.1 // indirect - k8s.io/code-generator v0.30.3 // indirect - k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/go.sum b/go.sum index 8e73a9ea0..b682598dc 100644 --- a/go.sum +++ b/go.sum @@ -152,8 +152,6 @@ golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= -golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= @@ -240,10 +238,6 @@ k8s.io/apimachinery v0.30.3 h1:q1laaWCmrszyQuSQCfNB8cFgCuDAoPszKY4ucAjDwHc= k8s.io/apimachinery v0.30.3/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= k8s.io/client-go v0.30.3 h1:bHrJu3xQZNXIi8/MoxYtZBBWQQXwy16zqJwloXXfD3k= k8s.io/client-go v0.30.3/go.mod h1:8d4pf8vYu665/kUbsxWAQ/JDBNWqfFeZnvFiVdmx89U= -k8s.io/code-generator v0.30.3 h1:bmtnLJKagDS5f5uOEpLyJiDfIMKXGMKgOLBdde+w0Mc= -k8s.io/code-generator v0.30.3/go.mod h1:PFgBiv+miFV7TZYp+RXgROkhA+sWYZ+mtpbMLofMke8= -k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo= -k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 10d9d2508..851bb7f41 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -28,7 +28,7 @@ echo ">> Temporary output directory ${TEMP_DIR}" # Ensure we can execute. chmod +x ${CODEGEN_PKG}/kube_codegen.sh -PACKAGE_PATH_BASE="github.com/fluent/fluent-operator/v2" +PACKAGE_PATH_BASE="github.com/fluent/fluent-operator/v3" mkdir -p "${TEMP_DIR}/${PACKAGE_PATH_BASE}/apis/fluentbit" \ "${TEMP_DIR}/${PACKAGE_PATH_BASE}/apis/fluentd" \ diff --git a/pkg/fluentd/router/pluginstore.go b/pkg/fluentd/router/pluginstore.go index c5cf861d6..6e8e792dd 100644 --- a/pkg/fluentd/router/pluginstore.go +++ b/pkg/fluentd/router/pluginstore.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params" + "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins/params" ) type RouterCommon struct { diff --git a/pkg/operator/collector-service.go b/pkg/operator/collector-service.go index 842eac5ec..ffcddbd4a 100644 --- a/pkg/operator/collector-service.go +++ b/pkg/operator/collector-service.go @@ -1,7 +1,7 @@ package operator import ( - fluentbitv1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + fluentbitv1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/operator/collector-statefulset.go b/pkg/operator/collector-statefulset.go index 03227da1e..4f1cf7d29 100644 --- a/pkg/operator/collector-statefulset.go +++ b/pkg/operator/collector-statefulset.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - fluentbitv1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + fluentbitv1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" ) var ( diff --git a/pkg/operator/daemonset.go b/pkg/operator/daemonset.go index 7b0784259..6c7fa63f3 100644 --- a/pkg/operator/daemonset.go +++ b/pkg/operator/daemonset.go @@ -3,7 +3,7 @@ package operator import ( "fmt" - fluentbitv1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + fluentbitv1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/operator/fluent-bit-service.go b/pkg/operator/fluent-bit-service.go index 40890c498..6a3d8598e 100644 --- a/pkg/operator/fluent-bit-service.go +++ b/pkg/operator/fluent-bit-service.go @@ -1,7 +1,7 @@ package operator import ( - fluentbitv1alpha2 "github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2" + fluentbitv1alpha2 "github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/operator/fluentd-daemonset.go b/pkg/operator/fluentd-daemonset.go index 41fd1ae18..50018459f 100644 --- a/pkg/operator/fluentd-daemonset.go +++ b/pkg/operator/fluentd-daemonset.go @@ -7,7 +7,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" ) func MakeFluentdDaemonSet(fd fluentdv1alpha1.Fluentd) *appsv1.DaemonSet { diff --git a/pkg/operator/fluentd-service.go b/pkg/operator/fluentd-service.go index b364c7a42..4c622acf3 100644 --- a/pkg/operator/fluentd-service.go +++ b/pkg/operator/fluentd-service.go @@ -5,7 +5,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" ) const ( diff --git a/pkg/operator/pvc.go b/pkg/operator/pvc.go index 89c3490c2..49906bb86 100644 --- a/pkg/operator/pvc.go +++ b/pkg/operator/pvc.go @@ -7,7 +7,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" ) func MakeFluentdPVC(fd fluentdv1alpha1.Fluentd) *corev1.PersistentVolumeClaim { diff --git a/pkg/operator/sts.go b/pkg/operator/sts.go index 750ca6d86..676b1f72e 100644 --- a/pkg/operator/sts.go +++ b/pkg/operator/sts.go @@ -7,7 +7,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" ) const ( diff --git a/tests/e2e/fluentd/cfgrender_suite_test.go b/tests/e2e/fluentd/cfgrender_suite_test.go index 555f9686d..09295caee 100644 --- a/tests/e2e/fluentd/cfgrender_suite_test.go +++ b/tests/e2e/fluentd/cfgrender_suite_test.go @@ -13,7 +13,7 @@ import ( "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/client" - fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1" + fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1" ) var k8sClient client.Client diff --git a/tests/e2e/fluentd/cfgrender_test.go b/tests/e2e/fluentd/cfgrender_test.go index 29d64dca3..2304427ca 100644 --- a/tests/e2e/fluentd/cfgrender_test.go +++ b/tests/e2e/fluentd/cfgrender_test.go @@ -12,8 +12,8 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - fluentdtestcases "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/tests" - "github.com/fluent/fluent-operator/v2/tests/utils" + fluentdtestcases "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/tests" + "github.com/fluent/fluent-operator/v3/tests/utils" ) const (