Skip to content

Commit 21ed173

Browse files
HisagarHisagar
authored
Add additional config param in SyslogOutput Plugin for mutual TLS (#922)
* Syslog configuration updated for mutual TLS * CRD & documents file updated * file added after make diff * vefiry-fqdn & verify-peer added * tls_socket patch added and PrivateKeyPassphrase converted to secret * config param updated * docker file updated * TestSyslogOutputConfigForMutualTLS code structure updated to solve CI checks error * DefaultFluentdImageTag updated to v1.14.4-alpine-2 in logging_types.go
1 parent 705605e commit 21ed173

File tree

12 files changed

+976
-8
lines changed

12 files changed

+976
-8
lines changed

‎charts/logging-operator-logging/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The following tables lists the configurable parameters of the logging-operator-l
2727
| `fluentbit.image.pullPolicy` | Fluentbit container pull policy | `IfNotPresent` |
2828
| `fluentbit.podPriorityClassName` | Priority class name for fluentbit pods | none |
2929
| `fluentd.enabled` | Install fluentd | true |
30-
| `fluentd.image.tag` | Fluentd container image tag | `v1.14.4-alpine-1` |
30+
| `fluentd.image.tag` | Fluentd container image tag | `v1.14.4-alpine-2` |
3131
| `fluentd.image.repository` | Fluentd container image repository | `ghcr.io/banzaicloud/fluentd` |
3232
| `fluentd.image.pullPolicy` | Fluentd container pull policy | `IfNotPresent` |
3333
| `fluentd.volumeModImage.tag` | Fluentd volumeModImage container image tag | `latest` |

‎charts/logging-operator/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ The following tables lists the configurable parameters of the logging-operator-l
116116
| `fluentbit.image.repository` | Fluentbit container image repository | `fluent/fluent-bit` |
117117
| `fluentbit.image.pullPolicy` | Fluentbit container pull policy | `IfNotPresent` |
118118
| `fluentd.enabled` | Install fluentd | true |
119-
| `fluentd.image.tag` | Fluentd container image tag | `v1.14.4-alpine-1` |
119+
| `fluentd.image.tag` | Fluentd container image tag | `v1.14.4-alpine-2` |
120120
| `fluentd.image.repository` | Fluentd container image repository | `ghcr.io/banzaicloud/fluentd` |
121121
| `fluentd.image.pullPolicy` | Fluentd container pull policy | `IfNotPresent` |
122122
| `fluentd.volumeModImage.tag` | Fluentd volumeModImage container image tag | `latest` |

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

Lines changed: 218 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4755,6 +4755,8 @@ spec:
47554755
type: object
47564756
syslog:
47574757
properties:
4758+
allow_self_signed_cert:
4759+
type: boolean
47584760
buffer:
47594761
properties:
47604762
chunk_full_threshold:
@@ -4824,6 +4826,41 @@ spec:
48244826
type:
48254827
type: string
48264828
type: object
4829+
client_cert_path:
4830+
properties:
4831+
mountFrom:
4832+
properties:
4833+
secretKeyRef:
4834+
properties:
4835+
key:
4836+
type: string
4837+
name:
4838+
type: string
4839+
optional:
4840+
type: boolean
4841+
required:
4842+
- key
4843+
type: object
4844+
type: object
4845+
value:
4846+
type: string
4847+
valueFrom:
4848+
properties:
4849+
secretKeyRef:
4850+
properties:
4851+
key:
4852+
type: string
4853+
name:
4854+
type: string
4855+
optional:
4856+
type: boolean
4857+
required:
4858+
- key
4859+
type: object
4860+
type: object
4861+
type: object
4862+
enable_system_cert_store:
4863+
type: boolean
48274864
format:
48284865
properties:
48294866
app_name_field:
@@ -4851,12 +4888,80 @@ spec:
48514888
- single_value
48524889
type: string
48534890
type: object
4891+
fqdn:
4892+
type: string
48544893
host:
48554894
type: string
48564895
insecure:
48574896
type: boolean
48584897
port:
48594898
type: integer
4899+
private_key_passphrase:
4900+
properties:
4901+
mountFrom:
4902+
properties:
4903+
secretKeyRef:
4904+
properties:
4905+
key:
4906+
type: string
4907+
name:
4908+
type: string
4909+
optional:
4910+
type: boolean
4911+
required:
4912+
- key
4913+
type: object
4914+
type: object
4915+
value:
4916+
type: string
4917+
valueFrom:
4918+
properties:
4919+
secretKeyRef:
4920+
properties:
4921+
key:
4922+
type: string
4923+
name:
4924+
type: string
4925+
optional:
4926+
type: boolean
4927+
required:
4928+
- key
4929+
type: object
4930+
type: object
4931+
type: object
4932+
private_key_path:
4933+
properties:
4934+
mountFrom:
4935+
properties:
4936+
secretKeyRef:
4937+
properties:
4938+
key:
4939+
type: string
4940+
name:
4941+
type: string
4942+
optional:
4943+
type: boolean
4944+
required:
4945+
- key
4946+
type: object
4947+
type: object
4948+
value:
4949+
type: string
4950+
valueFrom:
4951+
properties:
4952+
secretKeyRef:
4953+
properties:
4954+
key:
4955+
type: string
4956+
name:
4957+
type: string
4958+
optional:
4959+
type: boolean
4960+
required:
4961+
- key
4962+
type: object
4963+
type: object
4964+
type: object
48604965
transport:
48614966
type: string
48624967
trusted_ca_path:
@@ -4892,6 +4997,10 @@ spec:
48924997
type: object
48934998
type: object
48944999
type: object
5000+
verify_fqdn:
5001+
type: boolean
5002+
version:
5003+
type: string
48955004
required:
48965005
- host
48975006
type: object
@@ -9651,6 +9760,8 @@ spec:
96519760
type: object
96529761
syslog:
96539762
properties:
9763+
allow_self_signed_cert:
9764+
type: boolean
96549765
buffer:
96559766
properties:
96569767
chunk_full_threshold:
@@ -9720,6 +9831,41 @@ spec:
97209831
type:
97219832
type: string
97229833
type: object
9834+
client_cert_path:
9835+
properties:
9836+
mountFrom:
9837+
properties:
9838+
secretKeyRef:
9839+
properties:
9840+
key:
9841+
type: string
9842+
name:
9843+
type: string
9844+
optional:
9845+
type: boolean
9846+
required:
9847+
- key
9848+
type: object
9849+
type: object
9850+
value:
9851+
type: string
9852+
valueFrom:
9853+
properties:
9854+
secretKeyRef:
9855+
properties:
9856+
key:
9857+
type: string
9858+
name:
9859+
type: string
9860+
optional:
9861+
type: boolean
9862+
required:
9863+
- key
9864+
type: object
9865+
type: object
9866+
type: object
9867+
enable_system_cert_store:
9868+
type: boolean
97239869
format:
97249870
properties:
97259871
app_name_field:
@@ -9747,12 +9893,80 @@ spec:
97479893
- single_value
97489894
type: string
97499895
type: object
9896+
fqdn:
9897+
type: string
97509898
host:
97519899
type: string
97529900
insecure:
97539901
type: boolean
97549902
port:
97559903
type: integer
9904+
private_key_passphrase:
9905+
properties:
9906+
mountFrom:
9907+
properties:
9908+
secretKeyRef:
9909+
properties:
9910+
key:
9911+
type: string
9912+
name:
9913+
type: string
9914+
optional:
9915+
type: boolean
9916+
required:
9917+
- key
9918+
type: object
9919+
type: object
9920+
value:
9921+
type: string
9922+
valueFrom:
9923+
properties:
9924+
secretKeyRef:
9925+
properties:
9926+
key:
9927+
type: string
9928+
name:
9929+
type: string
9930+
optional:
9931+
type: boolean
9932+
required:
9933+
- key
9934+
type: object
9935+
type: object
9936+
type: object
9937+
private_key_path:
9938+
properties:
9939+
mountFrom:
9940+
properties:
9941+
secretKeyRef:
9942+
properties:
9943+
key:
9944+
type: string
9945+
name:
9946+
type: string
9947+
optional:
9948+
type: boolean
9949+
required:
9950+
- key
9951+
type: object
9952+
type: object
9953+
value:
9954+
type: string
9955+
valueFrom:
9956+
properties:
9957+
secretKeyRef:
9958+
properties:
9959+
key:
9960+
type: string
9961+
name:
9962+
type: string
9963+
optional:
9964+
type: boolean
9965+
required:
9966+
- key
9967+
type: object
9968+
type: object
9969+
type: object
97569970
transport:
97579971
type: string
97589972
trusted_ca_path:
@@ -9788,6 +10002,10 @@ spec:
978810002
type: object
978910003
type: object
979010004
type: object
10005+
verify_fqdn:
10006+
type: boolean
10007+
version:
10008+
type: string
979110009
required:
979210010
- host
979310011
type: object

0 commit comments

Comments
 (0)