fix comment, fix pvc, fix fluentbit env variable

Signed-off-by: zhu733756 <zhu733756@kubesphere.io>
fluent · Feb 10, 2022 · 535716d · 535716d
1 parent 8d48fe3
commit 535716d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 50 deletions.
diff --git a/cmd/fluent-manager/main.go b/cmd/fluent-manager/main.go
@@ -73,7 +73,7 @@ func main() {
 	opts.BindFlags(flag.CommandLine)
 	flag.Parse()
 
-	if envs, err := godotenv.Read("/fluentbit-operator/fluent-bit.env"); err == nil {
+	if envs, err := godotenv.Read("/fluent-operator/fluent-bit.env"); err == nil {
 		logPath = envs["CONTAINER_ROOT_DIR"] + "/containers"
 	}
 

diff --git a/controllers/fluent_controller_finalizer.go b/controllers/fluent_controller_finalizer.go
@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"context"
-	"fmt"
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -69,20 +68,10 @@ func (r *FluentdReconciler) delete(ctx context.Context, fd *fluentdv1alpha1.Flue
 		return err
 	}
 
-	var dp appsv1.Deployment
-	err = r.Get(ctx, client.ObjectKey{Namespace: fd.Namespace, Name: fd.Name}, &dp)
+	var sts appsv1.StatefulSet
+	err = r.Get(ctx, client.ObjectKey{Namespace: fd.Namespace, Name: fd.Name}, &sts)
 	if err == nil {
-		if err := r.Delete(ctx, &dp); err != nil && !errors.IsNotFound(err) {
-			return err
-		}
-	} else if !errors.IsNotFound(err) {
-		return err
-	}
-
-	var pvc corev1.PersistentVolumeClaim
-	err = r.Get(ctx, client.ObjectKey{Namespace: fd.Namespace, Name: fmt.Sprintf("%s-buffer-pvc", fd.Name)}, &pvc)
-	if err == nil {
-		if err := r.Delete(ctx, &pvc); err != nil && !errors.IsNotFound(err) {
+		if err := r.Delete(ctx, &sts); err != nil && !errors.IsNotFound(err) {
 			return err
 		}
 	} else if !errors.IsNotFound(err) {
@@ -94,29 +83,12 @@ func (r *FluentdReconciler) delete(ctx context.Context, fd *fluentdv1alpha1.Flue
 
 func (r *FluentdReconciler) mutate(obj client.Object, fd *fluentdv1alpha1.Fluentd) controllerutil.MutateFn {
 	switch o := obj.(type) {
-	case *corev1.PersistentVolumeClaim:
-		expected := operator.MakeFluentdPVC(*fd)
-
-		return func() error {
-			o.Labels = expected.Labels
-			o.Spec.AccessModes = expected.Spec.AccessModes
-			o.Spec.Resources = expected.Spec.Resources
-			o.Spec.VolumeMode = expected.Spec.VolumeMode
-			o.SetOwnerReferences(nil)
-			if err := ctrl.SetControllerReference(fd, o, r.Scheme); err != nil {
-				return err
-			}
-			return nil
-		}
 	case *appsv1.StatefulSet:
 		expected := operator.MakeStatefulset(*fd)
 
 		return func() error {
 			o.Labels = expected.Labels
-			o.Spec.Replicas = expected.Spec.Replicas
-			o.Spec.Template = expected.Spec.Template
-			o.Spec.UpdateStrategy = expected.Spec.UpdateStrategy
-			o.Spec.VolumeClaimTemplates = expected.Spec.VolumeClaimTemplates
+			o.Spec = expected.Spec
 			o.SetOwnerReferences(nil)
 			if err := ctrl.SetControllerReference(fd, o, r.Scheme); err != nil {
 				return err

diff --git a/controllers/fluentd_controller.go b/controllers/fluentd_controller.go
@@ -107,20 +107,7 @@ func (r *FluentdReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		return ctrl.Result{}, err
 	}
 
-	// Deploy pvc
-	// if not given a definition of buffer, will return default buffer configuration.
-	if fd.Spec.BufferVolume == nil || (!fd.Spec.BufferVolume.DisableBufferVolume && fd.Spec.BufferVolume.PersistentVolumeClaim != nil) {
-		bufferpvc := operator.MakeFluentdPVC(fd)
-		if err := ctrl.SetControllerReference(&fd, &bufferpvc, r.Scheme); err != nil {
-			return ctrl.Result{}, err
-		}
-
-		if _, err := controllerutil.CreateOrPatch(ctx, r.Client, &bufferpvc, r.mutate(&bufferpvc, &fd)); err != nil {
-			return ctrl.Result{}, err
-		}
-	}
-
-	// Deploy Fluentd Deployment
+	// Deploy Fluentd Statefulset
 	dp := operator.MakeStatefulset(fd)
 	if err := ctrl.SetControllerReference(&fd, &dp, r.Scheme); err != nil {
 		return ctrl.Result{}, err
@@ -199,6 +186,5 @@ func (r *FluentdReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&corev1.ServiceAccount{}).
 		Owns(&appsv1.StatefulSet{}).
 		Owns(&corev1.Service{}).
-		Owns(&corev1.PersistentVolumeClaim{}).
 		Complete(r)
 }
diff --git a/manifests/setup/fluent-operator-clusterRole.yaml b/manifests/setup/fluent-operator-clusterRole.yaml
@@ -33,7 +33,6 @@ rules:
       - serviceaccounts
       - configmaps
       - services
-      - persistentvolumeclaims
     verbs:
       - create
       - delete

diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
@@ -11020,7 +11020,6 @@ rules:
   - serviceaccounts
   - configmaps
   - services
-  - persistentvolumeclaims
   verbs:
   - create
   - delete