Merge pull request #15 from kube-logging/sync-1

sync from kube-logging/logging-operator/e2e/charts
kube-logging · Mar 29, 2023 · 0d4ac87 · 0d4ac87
2 parents 6a5120d + d7a0894
commit 0d4ac87
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 30 deletions.
diff --git a/charts/logging-operator-logging/Chart.yaml b/charts/logging-operator-logging/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 type: application
 name: logging-operator-logging
-version: 4.1.0-dev.1
+version: 4.1.0-dev.2
 kubeVersion: ">=1.16.0-0"
 description: A Helm chart to configure logging resource for the Logging operator.
 keywords:
@@ -20,10 +20,12 @@ annotations:
     - name: fluent-bit
       image: fluent/fluent-bit:1.9.5
     - name: fluentd
-      image: ghcr.io/kube-logging/fluentd:v1.14.6
+      image: ghcr.io/kube-logging/fluentd:v1.14
     - name: syslog-ng
-      image: ghcr.io/axoflow/syslog-ng:4.0.1_git20230225
+      image: ghcr.io/axoflow/syslog-ng:4.1.1
     - name: logging-operator
       image: ghcr.io/kube-logging/logging-operator:4.0.0
     - name: config-reloader
       image: ghcr.io/kube-logging/config-reloader:v0.0.2
+    - name: node-exporter
+      image: ghcr.io/kube-logging/node-exporter:v0.3.0
diff --git a/charts/logging-operator-logging/README.md b/charts/logging-operator-logging/README.md
@@ -1,6 +1,6 @@
 # logging-operator-logging
 
-![version: 4.1.0-dev.1](https://img.shields.io/badge/version-4.1.0--dev.1-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square)  ![kube version: >=1.16.0-0](https://img.shields.io/badge/kube%20version->=1.16.0--0-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-logging--operator--logging-informational?style=flat-square)](https://artifacthub.io/packages/helm/kube-logging/logging-operator-logging)
+![version: 4.1.0-dev.2](https://img.shields.io/badge/version-4.1.0--dev.2-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square)  ![kube version: >=1.16.0-0](https://img.shields.io/badge/kube%20version->=1.16.0--0-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-logging--operator--logging-informational?style=flat-square)](https://artifacthub.io/packages/helm/kube-logging/logging-operator-logging)
 
 A Helm chart to configure logging resource for the Logging operator.
 

diff --git a/charts/logging-operator-logging/templates/eventtailer.yaml b/charts/logging-operator-logging/templates/eventtailer.yaml
@@ -5,15 +5,7 @@ metadata:
   name: {{ .name | default "event-tailer" }}
 spec:
   controlNamespace: {{ $.Values.controlNamespace | default $.Release.Namespace }}
-{{- with .workloadOverrides }}
-  workloadOverrides:
-{{ toYaml . | indent 4 }}
-{{- end }}
-{{- with .containerOverrides }}
-  containerOverrides:
-{{- toYaml . | nindent 4 }}
-{{- end }}
-{{- with .pvc }}
+  {{- with .pvc }}
   positionVolume:
     pvc:
       spec:
@@ -22,8 +14,20 @@ spec:
           requests:
             storage: {{ .storage | default "1Gi" }}
         volumeMode: {{ .volumeMode | default "Filesystem" }}
-{{- with .storageClassName }}
+        {{- with .storageClassName }}
         storageClassName: {{ . }}
-{{- end }}
-{{- end }}
+        {{- end }}
+  {{- end }}
+  {{- with .workloadMetaOverrides }}
+  workloadMetaOverrides:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .workloadOverrides }}
+  workloadOverrides:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .containerOverrides }}
+  containerOverrides:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 {{- end }}
diff --git a/charts/logging-operator/Chart.yaml b/charts/logging-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 type: application
 name: logging-operator
-version: 4.1.0-dev.1
+version: 4.1.0-dev.2
 appVersion: 4.0.0
 kubeVersion: ">=1.16.0-0"
 description: Logging operator for Kubernetes based on Fluentd and Fluentbit.

diff --git a/charts/logging-operator/README.md b/charts/logging-operator/README.md
@@ -1,6 +1,6 @@
 # logging-operator
 
-![version: 4.1.0-dev.1](https://img.shields.io/badge/version-4.1.0--dev.1-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 4.0.0](https://img.shields.io/badge/app%20version-4.0.0-informational?style=flat-square) ![kube version: >=1.16.0-0](https://img.shields.io/badge/kube%20version->=1.16.0--0-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-logging--operator-informational?style=flat-square)](https://artifacthub.io/packages/helm/kube-logging/logging-operator)
+![version: 4.1.0-dev.2](https://img.shields.io/badge/version-4.1.0--dev.2-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 4.0.0](https://img.shields.io/badge/app%20version-4.0.0-informational?style=flat-square) ![kube version: >=1.16.0-0](https://img.shields.io/badge/kube%20version->=1.16.0--0-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-logging--operator-informational?style=flat-square)](https://artifacthub.io/packages/helm/kube-logging/logging-operator)
 
 Logging operator for Kubernetes based on Fluentd and Fluentbit.
 

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_clusterflows.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_clusterflows.yaml
@@ -274,12 +274,12 @@ spec:
                       properties:
                         backend_library:
                           type: string
-                        geoip_2_database:
-                          type: string
                         geoip_database:
                           type: string
                         geoip_lookup_keys:
                           type: string
+                        geoip2_database:
+                          type: string
                         records:
                           items:
                             additionalProperties:
@@ -1297,12 +1297,12 @@ spec:
                       properties:
                         backend_library:
                           type: string
-                        geoip_2_database:
-                          type: string
                         geoip_database:
                           type: string
                         geoip_lookup_keys:
                           type: string
+                        geoip2_database:
+                          type: string
                         records:
                           items:
                             additionalProperties:

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_flows.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_flows.yaml
@@ -274,12 +274,12 @@ spec:
                       properties:
                         backend_library:
                           type: string
-                        geoip_2_database:
-                          type: string
                         geoip_database:
                           type: string
                         geoip_lookup_keys:
                           type: string
+                        geoip2_database:
+                          type: string
                         records:
                           items:
                             additionalProperties:
@@ -1293,12 +1293,12 @@ spec:
                       properties:
                         backend_library:
                           type: string
-                        geoip_2_database:
-                          type: string
                         geoip_database:
                           type: string
                         geoip_lookup_keys:
                           type: string
+                        geoip2_database:
+                          type: string
                         records:
                           items:
                             additionalProperties:

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml
@@ -292,12 +292,12 @@ spec:
                           properties:
                             backend_library:
                               type: string
-                            geoip_2_database:
-                              type: string
                             geoip_database:
                               type: string
                             geoip_lookup_keys:
                               type: string
+                            geoip2_database:
+                              type: string
                             records:
                               items:
                                 additionalProperties:
@@ -5336,12 +5336,12 @@ spec:
                       properties:
                         backend_library:
                           type: string
-                        geoip_2_database:
-                          type: string
                         geoip_database:
                           type: string
                         geoip_lookup_keys:
                           type: string
+                        geoip2_database:
+                          type: string
                         records:
                           items:
                             additionalProperties:
@@ -17387,6 +17387,10 @@ spec:
                 additionalProperties:
                   type: boolean
                 type: object
+              problems:
+                items:
+                  type: string
+                type: array
             type: object
         type: object
     served: true