Move the existing fluent-operator under the logging component

Kristian-ZH · Mar 16, 2023 · 9dcab83 · 9dcab83
1 parent d36d894
commit 9dcab83
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 32 deletions.
diff --git a/pkg/operation/botanist/component/fluentoperator/doc.go b/pkg/operation/botanist/component/fluentoperator/doc.go
diff --git a/...d-fluentbit.fluent.io_clusterfilters.yaml → ...d-fluentbit.fluent.io_clusterfilters.yaml b/...d-fluentbit.fluent.io_clusterfilters.yaml → ...d-fluentbit.fluent.io_clusterfilters.yaml
diff --git a/...it.fluent.io_clusterfluentbitconfigs.yaml → ...it.fluent.io_clusterfluentbitconfigs.yaml b/...it.fluent.io_clusterfluentbitconfigs.yaml → ...it.fluent.io_clusterfluentbitconfigs.yaml
diff --git a/...rd-fluentbit.fluent.io_clusterinputs.yaml → ...rd-fluentbit.fluent.io_clusterinputs.yaml b/...rd-fluentbit.fluent.io_clusterinputs.yaml → ...rd-fluentbit.fluent.io_clusterinputs.yaml
diff --git a/...d-fluentbit.fluent.io_clusteroutputs.yaml → ...d-fluentbit.fluent.io_clusteroutputs.yaml b/...d-fluentbit.fluent.io_clusteroutputs.yaml → ...d-fluentbit.fluent.io_clusteroutputs.yaml
diff --git a/...d-fluentbit.fluent.io_clusterparsers.yaml → ...d-fluentbit.fluent.io_clusterparsers.yaml b/...d-fluentbit.fluent.io_clusterparsers.yaml → ...d-fluentbit.fluent.io_clusterparsers.yaml
diff --git a/...s/crd-fluentbit.fluent.io_fluentbits.yaml → ...s/crd-fluentbit.fluent.io_fluentbits.yaml b/...s/crd-fluentbit.fluent.io_fluentbits.yaml → ...s/crd-fluentbit.fluent.io_fluentbits.yaml
diff --git a/...st/component/fluentoperator/assets/doc.go → ...nent/logging/fluentoperator/assets/doc.go b/...st/component/fluentoperator/assets/doc.go → ...nent/logging/fluentoperator/assets/doc.go
@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:generate ../../../../../../hack/generate-crds.sh crd- fluentbit.fluent.io
+//go:generate ../../../../../../../hack/generate-crds.sh crd- fluentbit.fluent.io
 
 package assets
diff --git a/...botanist/component/fluentoperator/crds.go → .../component/logging/fluentoperator/crds.go b/...botanist/component/fluentoperator/crds.go → .../component/logging/fluentoperator/crds.go
@@ -27,15 +27,15 @@ import (
 
 var (
 	//go:embed assets/crd-fluentbit.fluent.io_clusterfilters.yaml
-	clusterFilterCRD string
+	fluentBitClusterFilterCRD string
 	//go:embed assets/crd-fluentbit.fluent.io_clusterfluentbitconfigs.yaml
-	clusterFBConfigCRD string
+	fluentBitClusterFBConfigCRD string
 	//go:embed assets/crd-fluentbit.fluent.io_clusterinputs.yaml
-	clusterInputCRD string
+	fluentBitClusterInputCRD string
 	//go:embed assets/crd-fluentbit.fluent.io_clusteroutputs.yaml
-	clusterOutputCRD string
+	fluentBitClusterOutputCRD string
 	//go:embed assets/crd-fluentbit.fluent.io_clusterparsers.yaml
-	clusterParserCRD string
+	fluentBitClusterParserCRD string
 	//go:embed assets/crd-fluentbit.fluent.io_fluentbits.yaml
 	fluentBitCRD string
 
@@ -44,11 +44,11 @@ var (
 
 func init() {
 	resources = append(resources,
-		clusterFilterCRD,
-		clusterFBConfigCRD,
-		clusterInputCRD,
-		clusterOutputCRD,
-		clusterParserCRD,
+		fluentBitClusterFilterCRD,
+		fluentBitClusterFBConfigCRD,
+		fluentBitClusterInputCRD,
+		fluentBitClusterOutputCRD,
+		fluentBitClusterParserCRD,
 		fluentBitCRD,
 	)
 }

diff --git a/...ist/component/fluentoperator/crds_test.go → ...onent/logging/fluentoperator/crds_test.go b/...ist/component/fluentoperator/crds_test.go → ...onent/logging/fluentoperator/crds_test.go
@@ -29,7 +29,7 @@ import (
 
 	"github.com/gardener/gardener/pkg/client/kubernetes"
 	"github.com/gardener/gardener/pkg/operation/botanist/component"
-	"github.com/gardener/gardener/pkg/operation/botanist/component/fluentoperator"
+	"github.com/gardener/gardener/pkg/operation/botanist/component/logging/fluentoperator"
 	. "github.com/gardener/gardener/pkg/utils/test/matchers"
 )
 

diff --git a/...uentoperator/fluentoperator_suite_test.go → ...uentoperator/fluentoperator_suite_test.go b/...uentoperator/fluentoperator_suite_test.go → ...uentoperator/fluentoperator_suite_test.go