Skip to content

Commit d7d1c03

Browse files
zhu733756zhu733756
committed
fix and add manifests
Signed-off-by: zhu733756 <[email protected]>
1 parent 1d5a484 commit d7d1c03

File tree

146 files changed

+23594
-8924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+23594
-8924
lines changed

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -226,21 +226,21 @@ Fluent Bit comes with a built-in HTTP Server. According to the official [documen
226226
When you use the kubesphere/fluentbit-operator, You can enable this from `FluentBitConfig` manifest. Example is below:
227227

228228
```yaml
229-
apiVersion: logging.kubesphere.io/v1alpha2
229+
apiVersion: fluentbit.fluent.io/v1alpha2
230230
kind: FluentBitConfig
231231
metadata:
232232
name: fluent-bit-config
233233
namespace: logging-system
234234
spec:
235235
filterSelector:
236236
matchLabels:
237-
logging.kubesphere.io/enabled: 'true'
237+
fluentbit.fluent.io/enabled: 'true'
238238
inputSelector:
239239
matchLabels:
240-
logging.kubesphere.io/enabled: 'true'
240+
fluentbit.fluent.io/enabled: 'true'
241241
outputSelector:
242242
matchLabels:
243-
logging.kubesphere.io/enabled: 'true'
243+
fluentbit.fluent.io/enabled: 'true'
244244
service:
245245
httpListen: 0.0.0.0
246246
httpPort: 2020

‎charts/fluentbit-operator/crds/logging.kubesphere.io_filter.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ kind: CustomResourceDefinition
55
metadata:
66
annotations:
77
controller-gen.kubebuilder.io/version: v0.4.1
8-
name: filters.logging.kubesphere.io
8+
name: filters.fluentbit.fluent.io
99
spec:
10-
group: logging.kubesphere.io
10+
group: fluentbit.fluent.io
1111
names:
1212
kind: Filter
1313
listKind: FilterList

‎charts/fluentbit-operator/crds/logging.kubesphere.io_fluentbit.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ kind: CustomResourceDefinition
55
metadata:
66
annotations:
77
controller-gen.kubebuilder.io/version: v0.4.1
8-
name: fluentbits.logging.kubesphere.io
8+
name: fluentbits.fluentbit.fluent.io
99
spec:
10-
group: logging.kubesphere.io
10+
group: fluentbit.fluent.io
1111
names:
1212
kind: FluentBit
1313
listKind: FluentBitList

‎charts/fluentbit-operator/crds/logging.kubesphere.io_fluentbitconfig.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ kind: CustomResourceDefinition
55
metadata:
66
annotations:
77
controller-gen.kubebuilder.io/version: v0.4.1
8-
name: fluentbitconfigs.logging.kubesphere.io
8+
name: fluentbitconfigs.fluentbit.fluent.io
99
spec:
10-
group: logging.kubesphere.io
10+
group: fluentbit.fluent.io
1111
names:
1212
kind: FluentBitConfig
1313
listKind: FluentBitConfigList

‎charts/fluentbit-operator/crds/logging.kubesphere.io_input.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ kind: CustomResourceDefinition
55
metadata:
66
annotations:
77
controller-gen.kubebuilder.io/version: v0.4.1
8-
name: inputs.logging.kubesphere.io
8+
name: inputs.fluentbit.fluent.io
99
spec:
10-
group: logging.kubesphere.io
10+
group: fluentbit.fluent.io
1111
names:
1212
kind: Input
1313
listKind: InputList

‎charts/fluentbit-operator/crds/logging.kubesphere.io_output.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ kind: CustomResourceDefinition
55
metadata:
66
annotations:
77
controller-gen.kubebuilder.io/version: v0.4.1
8-
name: outputs.logging.kubesphere.io
8+
name: outputs.fluentbit.fluent.io
99
spec:
10-
group: logging.kubesphere.io
10+
group: fluentbit.fluent.io
1111
names:
1212
kind: Output
1313
listKind: OutputList

‎charts/fluentbit-operator/crds/logging.kubesphere.io_parser.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ kind: CustomResourceDefinition
55
metadata:
66
annotations:
77
controller-gen.kubebuilder.io/version: v0.4.1
8-
name: parsers.logging.kubesphere.io
8+
name: parsers.fluentbit.fluent.io
99
spec:
10-
group: logging.kubesphere.io
10+
group: fluentbit.fluent.io
1111
names:
1212
kind: Parser
1313
listKind: ParserList

‎charts/fluentbit-operator/templates/filter-containerd.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{{- if .Values.Kubernetes -}}
2-
apiVersion: logging.kubesphere.io/v1alpha2
2+
apiVersion: fluentbit.fluent.io/v1alpha2
33
kind: Filter
44
metadata:
55
name: containerd
66
labels:
7-
logging.kubesphere.io/enabled: "true"
8-
logging.kubesphere.io/component: logging
7+
fluentbit.fluent.io/enabled: "true"
8+
fluentbit.fluent.io/component: logging
99
spec:
1010
match: kube.*
1111
filters:

‎charts/fluentbit-operator/templates/filter-kubernetes.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{{- if .Values.Kubernetes -}}
2-
apiVersion: logging.kubesphere.io/v1alpha2
2+
apiVersion: fluentbit.fluent.io/v1alpha2
33
kind: Filter
44
metadata:
55
name: kubernetes
66
labels:
7-
logging.kubesphere.io/enabled: "true"
8-
logging.kubesphere.io/component: logging
7+
fluentbit.fluent.io/enabled: "true"
8+
fluentbit.fluent.io/component: logging
99
spec:
1010
match: kube.*
1111
filters:

‎charts/fluentbit-operator/templates/filter-systemd.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{{- if .Values.Kubernetes -}}
2-
apiVersion: logging.kubesphere.io/v1alpha2
2+
apiVersion: fluentbit.fluent.io/v1alpha2
33
kind: Filter
44
metadata:
55
name: systemd
66
labels:
7-
logging.kubesphere.io/enabled: "true"
8-
logging.kubesphere.io/component: logging
7+
fluentbit.fluent.io/enabled: "true"
8+
fluentbit.fluent.io/component: logging
99
spec:
1010
match: service.*
1111
filters:

‎charts/fluentbit-operator/templates/fluentbit-fluentBit.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- if .Values.Kubernetes -}}
2-
apiVersion: logging.kubesphere.io/v1alpha2
2+
apiVersion: fluentbit.fluent.io/v1alpha2
33
kind: FluentBit
44
metadata:
55
name: fluent-bit

‎charts/fluentbit-operator/templates/fluentbit-operator-clusterRole.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ rules:
5050
- update
5151
- watch
5252
- apiGroups:
53-
- logging.kubesphere.io
53+
- fluentbit.fluent.io
5454
resources:
5555
- filters
5656
- fluentbitconfigs
@@ -67,15 +67,15 @@ rules:
6767
- update
6868
- watch
6969
- apiGroups:
70-
- logging.kubesphere.io
70+
- fluentbit.fluent.io
7171
resources:
7272
- filters
7373
- inputs
7474
- outputs
7575
verbs:
7676
- list
7777
- apiGroups:
78-
- logging.kubesphere.io
78+
- fluentbit.fluent.io
7979
resources:
8080
- fluentbitconfigs
8181
verbs:

‎charts/fluentbit-operator/templates/fluentbitconfig-fluentBitConfig.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- if .Values.Kubernetes -}}
2-
apiVersion: logging.kubesphere.io/v1alpha2
2+
apiVersion: fluentbit.fluent.io/v1alpha2
33
kind: FluentBitConfig
44
metadata:
55
name: fluent-bit-config
@@ -10,11 +10,11 @@ spec:
1010
parsersFile: parsers.conf
1111
inputSelector:
1212
matchLabels:
13-
logging.kubesphere.io/enabled: "true"
13+
fluentbit.fluent.io/enabled: "true"
1414
filterSelector:
1515
matchLabels:
16-
logging.kubesphere.io/enabled: "true"
16+
fluentbit.fluent.io/enabled: "true"
1717
outputSelector:
1818
matchLabels:
19-
logging.kubesphere.io/enabled: "true"
19+
fluentbit.fluent.io/enabled: "true"
2020
{{- end }}

‎charts/fluentbit-operator/templates/input-systemd-container.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{{- if .Values.Kubernetes -}}
2-
apiVersion: logging.kubesphere.io/v1alpha2
2+
apiVersion: fluentbit.fluent.io/v1alpha2
33
kind: Input
44
metadata:
55
name: {{ .Values.containerRuntime }}
66
labels:
7-
logging.kubesphere.io/enabled: "true"
8-
logging.kubesphere.io/component: logging
7+
fluentbit.fluent.io/enabled: "true"
8+
fluentbit.fluent.io/component: logging
99
spec:
1010
systemd:
1111
tag: service.{{ .Values.containerRuntime }}

‎charts/fluentbit-operator/templates/input-systemd-kubelet.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{{- if .Values.Kubernetes -}}
2-
apiVersion: logging.kubesphere.io/v1alpha2
2+
apiVersion: fluentbit.fluent.io/v1alpha2
33
kind: Input
44
metadata:
55
name: kubelet
66
labels:
7-
logging.kubesphere.io/enabled: "true"
8-
logging.kubesphere.io/component: logging
7+
fluentbit.fluent.io/enabled: "true"
8+
fluentbit.fluent.io/component: logging
99
spec:
1010
systemd:
1111
tag: service.kubelet

‎charts/fluentbit-operator/templates/input-tail.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{{- if .Values.Kubernetes -}}
2-
apiVersion: logging.kubesphere.io/v1alpha2
2+
apiVersion: fluentbit.fluent.io/v1alpha2
33
kind: Input
44
metadata:
55
name: tail
66
labels:
7-
logging.kubesphere.io/enabled: "true"
8-
logging.kubesphere.io/component: logging
7+
fluentbit.fluent.io/enabled: "true"
8+
fluentbit.fluent.io/component: logging
99
spec:
1010
tail:
1111
tag: kube.*

‎charts/fluentbit-operator/templates/output-elasticsearch.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{{- if .Values.Kubernetes -}}
22
{{- if .Values.output.es.enable -}}
3-
apiVersion: logging.kubesphere.io/v1alpha2
3+
apiVersion: fluentbit.fluent.io/v1alpha2
44
kind: Output
55
metadata:
66
name: es
77
labels:
8-
logging.kubesphere.io/enabled: "true"
9-
logging.kubesphere.io/component: logging
8+
fluentbit.fluent.io/enabled: "true"
9+
fluentbit.fluent.io/component: logging
1010
spec:
1111
matchRegex: (?:kube|service)\.(.*)
1212
es:

‎charts/fluentbit-operator/templates/output-forward.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{{- if .Values.Kubernetes -}}
22
{{- if .Values.output.forward.enable -}}
3-
apiVersion: logging.kubesphere.io/v1alpha2
3+
apiVersion: fluentbit.fluent.io/v1alpha2
44
kind: Output
55
metadata:
66
name: fluentd
77
labels:
8-
logging.kubesphere.io/enabled: "true"
9-
logging.kubesphere.io/component: logging
8+
fluentbit.fluent.io/enabled: "true"
9+
fluentbit.fluent.io/component: logging
1010
spec:
1111
matchRegex: (?:kube|service)\.(.*)
1212
forward:

‎charts/fluentbit-operator/templates/output-kafka.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{{- if .Values.Kubernetes -}}
22
{{- if .Values.output.kafka.enable -}}
3-
apiVersion: logging.kubesphere.io/v1alpha2
3+
apiVersion: fluentbit.fluent.io/v1alpha2
44
kind: Output
55
metadata:
66
name: kafka
77
labels:
8-
logging.kubesphere.io/enabled: "true"
9-
logging.kubesphere.io/component: logging
8+
fluentbit.fluent.io/enabled: "true"
9+
fluentbit.fluent.io/component: logging
1010
spec:
1111
matchRegex: (?:kube|service)\.(.*)
1212
kafka:

‎config/crd/bases/_.yaml

-16
This file was deleted.

‎config/crd/bases/logging.kubesphere.io_filters.yaml ‎config/crd/bases/fluentbit.fluent.io_filters.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ metadata:
66
annotations:
77
controller-gen.kubebuilder.io/version: v0.4.1
88
creationTimestamp: null
9-
name: filters.logging.kubesphere.io
9+
name: filters.fluentbit.fluent.io
1010
spec:
11-
group: logging.kubesphere.io
11+
group: fluentbit.fluent.io
1212
names:
1313
kind: Filter
1414
listKind: FilterList

‎config/crd/bases/logging.kubesphere.io_fluentbitconfigs.yaml ‎config/crd/bases/fluentbit.fluent.io_fluentbitconfigs.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ metadata:
66
annotations:
77
controller-gen.kubebuilder.io/version: v0.4.1
88
creationTimestamp: null
9-
name: fluentbitconfigs.logging.kubesphere.io
9+
name: fluentbitconfigs.fluentbit.fluent.io
1010
spec:
11-
group: logging.kubesphere.io
11+
group: fluentbit.fluent.io
1212
names:
1313
kind: FluentBitConfig
1414
listKind: FluentBitConfigList

‎config/crd/bases/logging.kubesphere.io_fluentbits.yaml ‎config/crd/bases/fluentbit.fluent.io_fluentbits.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ metadata:
66
annotations:
77
controller-gen.kubebuilder.io/version: v0.4.1
88
creationTimestamp: null
9-
name: fluentbits.logging.kubesphere.io
9+
name: fluentbits.fluentbit.fluent.io
1010
spec:
11-
group: logging.kubesphere.io
11+
group: fluentbit.fluent.io
1212
names:
1313
kind: FluentBit
1414
listKind: FluentBitList

‎config/crd/bases/logging.kubesphere.io_inputs.yaml ‎config/crd/bases/fluentbit.fluent.io_inputs.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ metadata:
66
annotations:
77
controller-gen.kubebuilder.io/version: v0.4.1
88
creationTimestamp: null
9-
name: inputs.logging.kubesphere.io
9+
name: inputs.fluentbit.fluent.io
1010
spec:
11-
group: logging.kubesphere.io
11+
group: fluentbit.fluent.io
1212
names:
1313
kind: Input
1414
listKind: InputList

‎config/crd/bases/logging.kubesphere.io_outputs.yaml ‎config/crd/bases/fluentbit.fluent.io_outputs.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ metadata:
66
annotations:
77
controller-gen.kubebuilder.io/version: v0.4.1
88
creationTimestamp: null
9-
name: outputs.logging.kubesphere.io
9+
name: outputs.fluentbit.fluent.io
1010
spec:
11-
group: logging.kubesphere.io
11+
group: fluentbit.fluent.io
1212
names:
1313
kind: Output
1414
listKind: OutputList

‎config/crd/bases/logging.kubesphere.io_parsers.yaml ‎config/crd/bases/fluentbit.fluent.io_parsers.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ metadata:
66
annotations:
77
controller-gen.kubebuilder.io/version: v0.4.1
88
creationTimestamp: null
9-
name: parsers.logging.kubesphere.io
9+
name: parsers.fluentbit.fluent.io
1010
spec:
11-
group: logging.kubesphere.io
11+
group: fluentbit.fluent.io
1212
names:
1313
kind: Parser
1414
listKind: ParserList

0 commit comments

Comments
 (0)