diff --git a/pkg/operation/botanist/component/fluentoperator/doc.go b/pkg/operation/botanist/component/fluentoperator/doc.go deleted file mode 100644 index 44cbfe01ee86..000000000000 --- a/pkg/operation/botanist/component/fluentoperator/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 2022 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package fluentoperator - -// TODO(Kristian-ZH): Remove this when the fluent operator is deployed -import ( - _ "github.com/fluent/fluent-operator/apis/fluentbit/v1alpha2" -) diff --git a/pkg/operation/botanist/component/fluentoperator/assets/crd-fluentbit.fluent.io_clusterfilters.yaml b/pkg/operation/botanist/component/logging/fluentoperator/assets/crd-fluentbit.fluent.io_clusterfilters.yaml similarity index 100% rename from pkg/operation/botanist/component/fluentoperator/assets/crd-fluentbit.fluent.io_clusterfilters.yaml rename to pkg/operation/botanist/component/logging/fluentoperator/assets/crd-fluentbit.fluent.io_clusterfilters.yaml diff --git a/pkg/operation/botanist/component/fluentoperator/assets/crd-fluentbit.fluent.io_clusterfluentbitconfigs.yaml b/pkg/operation/botanist/component/logging/fluentoperator/assets/crd-fluentbit.fluent.io_clusterfluentbitconfigs.yaml similarity index 100% rename from pkg/operation/botanist/component/fluentoperator/assets/crd-fluentbit.fluent.io_clusterfluentbitconfigs.yaml rename to pkg/operation/botanist/component/logging/fluentoperator/assets/crd-fluentbit.fluent.io_clusterfluentbitconfigs.yaml diff --git a/pkg/operation/botanist/component/fluentoperator/assets/crd-fluentbit.fluent.io_clusterinputs.yaml b/pkg/operation/botanist/component/logging/fluentoperator/assets/crd-fluentbit.fluent.io_clusterinputs.yaml similarity index 100% rename from pkg/operation/botanist/component/fluentoperator/assets/crd-fluentbit.fluent.io_clusterinputs.yaml rename to pkg/operation/botanist/component/logging/fluentoperator/assets/crd-fluentbit.fluent.io_clusterinputs.yaml diff --git a/pkg/operation/botanist/component/fluentoperator/assets/crd-fluentbit.fluent.io_clusteroutputs.yaml b/pkg/operation/botanist/component/logging/fluentoperator/assets/crd-fluentbit.fluent.io_clusteroutputs.yaml similarity index 100% rename from pkg/operation/botanist/component/fluentoperator/assets/crd-fluentbit.fluent.io_clusteroutputs.yaml rename to pkg/operation/botanist/component/logging/fluentoperator/assets/crd-fluentbit.fluent.io_clusteroutputs.yaml diff --git a/pkg/operation/botanist/component/fluentoperator/assets/crd-fluentbit.fluent.io_clusterparsers.yaml b/pkg/operation/botanist/component/logging/fluentoperator/assets/crd-fluentbit.fluent.io_clusterparsers.yaml similarity index 100% rename from pkg/operation/botanist/component/fluentoperator/assets/crd-fluentbit.fluent.io_clusterparsers.yaml rename to pkg/operation/botanist/component/logging/fluentoperator/assets/crd-fluentbit.fluent.io_clusterparsers.yaml diff --git a/pkg/operation/botanist/component/fluentoperator/assets/crd-fluentbit.fluent.io_fluentbits.yaml b/pkg/operation/botanist/component/logging/fluentoperator/assets/crd-fluentbit.fluent.io_fluentbits.yaml similarity index 100% rename from pkg/operation/botanist/component/fluentoperator/assets/crd-fluentbit.fluent.io_fluentbits.yaml rename to pkg/operation/botanist/component/logging/fluentoperator/assets/crd-fluentbit.fluent.io_fluentbits.yaml diff --git a/pkg/operation/botanist/component/fluentoperator/assets/doc.go b/pkg/operation/botanist/component/logging/fluentoperator/assets/doc.go similarity index 90% rename from pkg/operation/botanist/component/fluentoperator/assets/doc.go rename to pkg/operation/botanist/component/logging/fluentoperator/assets/doc.go index b19363dd4e31..79ab74f203b3 100644 --- a/pkg/operation/botanist/component/fluentoperator/assets/doc.go +++ b/pkg/operation/botanist/component/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/pkg/operation/botanist/component/fluentoperator/crds.go b/pkg/operation/botanist/component/logging/fluentoperator/crds.go similarity index 89% rename from pkg/operation/botanist/component/fluentoperator/crds.go rename to pkg/operation/botanist/component/logging/fluentoperator/crds.go index ceeb0dabd3e1..699f027af0a0 100644 --- a/pkg/operation/botanist/component/fluentoperator/crds.go +++ b/pkg/operation/botanist/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/pkg/operation/botanist/component/fluentoperator/crds_test.go b/pkg/operation/botanist/component/logging/fluentoperator/crds_test.go similarity index 99% rename from pkg/operation/botanist/component/fluentoperator/crds_test.go rename to pkg/operation/botanist/component/logging/fluentoperator/crds_test.go index c0f3d8b05785..8418329219c7 100644 --- a/pkg/operation/botanist/component/fluentoperator/crds_test.go +++ b/pkg/operation/botanist/component/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/pkg/operation/botanist/component/fluentoperator/fluentoperator_suite_test.go b/pkg/operation/botanist/component/logging/fluentoperator/fluentoperator_suite_test.go similarity index 100% rename from pkg/operation/botanist/component/fluentoperator/fluentoperator_suite_test.go rename to pkg/operation/botanist/component/logging/fluentoperator/fluentoperator_suite_test.go