From 475519c5802fe80b9a4c8e45d6ba61c572658a9e Mon Sep 17 00:00:00 2001 From: Tarun Gupta Akirala Date: Fri, 24 May 2024 22:44:40 +0530 Subject: [PATCH] feat: bump logging-operator:4.2.4 fluent-bit:0.39.0 (#2246) --- licenses.d2iq.yaml | 4 ++-- services/fluent-bit/{0.38.0 => 0.39.0}/defaults/cm.yaml | 4 ++-- .../{0.38.0 => 0.39.0}/defaults/kustomization.yaml | 0 services/fluent-bit/{0.38.0 => 0.39.0}/fluent-bit.yaml | 4 ++-- .../grafana-dashboards-logging/audit.json | 0 .../grafana-dashboards-logging/kustomization.yaml | 0 .../{0.38.0 => 0.39.0}/grafana-dashboards/fluent-bit.json | 0 .../grafana-dashboards/kustomization.yaml | 0 services/fluent-bit/{0.38.0 => 0.39.0}/kustomization.yaml | 0 services/logging-operator/{4.2.3 => 4.2.4}/defaults/cm.yaml | 6 +++--- .../{4.2.3 => 4.2.4}/defaults/kustomization.yaml | 0 services/logging-operator/{4.2.3 => 4.2.4}/extra-images.txt | 0 .../{4.2.3 => 4.2.4}/grafana-dashboards/kustomization.yaml | 0 .../grafana-dashboards/logging-operator.json | 0 .../grafana-dashboards/logging-stack-stress.json | 0 .../logging-operator/{4.2.3 => 4.2.4}/kustomization.yaml | 0 .../{4.2.3 => 4.2.4}/logging-operator-logging.yaml | 2 +- .../logging-operator/{4.2.3 => 4.2.4}/logging-operator.yaml | 2 +- 18 files changed, 11 insertions(+), 11 deletions(-) rename services/fluent-bit/{0.38.0 => 0.39.0}/defaults/cm.yaml (98%) rename services/fluent-bit/{0.38.0 => 0.39.0}/defaults/kustomization.yaml (100%) rename services/fluent-bit/{0.38.0 => 0.39.0}/fluent-bit.yaml (91%) rename services/fluent-bit/{0.38.0 => 0.39.0}/grafana-dashboards-logging/audit.json (100%) rename services/fluent-bit/{0.38.0 => 0.39.0}/grafana-dashboards-logging/kustomization.yaml (100%) rename services/fluent-bit/{0.38.0 => 0.39.0}/grafana-dashboards/fluent-bit.json (100%) rename services/fluent-bit/{0.38.0 => 0.39.0}/grafana-dashboards/kustomization.yaml (100%) rename services/fluent-bit/{0.38.0 => 0.39.0}/kustomization.yaml (100%) rename services/logging-operator/{4.2.3 => 4.2.4}/defaults/cm.yaml (97%) rename services/logging-operator/{4.2.3 => 4.2.4}/defaults/kustomization.yaml (100%) rename services/logging-operator/{4.2.3 => 4.2.4}/extra-images.txt (100%) rename services/logging-operator/{4.2.3 => 4.2.4}/grafana-dashboards/kustomization.yaml (100%) rename services/logging-operator/{4.2.3 => 4.2.4}/grafana-dashboards/logging-operator.json (100%) rename services/logging-operator/{4.2.3 => 4.2.4}/grafana-dashboards/logging-stack-stress.json (100%) rename services/logging-operator/{4.2.3 => 4.2.4}/kustomization.yaml (100%) rename services/logging-operator/{4.2.3 => 4.2.4}/logging-operator-logging.yaml (94%) rename services/logging-operator/{4.2.3 => 4.2.4}/logging-operator.yaml (93%) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index 25e077475..16ce5735d 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -72,7 +72,7 @@ ignore: - nvcr.io/nvidia/k8s/cuda-sample:vectoradd-cuda10.2 resources: - - container_image: cr.fluentbit.io/fluent/fluent-bit:2.1.4 + - container_image: cr.fluentbit.io/fluent/fluent-bit:2.2.3 sources: - license_path: LICENSE ref: v${image_tag} @@ -87,7 +87,7 @@ resources: - license_path: LICENSE ref: v${image_tag%-debian-11-r0} url: https://github.com/thanos-io/thanos - - container_image: docker.io/fluent/fluent-bit:2.1.4 + - container_image: docker.io/fluent/fluent-bit:2.2.3 sources: - license_path: LICENSE ref: v${image_tag} diff --git a/services/fluent-bit/0.38.0/defaults/cm.yaml b/services/fluent-bit/0.39.0/defaults/cm.yaml similarity index 98% rename from services/fluent-bit/0.38.0/defaults/cm.yaml rename to services/fluent-bit/0.39.0/defaults/cm.yaml index 82a18f2fb..86c4dcea4 100644 --- a/services/fluent-bit/0.38.0/defaults/cm.yaml +++ b/services/fluent-bit/0.39.0/defaults/cm.yaml @@ -1,14 +1,14 @@ apiVersion: v1 kind: ConfigMap metadata: - name: fluent-bit-0.38.0-d2iq-defaults + name: fluent-bit-0.39.0-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | --- # overriding the default image tag to be consistent with logging-operator image: - tag: 2.1.4 + tag: 2.2.3 priorityClassName: "dkp-critical-priority" resources: diff --git a/services/fluent-bit/0.38.0/defaults/kustomization.yaml b/services/fluent-bit/0.39.0/defaults/kustomization.yaml similarity index 100% rename from services/fluent-bit/0.38.0/defaults/kustomization.yaml rename to services/fluent-bit/0.39.0/defaults/kustomization.yaml diff --git a/services/fluent-bit/0.38.0/fluent-bit.yaml b/services/fluent-bit/0.39.0/fluent-bit.yaml similarity index 91% rename from services/fluent-bit/0.38.0/fluent-bit.yaml rename to services/fluent-bit/0.39.0/fluent-bit.yaml index 471c08dbe..85a330c1a 100644 --- a/services/fluent-bit/0.38.0/fluent-bit.yaml +++ b/services/fluent-bit/0.39.0/fluent-bit.yaml @@ -13,7 +13,7 @@ spec: namespace: kommander-flux # This chart version should be kept in sync with logging-operator. # Both services should deploy the same version of fluent-bit. - version: 0.38.0 + version: 0.39.0 interval: 15s install: crds: CreateReplace @@ -27,4 +27,4 @@ spec: releaseName: kommander-fluent-bit valuesFrom: - kind: ConfigMap - name: fluent-bit-0.38.0-d2iq-defaults + name: fluent-bit-0.39.0-d2iq-defaults diff --git a/services/fluent-bit/0.38.0/grafana-dashboards-logging/audit.json b/services/fluent-bit/0.39.0/grafana-dashboards-logging/audit.json similarity index 100% rename from services/fluent-bit/0.38.0/grafana-dashboards-logging/audit.json rename to services/fluent-bit/0.39.0/grafana-dashboards-logging/audit.json diff --git a/services/fluent-bit/0.38.0/grafana-dashboards-logging/kustomization.yaml b/services/fluent-bit/0.39.0/grafana-dashboards-logging/kustomization.yaml similarity index 100% rename from services/fluent-bit/0.38.0/grafana-dashboards-logging/kustomization.yaml rename to services/fluent-bit/0.39.0/grafana-dashboards-logging/kustomization.yaml diff --git a/services/fluent-bit/0.38.0/grafana-dashboards/fluent-bit.json b/services/fluent-bit/0.39.0/grafana-dashboards/fluent-bit.json similarity index 100% rename from services/fluent-bit/0.38.0/grafana-dashboards/fluent-bit.json rename to services/fluent-bit/0.39.0/grafana-dashboards/fluent-bit.json diff --git a/services/fluent-bit/0.38.0/grafana-dashboards/kustomization.yaml b/services/fluent-bit/0.39.0/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/fluent-bit/0.38.0/grafana-dashboards/kustomization.yaml rename to services/fluent-bit/0.39.0/grafana-dashboards/kustomization.yaml diff --git a/services/fluent-bit/0.38.0/kustomization.yaml b/services/fluent-bit/0.39.0/kustomization.yaml similarity index 100% rename from services/fluent-bit/0.38.0/kustomization.yaml rename to services/fluent-bit/0.39.0/kustomization.yaml diff --git a/services/logging-operator/4.2.3/defaults/cm.yaml b/services/logging-operator/4.2.4/defaults/cm.yaml similarity index 97% rename from services/logging-operator/4.2.3/defaults/cm.yaml rename to services/logging-operator/4.2.4/defaults/cm.yaml index 22e5b938c..9fb1a8e16 100644 --- a/services/logging-operator/4.2.3/defaults/cm.yaml +++ b/services/logging-operator/4.2.4/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: logging-operator-4.2.3-d2iq-defaults + name: logging-operator-4.2.4-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: |- @@ -27,7 +27,7 @@ data: apiVersion: v1 kind: ConfigMap metadata: - name: logging-operator-logging-4.2.3-d2iq-defaults + name: logging-operator-logging-4.2.4-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | @@ -112,7 +112,7 @@ data: # Explicitly specify the version here. This should be updated when logging-operator is upgraded. # Also, update the image in fluent-bit configuration if the image is upgraded here. repository: fluent/fluent-bit - tag: 2.1.4 + tag: 2.2.3 resources: limits: memory: 750Mi diff --git a/services/logging-operator/4.2.3/defaults/kustomization.yaml b/services/logging-operator/4.2.4/defaults/kustomization.yaml similarity index 100% rename from services/logging-operator/4.2.3/defaults/kustomization.yaml rename to services/logging-operator/4.2.4/defaults/kustomization.yaml diff --git a/services/logging-operator/4.2.3/extra-images.txt b/services/logging-operator/4.2.4/extra-images.txt similarity index 100% rename from services/logging-operator/4.2.3/extra-images.txt rename to services/logging-operator/4.2.4/extra-images.txt diff --git a/services/logging-operator/4.2.3/grafana-dashboards/kustomization.yaml b/services/logging-operator/4.2.4/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/logging-operator/4.2.3/grafana-dashboards/kustomization.yaml rename to services/logging-operator/4.2.4/grafana-dashboards/kustomization.yaml diff --git a/services/logging-operator/4.2.3/grafana-dashboards/logging-operator.json b/services/logging-operator/4.2.4/grafana-dashboards/logging-operator.json similarity index 100% rename from services/logging-operator/4.2.3/grafana-dashboards/logging-operator.json rename to services/logging-operator/4.2.4/grafana-dashboards/logging-operator.json diff --git a/services/logging-operator/4.2.3/grafana-dashboards/logging-stack-stress.json b/services/logging-operator/4.2.4/grafana-dashboards/logging-stack-stress.json similarity index 100% rename from services/logging-operator/4.2.3/grafana-dashboards/logging-stack-stress.json rename to services/logging-operator/4.2.4/grafana-dashboards/logging-stack-stress.json diff --git a/services/logging-operator/4.2.3/kustomization.yaml b/services/logging-operator/4.2.4/kustomization.yaml similarity index 100% rename from services/logging-operator/4.2.3/kustomization.yaml rename to services/logging-operator/4.2.4/kustomization.yaml diff --git a/services/logging-operator/4.2.3/logging-operator-logging.yaml b/services/logging-operator/4.2.4/logging-operator-logging.yaml similarity index 94% rename from services/logging-operator/4.2.3/logging-operator-logging.yaml rename to services/logging-operator/4.2.4/logging-operator-logging.yaml index 0147421f4..519a0edcb 100644 --- a/services/logging-operator/4.2.3/logging-operator-logging.yaml +++ b/services/logging-operator/4.2.4/logging-operator-logging.yaml @@ -27,7 +27,7 @@ spec: releaseName: logging-operator-logging valuesFrom: - kind: ConfigMap - name: logging-operator-logging-4.2.3-d2iq-defaults + name: logging-operator-logging-4.2.4-d2iq-defaults # FIXME: To make logging-operator-logging work properly with federated # overrides, the `logging-operator` app should be split into two, # after which this enntry should be replaced with `configOverrides` diff --git a/services/logging-operator/4.2.3/logging-operator.yaml b/services/logging-operator/4.2.4/logging-operator.yaml similarity index 93% rename from services/logging-operator/4.2.3/logging-operator.yaml rename to services/logging-operator/4.2.4/logging-operator.yaml index 3fb98e30b..f9a13aa98 100644 --- a/services/logging-operator/4.2.3/logging-operator.yaml +++ b/services/logging-operator/4.2.4/logging-operator.yaml @@ -25,4 +25,4 @@ spec: releaseName: logging-operator valuesFrom: - kind: ConfigMap - name: logging-operator-4.2.3-d2iq-defaults + name: logging-operator-4.2.4-d2iq-defaults