Merge pull request #186 from wenchajun/svc

 use k8s master URL instead of `kubernetes.default.svc `

Author: benjaminhuo

api/fluentbitoperator/v1alpha2/fluentbit_types.go

@@ -55,6 +55,10 @@ type FluentBitSpec struct {
 	RuntimeClassName string `json:"runtimeClassName,omitempty"`
 	// PriorityClassName represents the pod's priority class.
 	PriorityClassName string `json:"priorityClassName,omitempty"`
+	// List of volumes that can be mounted by containers belonging to the pod.
+	Volumes []corev1.Volume `json:"volumes,omitempty"`
+	// Pod volumes to mount into the container's filesystem.
+	VolumesMounts []corev1.VolumeMount `json:"volumesMounts,omitempty"`
 }
 
 // FluentBitStatus defines the observed state of FluentBit

api/fluentbitoperator/v1alpha2/plugins/output/kafka_types.go

@@ -35,13 +35,13 @@ type Kafka struct {
 	// {property} can be any librdkafka properties
 	Rdkafka map[string]string `json:"rdkafka,omitempty"`
 	//adds unknown topics (found in Topic_Key) to Topics. So in Topics only a default topic needs to be configured
-	DynamicTopic   *bool `json:"dynamicTopic,omitempty"`
+	DynamicTopic *bool `json:"dynamicTopic,omitempty"`
 	//Fluent Bit queues data into rdkafka library,
 	//if for some reason the underlying library cannot flush the records the queue might fills up blocking new addition of records.
 	//The queue_full_retries option set the number of local retries to enqueue the data.
 	//The default value is 10 times, the interval between each retry is 1 second.
 	//Setting the queue_full_retries value to 0 set's an unlimited number of retries.
-	QueueFullRetries *int64  `json:"queueFullRetries,omitempty"`
+	QueueFullRetries *int64 `json:"queueFullRetries,omitempty"`
 }
 
 func (*Kafka) Name() string {

api/fluentbitoperator/v1alpha2/zz_generated.deepcopy.go

@@ -164,7 +164,7 @@ func MakeDaemonSet(fb v1alpha2.FluentBit, logPath string) appsv1.DaemonSet {
 								},
 							},
 							Env: []corev1.EnvVar{
-								corev1.EnvVar{
+								{
 									Name: "NODE_NAME",
 									ValueFrom: &corev1.EnvVarSource{
 										FieldRef: &corev1.ObjectFieldSelector{
@@ -214,6 +214,13 @@ func MakeDaemonSet(fb v1alpha2.FluentBit, logPath string) appsv1.DaemonSet {
 		ds.Spec.Template.Spec.PriorityClassName = fb.Spec.PriorityClassName
 	}
 
+	if fb.Spec.Volumes != nil {
+		ds.Spec.Template.Spec.Volumes = append(ds.Spec.Template.Spec.Volumes, fb.Spec.Volumes...)
+	}
+	if fb.Spec.VolumesMounts != nil {
+		ds.Spec.Template.Spec.Containers[0].VolumeMounts = append(ds.Spec.Template.Spec.Containers[0].VolumeMounts, fb.Spec.VolumesMounts...)
+	}
+
 	// Mount Position DB
 	if fb.Spec.PositionDB != (corev1.VolumeSource{}) {
 		ds.Spec.Template.Spec.Volumes = append(ds.Spec.Template.Spec.Volumes, corev1.Volume{