fluentbit: fix path for the FluentbitAgent resource, which fixes generated crds

Signed-off-by: Peter Wilcsinszky <[email protected]>

Author: pepov

config/crd/bases/logging.banzaicloud.io_fluentbits.yaml renamed to config/crd/bases/logging.banzaicloud.io_fluentbitagents.yaml

@@ -6,15 +6,15 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.6.0
   creationTimestamp: null
-  name: fluentbits.logging.banzaicloud.io
+  name: fluentbitagents.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io
   names:
     categories:
     - logging-all
     kind: FluentbitAgent
     listKind: FluentbitAgentList
-    plural: fluentbits
+    plural: fluentbitagents
     singular: fluentbitagent
   scope: Cluster
   versions:

e2e/charts/logging-operator/crds/logging.banzaicloud.io_fluentbits.yaml renamed to e2e/charts/logging-operator/crds/logging.banzaicloud.io_fluentbitagents.yaml

@@ -6,15 +6,15 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.6.0
   creationTimestamp: null
-  name: fluentbits.logging.banzaicloud.io
+  name: fluentbitagents.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io
   names:
     categories:
     - logging-all
     kind: FluentbitAgent
     listKind: FluentbitAgentList
-    plural: fluentbits
+    plural: fluentbitagents
     singular: fluentbitagent
   scope: Cluster
   versions:

pkg/sdk/logging/api/v1beta1/fluentbit_types.go

@@ -39,7 +39,7 @@ type _metaFluentbitSpec interface{} //nolint:deadcode,unused
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:path=fluentbits,scope=Cluster,categories=logging-all
+// +kubebuilder:resource:path=fluentbitagents,scope=Cluster,categories=logging-all
 // +kubebuilder:storageversion
 
 // FluentbitAgent is the Schema for the loggings API

pkg/sdk/resourcebuilder/component.go

@@ -23,12 +23,6 @@ import (
 	"github.com/cisco-open/operator-tools/pkg/reconciler"
 	"github.com/cisco-open/operator-tools/pkg/types"
 	"github.com/cisco-open/operator-tools/pkg/utils"
-	extensionsv1alpha1 "github.com/kube-logging/logging-operator/pkg/sdk/extensions/api/v1alpha1"
-	extensionsconfig "github.com/kube-logging/logging-operator/pkg/sdk/extensions/extensionsconfig"
-	"github.com/kube-logging/logging-operator/pkg/sdk/logging/api/v1beta1"
-	loggingv1beta1 "github.com/kube-logging/logging-operator/pkg/sdk/logging/api/v1beta1"
-	"github.com/kube-logging/logging-operator/pkg/sdk/static/gen/crds"
-	"github.com/kube-logging/logging-operator/pkg/sdk/static/gen/rbac"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	admissionregistration "k8s.io/api/admissionregistration/v1"
 	appsv1 "k8s.io/api/apps/v1"
@@ -48,6 +42,13 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+
+	extensionsv1alpha1 "github.com/kube-logging/logging-operator/pkg/sdk/extensions/api/v1alpha1"
+	extensionsconfig "github.com/kube-logging/logging-operator/pkg/sdk/extensions/extensionsconfig"
+	"github.com/kube-logging/logging-operator/pkg/sdk/logging/api/v1beta1"
+	loggingv1beta1 "github.com/kube-logging/logging-operator/pkg/sdk/logging/api/v1beta1"
+	"github.com/kube-logging/logging-operator/pkg/sdk/static/gen/crds"
+	"github.com/kube-logging/logging-operator/pkg/sdk/static/gen/rbac"
 )
 
 const (
@@ -151,6 +152,9 @@ func AppendCRDResourceBuilders(rbs []reconciler.ResourceBuilder, modifiers ...CR
 		func() (runtime.Object, reconciler.DesiredState, error) {
 			return CRD(loggingv1beta1.GroupVersion.Group, "nodeagents", modifiers...)
 		},
+		func() (runtime.Object, reconciler.DesiredState, error) {
+			return CRD(loggingv1beta1.GroupVersion.Group, "fluentbitagents", modifiers...)
+		},
 		func() (runtime.Object, reconciler.DesiredState, error) {
 			return CRD(extensionsv1alpha1.GroupVersion.Group, "hosttailers", modifiers...)
 		},