| commit | f99eaec0adec5d39ac2c38905656335735484bde | [log] [tgz] |
|---|---|---|
| author | Matthias Sohn <matthias.sohn@gmail.com> | Wed Feb 07 14:18:23 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Feb 07 14:18:23 2024 +0000 |
| tree | fab22f51ec06d73a8ab91ff623ae9b33f8909b9f | |
| parent | 315cdb3deb0e4351f7f37e0cb079dba99c3b62c2 [diff] | |
| parent | a2e7b6c7d60314a4ff5752b9cc88b062a1a8e55c [diff] |
Merge "Auto-format source code (done by the Maven build)"
diff --git a/operator/src/main/java/com/google/gerrit/k8s/operator/api/model/shared/FluentBitSidecarConfig.java b/operator/src/main/java/com/google/gerrit/k8s/operator/api/model/shared/FluentBitSidecarConfig.java index c2380de..eb8e269 100644 --- a/operator/src/main/java/com/google/gerrit/k8s/operator/api/model/shared/FluentBitSidecarConfig.java +++ b/operator/src/main/java/com/google/gerrit/k8s/operator/api/model/shared/FluentBitSidecarConfig.java
@@ -16,7 +16,8 @@ public class FluentBitSidecarConfig { private String image = "fluent/fluent-bit:latest"; - private String config = """ + private String config = + """ [OUTPUT] Name stdout Match *
diff --git a/operator/src/main/java/com/google/gerrit/k8s/operator/cluster/dependent/FluentBitConfigMap.java b/operator/src/main/java/com/google/gerrit/k8s/operator/cluster/dependent/FluentBitConfigMap.java index 7945f6a..9158110 100644 --- a/operator/src/main/java/com/google/gerrit/k8s/operator/cluster/dependent/FluentBitConfigMap.java +++ b/operator/src/main/java/com/google/gerrit/k8s/operator/cluster/dependent/FluentBitConfigMap.java
@@ -37,14 +37,15 @@ @Override protected ConfigMap desired(Gerrit gerrit, Context<Gerrit> context) { String customConfig = gerrit.getSpec().getFluentBitSidecar().getConfig(); - String config = """ + String config = + """ [INPUT] Name tail Path /var/mnt/logs/*log Tag <log_name> Tag_Regex ^\\/var\\/mnt\\/logs\\/(?<log_name>[^*]+)\n """ - + customConfig; + + customConfig; return new ConfigMapBuilder() .withApiVersion("v1")