Skip to content

Commit 6e35060

Browse files
author
Benjamin Huo
authored
Merge pull request #44 from wanjunlei/master
add affinity and resource to fluentbit crd
2 parents bf5c22f + 9d27e9c commit 6e35060

16 files changed

+6720
-5535
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ ifeq (, $(shell which controller-gen))
9393
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
9494
cd $$CONTROLLER_GEN_TMP_DIR ;\
9595
go mod init tmp ;\
96-
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.4 ;\
96+
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1 ;\
9797
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
9898
}
9999
CONTROLLER_GEN=$(GOBIN)/controller-gen

‎api/v1alpha2/fluentbit_types.go

+4
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@ type FluentBitSpec struct {
3434
PositionDB corev1.VolumeSource `json:"positionDB,omitempty"`
3535
// Container log path
3636
ContainerLogRealPath string `json:"containerLogRealPath,omitempty"`
37+
// Compute Resources required by container.
38+
Resources corev1.ResourceRequirements `json:"resources,omitempty"`
3739
// NodeSelector
3840
NodeSelector map[string]string `json:"nodeSelector,omitempty"`
41+
// Pod's scheduling constraints.
42+
Affinity *corev1.Affinity `json:"affinity,omitempty"`
3943
// Tolerations
4044
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
4145
// Fluentbitconfig object associated with this Fluentbit

‎api/v1alpha2/zz_generated.deepcopy.go

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+382-377
Large diffs are not rendered by default.

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

+236-233
Large diffs are not rendered by default.

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

+1,858-1,214
Large diffs are not rendered by default.

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

+237-234
Large diffs are not rendered by default.

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

+1,015-996
Large diffs are not rendered by default.

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

+88-87
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11

22
---
3-
apiVersion: apiextensions.k8s.io/v1beta1
3+
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.2.4
7+
controller-gen.kubebuilder.io/version: v0.4.1
88
creationTimestamp: null
99
name: parsers.logging.kubesphere.io
1010
spec:
@@ -15,95 +15,96 @@ spec:
1515
plural: parsers
1616
singular: parser
1717
scope: Namespaced
18-
validation:
19-
openAPIV3Schema:
20-
description: Parser is the Schema for the parsers API
21-
properties:
22-
apiVersion:
23-
description: 'APIVersion defines the versioned schema of this representation
24-
of an object. Servers should convert recognized schemas to the latest
25-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
26-
type: string
27-
kind:
28-
description: 'Kind is a string value representing the REST resource this
29-
object represents. Servers may infer this from the endpoint the client
30-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31-
type: string
32-
metadata:
33-
type: object
34-
spec:
35-
description: ParserSpec defines the desired state of Parser
36-
properties:
37-
decoders:
38-
description: 'Decoders are a built-in feature available through the
39-
Parsers file, each Parser definition can optionally set one or multiple
40-
decoders. There are two type of decoders type: Decode_Field and Decode_Field_As.'
41-
items:
18+
versions:
19+
- name: v1alpha2
20+
schema:
21+
openAPIV3Schema:
22+
description: Parser is the Schema for the parsers API
23+
properties:
24+
apiVersion:
25+
description: 'APIVersion defines the versioned schema of this representation
26+
of an object. Servers should convert recognized schemas to the latest
27+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
28+
type: string
29+
kind:
30+
description: 'Kind is a string value representing the REST resource this
31+
object represents. Servers may infer this from the endpoint the client
32+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
33+
type: string
34+
metadata:
35+
type: object
36+
spec:
37+
description: ParserSpec defines the desired state of Parser
38+
properties:
39+
decoders:
40+
description: 'Decoders are a built-in feature available through the
41+
Parsers file, each Parser definition can optionally set one or multiple
42+
decoders. There are two type of decoders type: Decode_Field and
43+
Decode_Field_As.'
44+
items:
45+
properties:
46+
decodeField:
47+
description: If the content can be decoded in a structured message,
48+
append that structure message (keys and values) to the original
49+
log message.
50+
type: string
51+
decodeFieldAs:
52+
description: Any content decoded (unstructured or structured)
53+
will be replaced in the same key/value, no extra keys are
54+
added.
55+
type: string
56+
type: object
57+
type: array
58+
json:
59+
description: JSON defines json parser configuration.
4260
properties:
43-
decodeField:
44-
description: If the content can be decoded in a structured message,
45-
append that structure message (keys and values) to the original
46-
log message.
61+
timeFormat:
62+
description: Time_Format, eg. %Y-%m-%dT%H:%M:%S %z
4763
type: string
48-
decodeFieldAs:
49-
description: Any content decoded (unstructured or structured)
50-
will be replaced in the same key/value, no extra keys are added.
64+
timeKeep:
65+
description: Time_Keep
66+
type: boolean
67+
timeKey:
68+
description: Time_Key
5169
type: string
5270
type: object
53-
type: array
54-
json:
55-
description: JSON defines json parser configuration.
56-
properties:
57-
timeFormat:
58-
description: Time_Format, eg. %Y-%m-%dT%H:%M:%S %z
59-
type: string
60-
timeKeep:
61-
description: Time_Keep
62-
type: boolean
63-
timeKey:
64-
description: Time_Key
65-
type: string
66-
type: object
67-
logfmt:
68-
description: Logfmt defines logfmt parser configuration.
69-
type: object
70-
ltsv:
71-
description: LTSV defines ltsv parser configuration.
72-
properties:
73-
timeFormat:
74-
description: Time_Format, eg. %Y-%m-%dT%H:%M:%S %z
75-
type: string
76-
timeKeep:
77-
description: Time_Keep
78-
type: boolean
79-
timeKey:
80-
description: Time_Key
81-
type: string
82-
types:
83-
type: string
84-
type: object
85-
regex:
86-
description: Regex defines regex parser configuration.
87-
properties:
88-
regex:
89-
type: string
90-
timeFormat:
91-
description: Time_Format, eg. %Y-%m-%dT%H:%M:%S %z
92-
type: string
93-
timeKeep:
94-
description: Time_Keep
95-
type: boolean
96-
timeKey:
97-
description: Time_Key
98-
type: string
99-
types:
100-
type: string
101-
type: object
102-
type: object
103-
type: object
104-
version: v1alpha2
105-
versions:
106-
- name: v1alpha2
71+
logfmt:
72+
description: Logfmt defines logfmt parser configuration.
73+
type: object
74+
ltsv:
75+
description: LTSV defines ltsv parser configuration.
76+
properties:
77+
timeFormat:
78+
description: Time_Format, eg. %Y-%m-%dT%H:%M:%S %z
79+
type: string
80+
timeKeep:
81+
description: Time_Keep
82+
type: boolean
83+
timeKey:
84+
description: Time_Key
85+
type: string
86+
types:
87+
type: string
88+
type: object
89+
regex:
90+
description: Regex defines regex parser configuration.
91+
properties:
92+
regex:
93+
type: string
94+
timeFormat:
95+
description: Time_Format, eg. %Y-%m-%dT%H:%M:%S %z
96+
type: string
97+
timeKeep:
98+
description: Time_Keep
99+
type: boolean
100+
timeKey:
101+
description: Time_Key
102+
type: string
103+
types:
104+
type: string
105+
type: object
106+
type: object
107+
type: object
107108
served: true
108109
storage: true
109110
status:

‎controllers/suite_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
loggingv1alpha2 "kubesphere.io/fluentbit-operator/api/v1alpha2"
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929
"sigs.k8s.io/controller-runtime/pkg/envtest"
30+
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3031
logf "sigs.k8s.io/controller-runtime/pkg/log"
3132
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3233
// +kubebuilder:scaffold:imports
@@ -44,15 +45,15 @@ func TestAPIs(t *testing.T) {
4445

4546
RunSpecsWithDefaultAndCustomReporters(t,
4647
"Controller Suite",
47-
[]Reporter{envtest.NewlineReporter{}})
48+
[]Reporter{printer.NewlineReporter{}})
4849
}
4950

