fluentbit supports nodeSelector

Signed-off-by: huanggze <[email protected]>

Author: huanggze

api/v1alpha2/fluentbit_types.go

@@ -34,6 +34,8 @@ type FluentBitSpec struct {
 	PositionDB corev1.VolumeSource `json:"positionDB,omitempty"`
 	// Container log path
 	ContainerLogRealPath string `json:"containerLogRealPath,omitempty"`
+	// NodeSelector
+	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
 	// Tolerations
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
 	// Fluentbitconfig object associated with this Fluentbit

api/v1alpha2/zz_generated.deepcopy.go

@@ -46,6 +46,11 @@ spec:
             imagePullPolicy:
               description: Fluent Bit image pull policy.
               type: string
+            nodeSelector:
+              additionalProperties:
+                type: string
+              description: NodeSelector
+              type: object
             positionDB:
               description: Storage for position db. You will use it if tail input
                 is enabled.

config/crd/bases/logging.kubesphere.io_fluentbits.yaml

@@ -137,6 +137,7 @@ FluentBitSpec defines the desired state of FluentBit
 | imagePullPolicy | Fluent Bit image pull policy. | corev1.PullPolicy |
 | positionDB | Storage for position db. You will use it if tail input is enabled. | [corev1.VolumeSource](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#volume-v1-core) |
 | containerLogRealPath | Container log path | string |
+| nodeSelector | NodeSelector | map[string]string |
 | tolerations | Tolerations | [][corev1.Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#toleration-v1-core) |
 | fluentBitConfigName | Fluentbitconfig object associated with this Fluentbit | string |
 | secrets | The Secrets are mounted into /fluent-bit/secrets/<secret-name>. | []string |

docs/crd.md

@@ -7,6 +7,7 @@ require (
 	github.com/go-logr/logr v0.1.0
 	github.com/go-openapi/errors v0.19.2
 	github.com/joho/godotenv v1.3.0
+	github.com/json-iterator/go v1.1.8
 	github.com/oklog/run v1.1.0
 	github.com/onsi/ginkgo v1.10.3
 	github.com/onsi/gomega v1.7.1
@@ -15,5 +16,6 @@ require (
 	k8s.io/api v0.17.2
 	k8s.io/apimachinery v0.17.2
 	k8s.io/client-go v0.16.4
+	k8s.io/klog v1.0.0
 	sigs.k8s.io/controller-runtime v0.4.0
 )

go.mod

@@ -44,6 +44,11 @@ spec:
             imagePullPolicy:
               description: Fluent Bit image pull policy.
               type: string
+            nodeSelector:
+              additionalProperties:
+                type: string
+              description: NodeSelector
+              type: object
             positionDB:
               description: Storage for position db. You will use it if tail input
                 is enabled.

manifests/setup/fluentbit-operator-fluentbitCustomResourceDefinition.yaml

@@ -127,7 +127,8 @@ func MakeDaemonSet(fb v1alpha2.FluentBit, logPath string) appsv1.DaemonSet {
 							},
 						},
 					},
-					Tolerations: fb.Spec.Tolerations,
+					NodeSelector: fb.Spec.NodeSelector,
+					Tolerations:  fb.Spec.Tolerations,
 				},
 			},
 		},