Skip to content

Commit 4238ee2

Browse files
author
Peng Zhou
committed
MLE-23487 default values for LogCollection
1 parent 043e92c commit 4238ee2

File tree

3 files changed

+73
-1
lines changed

3 files changed

+73
-1
lines changed

api/v1/common_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ type LogCollection struct {
6464
ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
6565
// +kubebuilder:default:={"requests":{"cpu":"100m","memory":"200Mi"},"limits":{"cpu":"200m","memory":"500Mi"}}
6666
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
67-
// +kubebuilder:default:={errorLogs: true, accessLogs: true, requestLogs: true}
67+
// +kubebuilder:default:={errorLogs: true, accessLogs: true, requestLogs: true, crashLogs: true, auditLogs: true}
6868
Files LogFilesConfig `json:"files,omitempty"`
6969
// +kubebuilder:default:="[OUTPUT]\n name loki\n match *\n host loki.default.svc.cluster.local\n port 3100\n labels job=fluent-bit\n http_user admin\n http_passwd admin"
7070
Outputs string `json:"outputs,omitempty"`

config/crd/bases/marklogic.progress.com_marklogicclusters.yaml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4639,8 +4639,15 @@ spec:
46394639
memory: 200Mi
46404640
properties:
46414641
enabled:
4642+
default: false
46424643
type: boolean
46434644
files:
4645+
default:
4646+
accessLogs: true
4647+
auditLogs: true
4648+
crashLogs: true
4649+
errorLogs: true
4650+
requestLogs: true
46444651
properties:
46454652
accessLogs:
46464653
type: boolean
@@ -4654,6 +4661,7 @@ spec:
46544661
type: boolean
46554662
type: object
46564663
image:
4664+
default: fluent/fluent-bit:3.2.5
46574665
type: string
46584666
imagePullSecrets:
46594667
items:
@@ -4674,8 +4682,24 @@ spec:
46744682
x-kubernetes-map-type: atomic
46754683
type: array
46764684
outputs:
4685+
default: |-
4686+
[OUTPUT]
4687+
name loki
4688+
match *
4689+
host loki.default.svc.cluster.local
4690+
port 3100
4691+
labels job=fluent-bit
4692+
http_user admin
4693+
http_passwd admin
46774694
type: string
46784695
resources:
4696+
default:
4697+
limits:
4698+
cpu: 200m
4699+
memory: 500Mi
4700+
requests:
4701+
cpu: 100m
4702+
memory: 200Mi
46794703
description: ResourceRequirements describes the compute resource
46804704
requirements.
46814705
properties:
@@ -9367,8 +9391,15 @@ spec:
93679391
logCollection:
93689392
properties:
93699393
enabled:
9394+
default: false
93709395
type: boolean
93719396
files:
9397+
default:
9398+
accessLogs: true
9399+
auditLogs: true
9400+
crashLogs: true
9401+
errorLogs: true
9402+
requestLogs: true
93729403
properties:
93739404
accessLogs:
93749405
type: boolean
@@ -9382,6 +9413,7 @@ spec:
93829413
type: boolean
93839414
type: object
93849415
image:
9416+
default: fluent/fluent-bit:3.2.5
93859417
type: string
93869418
imagePullSecrets:
93879419
items:
@@ -9402,8 +9434,24 @@ spec:
94029434
x-kubernetes-map-type: atomic
94039435
type: array
94049436
outputs:
9437+
default: |-
9438+
[OUTPUT]
9439+
name loki
9440+
match *
9441+
host loki.default.svc.cluster.local
9442+
port 3100
9443+
labels job=fluent-bit
9444+
http_user admin
9445+
http_passwd admin
94059446
type: string
94069447
resources:
9448+
default:
9449+
limits:
9450+
cpu: 200m
9451+
memory: 500Mi
9452+
requests:
9453+
cpu: 100m
9454+
memory: 200Mi
94079455
description: ResourceRequirements describes the compute
94089456
resource requirements.
94099457
properties:

config/crd/bases/marklogic.progress.com_marklogicgroups.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3382,8 +3382,15 @@ spec:
33823382
memory: 200Mi
33833383
properties:
33843384
enabled:
3385+
default: false
33853386
type: boolean
33863387
files:
3388+
default:
3389+
accessLogs: true
3390+
auditLogs: true
3391+
crashLogs: true
3392+
errorLogs: true
3393+
requestLogs: true
33873394
properties:
33883395
accessLogs:
33893396
type: boolean
@@ -3397,6 +3404,7 @@ spec:
33973404
type: boolean
33983405
type: object
33993406
image:
3407+
default: fluent/fluent-bit:3.2.5
34003408
type: string
34013409
imagePullSecrets:
34023410
items:
@@ -3417,8 +3425,24 @@ spec:
34173425
x-kubernetes-map-type: atomic
34183426
type: array
34193427
outputs:
3428+
default: |-
3429+
[OUTPUT]
3430+
name loki
3431+
match *
3432+
host loki.default.svc.cluster.local
3433+
port 3100
3434+
labels job=fluent-bit
3435+
http_user admin
3436+
http_passwd admin
34203437
type: string
34213438
resources:
3439+
default:
3440+
limits:
3441+
cpu: 200m
3442+
memory: 500Mi
3443+
requests:
3444+
cpu: 100m
3445+
memory: 200Mi
34223446
description: ResourceRequirements describes the compute resource
34233447
requirements.
34243448
properties:

0 commit comments

Comments
 (0)