5051
var _ = BeforeSuite(func(done Done) {
5152
logf.SetLogger(zap.LoggerTo(GinkgoWriter, true))
5253

5354
By("bootstrapping test environment")
5455
testEnv = &envtest.Environment{
55-
CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases")},
56+
CRDDirectoryPaths: []string{filepath.Join("..", "manifests", "setup")},
5657
}
5758

5859
var err error

‎go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
module kubesphere.io/fluentbit-operator
22

3-
go 1.12
3+
go 1.13
44

55
require (
66
github.com/go-logr/logr v0.1.0
77
github.com/go-openapi/errors v0.19.2
88
github.com/joho/godotenv v1.3.0
99
github.com/json-iterator/go v1.1.8
10-
github.com/onsi/ginkgo v1.10.3
11-
github.com/onsi/gomega v1.7.1
10+
github.com/onsi/ginkgo v1.11.0
11+
github.com/onsi/gomega v1.8.1
1212
k8s.io/api v0.17.2
1313
k8s.io/apimachinery v0.17.2
14-
k8s.io/client-go v0.16.4
14+
k8s.io/client-go v0.17.2
1515
k8s.io/klog v1.0.0
16-
sigs.k8s.io/controller-runtime v0.4.0
16+
sigs.k8s.io/controller-runtime v0.5.2
1717
)

0 commit comments

Comments
 (0)