Merge pull request #89 from oracle-quickstart/ruby_3.3.1_upgrade

Release v3.5.0

Author: santhoshkvuda

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 2024-09-19
+### Changed
+- Fluentd collector container image uptake to 1.5.0 having OS update, Ruby 3.3.1 upgrade and other dependency gem updates.
+  - Similar updates to build files (Dockerfile, Gemfile) that helps building custom container image.
+
 ## 2024-07-08
 ### Added
 - Option to disable JRE default security property for Agent.

charts/logan/Chart.yaml

@@ -5,7 +5,7 @@ apiVersion: v2
 name: oci-onm-logan
 description: Charts for sending Kubernetes platform logs, compute logs, and Kubernetes Objects information to OCI Logging Analytics.
 type: application
-version: 3.4.4
+version: 3.5.0
 appVersion: "3.0.0"
 
 dependencies:

charts/logan/values.yaml

@@ -48,7 +48,7 @@ image:
    # Image pull secrets for. Secret must be in the namespace defined by namespace
    imagePullSecrets:
    # -- Replace this value with actual docker image url
-   url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.4.3
+   url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.5.0
    # -- Image pull policy
    imagePullPolicy: Always
 

charts/oci-onm/Chart.yaml

@@ -18,7 +18,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.4.4
+version: 3.5.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -32,7 +32,7 @@ dependencies:
   repository: "file://../common"
   condition: oci-onm-common.enabled
 - name: oci-onm-logan
-  version: "3.4.4"
+  version: "3.5.0"
   repository: "file://../logan"
   condition: oci-onm-logan.enabled
 - name: oci-onm-mgmt-agent

charts/oci-onm/values.yaml

@@ -31,7 +31,7 @@ oci-onm-logan:
   kubernetesClusterID: "{{ .Values.global.kubernetesClusterID }}"
   kubernetesClusterName: "{{ .Values.global.kubernetesClusterName }}"
   image:
-    url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.4.3
+    url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.5.0
   # Go to OCI Logging Analytics Administration, click Service Details, and note the namespace value.
   ociLANamespace:
   # OCI Logging Analytics Default Log Group OCID

logan/docker-images/v1.0/oraclelinux/8-slim/Dockerfile

@@ -11,21 +11,21 @@ USER root
 WORKDIR /fluentd
 
 # Environment variables
-ENV PATH /fluentd/vendor/bundle/ruby/3.1.0/bin:$PATH
-ENV GEM_PATH /fluentd/vendor/bundle/ruby/3.1.0:$GEM_PATH
-ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.1.0
+ENV PATH /fluentd/vendor/bundle/ruby/3.3/bin:$PATH
+ENV GEM_PATH /fluentd/vendor/bundle/ruby/3.3:$GEM_PATH
+ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.3
 # skip runtime bundler installation
 ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1
 
 COPY Gemfile* /fluentd/
 
 # Install ruby, ruby-libs along with rubygems and bundler.
-RUN microdnf -y module enable ruby:3.1 \
+RUN microdnf -y module enable ruby:3.3 \
 # Install ruby and ruby-libs, disabling week dependencies
  && microdnf -y install --setopt=install_weak_deps=0 --nodocs ruby ruby-libs \
 # Install rubygems (it's dependencies rubygem-openssl rubygem-psych), disabling week dependencies
  && microdnf -y install --setopt=install_weak_deps=0 --nodocs rubygems \
- && gem install bundler -v 2.3.25 \
+ && gem install bundler -v 2.5.16 \
 # Install development dependent packages for gems native installation
  && microdnf --enablerepo ol8_codeready_builder -y install --nodocs gcc make redhat-rpm-config openssl ruby-devel gcc-c++ libtool libffi-devel bzip2 git libyaml-devel \
 # Install Fluentd, it's dependencies along with other run time dependencies for OCI Logging Analytics Solution
@@ -50,19 +50,19 @@ USER root
 WORKDIR /fluentd
 
 # Environment variables
-ENV PATH /fluentd/vendor/bundle/ruby/3.1.0/bin:$PATH
-ENV GEM_PATH /fluentd/vendor/bundle/ruby/3.1.0:$GEM_PATH
-ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.1.0
+ENV PATH /fluentd/vendor/bundle/ruby/3.3/bin:$PATH
+ENV GEM_PATH /fluentd/vendor/bundle/ruby/3.3:$GEM_PATH
+ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.3
 # skip runtime bundler installation
 ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1
 
 # Install ruby, ruby-libs along with rubygems and bundler.
-RUN microdnf -y module enable ruby:3.1 \
+RUN microdnf -y module enable ruby:3.3 \
 # Install ruby and ruby-libs, disabling week dependencies
  && microdnf -y install --setopt=install_weak_deps=0 --nodocs ruby ruby-libs \ 
 # Install rubygems (it's dependencies rubygem-openssl rubygem-psych), disabling week dependencies
  && microdnf -y install --setopt=install_weak_deps=0 --nodocs rubygems \ 
- && gem install bundler -v 2.3.25 \
+ && gem install bundler -v 2.5.16 \
  && bundle config --local path /fluentd/vendor/bundle \
 # clear caches
  && microdnf clean all \

logan/docker-images/v1.0/oraclelinux/8-slim/Gemfile

@@ -3,16 +3,16 @@
 
 source "https://rubygems.org"
 
-gem "oj", "3.16.1"
-gem "json", "2.7.1"
-gem "fluentd", "1.16.2"
+gem "oj", "3.16.4"
+gem "json", "2.7.2"
+gem "fluentd", "1.17.1"
 gem "fluent-plugin-oci-logging-analytics", "2.0.6"
 gem "fluent-plugin-concat", "~> 2.5.0"
 gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0"
 gem "fluent-plugin-parser-cri", "~> 0.1.1"
-gem "fluent-plugin-kubernetes_metadata_filter", "3.3.0"
-gem "oci-logging-analytics-kubernetes-discovery", "1.0.1"
-gem "fluent-plugin-record-modifier", "2.1.1"
+gem "fluent-plugin-kubernetes_metadata_filter", "3.5.0"
+gem "oci-logging-analytics-kubernetes-discovery", "1.0.2"
+gem "fluent-plugin-record-modifier", "2.2.0"
 gem "fluent-plugin-cloudwatch-logs", "0.14.3"
 gem "fluent-plugin-s3", "1.7.2"
-gem "rexml", "3.2.6"
+gem "rexml", "3.3.7"