Skip to content

Commit

Permalink
delete the WASM file mounting in Fluent Bit DaemonSet
Browse files Browse the repository at this point in the history
Signed-off-by: jiuxia211 <[email protected]>
  • Loading branch information
jiuxia211 committed Aug 29, 2024
1 parent e2937c3 commit 7246834
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 7,056 deletions.
2 changes: 0 additions & 2 deletions apis/fluentbit/v1alpha2/fluentbit_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@ type FluentBitSpec struct {
SchedulerName string `json:"schedulerName,omitempty"`
// Optional duration in seconds the pod needs to terminate gracefully. Value must be non-negative integer.
TerminationGracePeriodSeconds *int64 `json:"terminationGracePeriodSeconds,omitempty"`
// Storage for wasm file. You will use it if wasm filter is enabled.
WasmFile corev1.VolumeSource `json:"wasmFile,omitempty"`
}

// FluentBitService defines the service of the FluentBit
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions apis/fluentbit/v1alpha2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,9 @@ spec:
accessiblePaths:
description: Specify the whitelist of paths to be able to
access paths from WASM programs.
type: string
items:
type: string
type: array
alias:
description: Alias for the plugin
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,9 @@ spec:
accessiblePaths:
description: Specify the whitelist of paths to be able to
access paths from WASM programs.
type: string
items:
type: string
type: array
alias:
description: Alias for the plugin
type: string
Expand Down

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion config/crd/bases/fluentbit.fluent.io_clusterfilters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,9 @@ spec:
accessiblePaths:
description: Specify the whitelist of paths to be able to
access paths from WASM programs.
type: string
items:
type: string
type: array
alias:
description: Alias for the plugin
type: string
Expand Down
4 changes: 3 additions & 1 deletion config/crd/bases/fluentbit.fluent.io_filters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,9 @@ spec:
accessiblePaths:
description: Specify the whitelist of paths to be able to
access paths from WASM programs.
type: string
items:
type: string
type: array
alias:
description: Alias for the plugin
type: string
Expand Down
1,758 changes: 0 additions & 1,758 deletions config/crd/bases/fluentbit.fluent.io_fluentbits.yaml

Large diffs are not rendered by default.

1,766 changes: 6 additions & 1,760 deletions manifests/setup/fluent-operator-crd.yaml

Large diffs are not rendered by default.

1,766 changes: 6 additions & 1,760 deletions manifests/setup/setup.yaml

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions pkg/operator/daemonset.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,18 +142,6 @@ func MakeDaemonSet(fb fluentbitv1alpha2.FluentBit, logPath string) *appsv1.Daemo
MountPath: "/fluent-bit/tail",
})
}

// Mount Wasm Filter
if fb.Spec.WasmFile != (corev1.VolumeSource{}) {
ds.Spec.Template.Spec.Volumes = append(ds.Spec.Template.Spec.Volumes, corev1.Volume{
Name: "wasm",
VolumeSource: fb.Spec.WasmFile,
})
ds.Spec.Template.Spec.Containers[0].VolumeMounts = append(ds.Spec.Template.Spec.Containers[0].VolumeMounts, corev1.VolumeMount{
Name: "wasm",
MountPath: "/fluent-bit/wasm",
})
}
// Mount Secrets
for _, secret := range fb.Spec.Secrets {
ds.Spec.Template.Spec.Volumes = append(ds.Spec.Template.Spec.Volumes, corev1.Volume{
Expand Down

0 comments on commit 7246834

Please sign in to comment.