Skip to content

Commit 9e97d2b

Browse files
committed
Bundle CRDs in main chart.
Signed-off-by: Josh Baird <jbaird@galileo.io>
1 parent 8a7b4d9 commit 9e97d2b

23 files changed

Lines changed: 41379 additions & 0 deletions

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
5757
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./apis/fluentd/..." output:crd:artifacts:config=config/crd/bases
5858
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./apis/fluentbit/..." output:crd:artifacts:config=charts/fluent-bit-crds/templates
5959
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./apis/fluentd/..." output:crd:artifacts:config=charts/fluentd-crds/templates
60+
$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./apis/fluentbit/..." output:crd:artifacts:config=charts/fluent-operator/crds
61+
$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./apis/fluentd/..." output:crd:artifacts:config=charts/fluent-operator/crds
6062
kubectl kustomize config/crd/bases/ | sed -e '/creationTimestamp/d' > manifests/setup/fluent-operator-crd.yaml
6163
kubectl kustomize manifests/setup/ | sed -e '/creationTimestamp/d' > manifests/setup/setup.yaml
6264
hack/mutate-crds.sh

charts/fluent-operator/crds/fluentbit.fluent.io_clusterfilters.yaml

Lines changed: 969 additions & 0 deletions
Large diffs are not rendered by default.

charts/fluent-operator/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml

Lines changed: 446 additions & 0 deletions
Large diffs are not rendered by default.

charts/fluent-operator/crds/fluentbit.fluent.io_clusterinputs.yaml

Lines changed: 1007 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
---
2+
apiVersion: apiextensions.k8s.io/v1
3+
kind: CustomResourceDefinition
4+
metadata:
5+
annotations:
6+
controller-gen.kubebuilder.io/version: v0.18.0
7+
name: clustermultilineparsers.fluentbit.fluent.io
8+
spec:
9+
group: fluentbit.fluent.io
10+
names:
11+
kind: ClusterMultilineParser
12+
listKind: ClusterMultilineParserList
13+
plural: clustermultilineparsers
14+
shortNames:
15+
- cfbmp
16+
singular: clustermultilineparser
17+
scope: Cluster
18+
versions:
19+
- name: v1alpha2
20+
schema:
21+
openAPIV3Schema:
22+
description: ClusterMultilineParser is the Schema for the cluster-level multiline
23+
parser API
24+
properties:
25+
apiVersion:
26+
description: |-
27+
APIVersion defines the versioned schema of this representation of an object.
28+
Servers should convert recognized schemas to the latest internal value, and
29+
may reject unrecognized values.
30+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
31+
type: string
32+
kind:
33+
description: |-
34+
Kind is a string value representing the REST resource this object represents.
35+
Servers may infer this from the endpoint the client submits requests to.
36+
Cannot be updated.
37+
In CamelCase.
38+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
39+
type: string
40+
metadata:
41+
type: object
42+
spec:
43+
properties:
44+
flushTimeout:
45+
default: 5000
46+
description: Timeout in milliseconds to flush a non-terminated multiline
47+
buffer. Default is set to 5 seconds.
48+
type: integer
49+
keyContent:
50+
description: For an incoming structured message, specify the key that
51+
contains the data that should be processed by the regular expression
52+
and possibly concatenated.
53+
type: string
54+
parser:
55+
description: Name of a pre-defined parser that must be applied to
56+
the incoming content before applying the regex rule. If no parser
57+
is defined, it's assumed that's a raw text and not a structured
58+
message.
59+
type: string
60+
rules:
61+
description: Configure a rule to match a multiline pattern. The rule
62+
has a specific format described below. Multiple rules can be defined.
63+
items:
64+
properties:
65+
next:
66+
type: string
67+
regex:
68+
type: string
69+
start:
70+
type: string
71+
required:
72+
- next
73+
- regex
74+
- start
75+
type: object
76+
type: array
77+
type:
78+
default: regex
79+
description: Set the multiline mode, for now, we support the type
80+
regex.
81+
enum:
82+
- regex
83+
type: string
84+
type: object
85+
type: object
86+
served: true
87+
storage: true

0 commit comments

Comments
 (0)