Merge pull request #1110 from antrema/enforce_fluentd_loki_tests

feat: enforce Fluentd tests
fluent · Apr 5, 2024 · cbfe865 · cbfe865
2 parents b836e46 + c901586
commit cbfe865
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/apis/fluentd/v1alpha1/tests/expected/fluentd-cluster-cfg-output-loki.cfg b/apis/fluentd/v1alpha1/tests/expected/fluentd-cluster-cfg-output-loki.cfg
@@ -25,11 +25,14 @@
   <match **>
     @id  ClusterFluentdConfig-cluster-fluentd-config::cluster::clusteroutput::fluentd-output-loki-0
     @type  loki
+    ca_cert  /path/to/ca.pem
+    cert  /path/to/certificate.pem
     drop_single_key  true
     extra_labels  {"key11":"value11","key12":"value12"}
     extract_kubernetes_labels  true
     include_thread_label  true
     insecure_tls  true
+    key  /path/to/key.key
     password  s3cr3tP@ssword
     remove_keys  key31,key32
     tenant  0c3ba7a4-3148-4605-b62a-afc92dd1c4d7

diff --git a/apis/fluentd/v1alpha1/tests/expected/fluentd-mixed-cfgs-output-copy-1.cfg b/apis/fluentd/v1alpha1/tests/expected/fluentd-mixed-cfgs-output-copy-1.cfg
@@ -21,11 +21,14 @@
     <store>
       @id  FluentdConfig-fluent-fluentd-config::cluster::clusteroutput::fluentd-output-loki-0
       @type  loki
+      ca_cert  /path/to/ca.pem
+      cert  /path/to/certificate.pem
       drop_single_key  true
       extra_labels  {"key11":"value11","key12":"value12"}
       extract_kubernetes_labels  true
       include_thread_label  true
       insecure_tls  true
+      key  /path/to/key.key
       password  s3cr3tP@ssword
       remove_keys  key31,key32
       tenant  0c3ba7a4-3148-4605-b62a-afc92dd1c4d7

diff --git a/apis/fluentd/v1alpha1/tests/tools.go b/apis/fluentd/v1alpha1/tests/tools.go
@@ -549,9 +549,9 @@ spec:
         - key32
       dropSingleKey: true
       includeThreadLabel: true
-#      tlsCaCertFile: /path/to/ca.pem
-#      tlsClientCertFile: /path/to/certificate.pem
-#      tlsPrivateKeyFile: /path/to/key.key
+      tlsCaCertFile: /path/to/ca.pem
+      tlsClientCertFile: /path/to/certificate.pem
+      tlsPrivateKeyFile: /path/to/key.key
       insecure: true
 `