Skip to content

Commit b1063d8

Browse files
alejandroEscalejandroEsc
authored
feat: allow passing environment vars to fluentd/bit pods (#765)
* feat: allow passing environment vars to fluentd/bit pods * fixing build check-diff error
1 parent adea342 commit b1063d8

File tree

8 files changed

+504
-8
lines changed

8 files changed

+504
-8
lines changed

‎charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml‎

Lines changed: 240 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,6 +1184,66 @@ spec:
11841184
type: boolean
11851185
enableUpstream:
11861186
type: boolean
1187+
envVars:
1188+
items:
1189+
properties:
1190+
name:
1191+
type: string
1192+
value:
1193+
type: string
1194+
valueFrom:
1195+
properties:
1196+
configMapKeyRef:
1197+
properties:
1198+
key:
1199+
type: string
1200+
name:
1201+
type: string
1202+
optional:
1203+
type: boolean
1204+
required:
1205+
- key
1206+
type: object
1207+
fieldRef:
1208+
properties:
1209+
apiVersion:
1210+
type: string
1211+
fieldPath:
1212+
type: string
1213+
required:
1214+
- fieldPath
1215+
type: object
1216+
resourceFieldRef:
1217+
properties:
1218+
containerName:
1219+
type: string
1220+
divisor:
1221+
anyOf:
1222+
- type: integer
1223+
- type: string
1224+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
1225+
x-kubernetes-int-or-string: true
1226+
resource:
1227+
type: string
1228+
required:
1229+
- resource
1230+
type: object
1231+
secretKeyRef:
1232+
properties:
1233+
key:
1234+
type: string
1235+
name:
1236+
type: string
1237+
optional:
1238+
type: boolean
1239+
required:
1240+
- key
1241+
type: object
1242+
type: object
1243+
required:
1244+
- name
1245+
type: object
1246+
type: array
11871247
extraVolumeMounts:
11881248
items:
11891249
properties:
@@ -2629,6 +2689,66 @@ spec:
26292689
type: object
26302690
disablePvc:
26312691
type: boolean
2692+
envVars:
2693+
items:
2694+
properties:
2695+
name:
2696+
type: string
2697+
value:
2698+
type: string
2699+
valueFrom:
2700+
properties:
2701+
configMapKeyRef:
2702+
properties:
2703+
key:
2704+
type: string
2705+
name:
2706+
type: string
2707+
optional:
2708+
type: boolean
2709+
required:
2710+
- key
2711+
type: object
2712+
fieldRef:
2713+
properties:
2714+
apiVersion:
2715+
type: string
2716+
fieldPath:
2717+
type: string
2718+
required:
2719+
- fieldPath
2720+
type: object
2721+
resourceFieldRef:
2722+
properties:
2723+
containerName:
2724+
type: string
2725+
divisor:
2726+
anyOf:
2727+
- type: integer
2728+
- type: string
2729+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
2730+
x-kubernetes-int-or-string: true
2731+
resource:
2732+
type: string
2733+
required:
2734+
- resource
2735+
type: object
2736+
secretKeyRef:
2737+
properties:
2738+
key:
2739+
type: string
2740+
name:
2741+
type: string
2742+
optional:
2743+
type: boolean
2744+
required:
2745+
- key
2746+
type: object
2747+
type: object
2748+
required:
2749+
- name
2750+
type: object
2751+
type: array
26322752
fluentLogDestination:
26332753
type: string
26342754
fluentOutLogrotate:
@@ -8973,6 +9093,66 @@ spec:
89739093
type: boolean
89749094
enableUpstream:
89759095
type: boolean
9096+
envVars:
9097+
items:
9098+
properties:
9099+
name:
9100+
type: string
9101+
value:
9102+
type: string
9103+
valueFrom:
9104+
properties:
9105+
configMapKeyRef:
9106+
properties:
9107+
key:
9108+
type: string
9109+
name:
9110+
type: string
9111+
optional:
9112+
type: boolean
9113+
required:
9114+
- key
9115+
type: object
9116+
fieldRef:
9117+
properties:
9118+
apiVersion:
9119+
type: string
9120+
fieldPath:
9121+
type: string
9122+
required:
9123+
- fieldPath
9124+
type: object
9125+
resourceFieldRef:
9126+
properties:
9127+
containerName:
9128+
type: string
9129+
divisor:
9130+
anyOf:
9131+
- type: integer
9132+
- type: string
9133+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
9134+
x-kubernetes-int-or-string: true
9135+
resource:
9136+
type: string
9137+
required:
9138+
- resource
9139+
type: object
9140+
secretKeyRef:
9141+
properties:
9142+
key:
9143+
type: string
9144+
name:
9145+
type: string
9146+
optional:
9147+
type: boolean
9148+
required:
9149+
- key
9150+
type: object
9151+
type: object
9152+
required:
9153+
- name
9154+
type: object
9155+
type: array
89769156
extraVolumeMounts:
89779157
items:
89789158
properties:
@@ -10418,6 +10598,66 @@ spec:
1041810598
type: object
1041910599
disablePvc:
1042010600
type: boolean
10601+
envVars:
10602+
items:
10603+
properties:
10604+
name:
10605+
type: string
10606+
value:
10607+
type: string
10608+
valueFrom:
10609+
properties:
10610+
configMapKeyRef:
10611+
properties:
10612+
key:
10613+
type: string
10614+
name:
10615+
type: string
10616+
optional:
10617+
type: boolean
10618+
required:
10619+
- key
10620+
type: object
10621+
fieldRef:
10622+
properties:
10623+
apiVersion:
10624+
type: string
10625+
fieldPath:
10626+
type: string
10627+
required:
10628+
- fieldPath
10629+
type: object
10630+
resourceFieldRef:
10631+
properties:
10632+
containerName:
10633+
type: string
10634+
divisor:
10635+
anyOf:
10636+
- type: integer
10637+
- type: string
10638+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
10639+
x-kubernetes-int-or-string: true
10640+
resource:
10641+
type: string
10642+
required:
10643+
- resource
10644+
type: object
10645+
secretKeyRef:
10646+
properties:
10647+
key:
10648+
type: string
10649+
name:
10650+
type: string
10651+
optional:
10652+
type: boolean
10653+
required:
10654+
- key
10655+
type: object
10656+
type: object
10657+
required:
10658+
- name
10659+
type: object
10660+
type: array
1042110661
fluentLogDestination:
1042210662
type: string
1042310663
fluentOutLogrotate:

0 commit comments

Comments
 (0)