Merge pull request #54 from oracle-quickstart/docker-image_upgrade_ru…

…by31

Ruby upgrade to 3.1.2 along with Fluentd and other dependency gem upd…

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 2023-10-31
+### Changed
+- Ruby upgrade from 2.7.8 to 3.1.2 for OL8-Slim Fluentd container image. It also includes Fluentd (1.15.3 to 1.16.2) and other dependency gem upgrades.
+
 ## 2023-09-26
 ### Changed
 - Ruby upgrade from 2.7.6 to 2.7.8 for OL8-Slim Fluentd container image.

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.0.2
+version: 3.1.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.0.0
+   url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.1.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.0.2
+version: 3.1.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.0.2"
+  version: "3.1.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.0.0
+    url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.1.0
   # Go to OCI Logging Analytics Administration, click Service Details, and note the namespace value.
   ociLANamespace:
   # OCI Logging Analytics Default Log Group OCID
@@ -52,4 +52,4 @@ oci-onm-mgmt-agent:
       # Replace this value with actual docker image URL for Management Agent
       url: container-registry.oracle.com/oci_observability_management/oci-management-agent:1.0.0
       # Image secrets to use for pulling container image (base64 encoded content of ~/.docker/config.json file)
-      secret:
+      secret:

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

@@ -11,20 +11,20 @@ USER root
 WORKDIR /fluentd
 
 # Environment variables
-ENV PATH /fluentd/vendor/bundle/ruby/2.7.0/bin:$PATH
-ENV GEM_PATH /fluentd/vendor/bundle/ruby/2.7.0:$GEM_PATH
-ENV GEM_HOME /fluentd/vendor/bundle/ruby/2.7.0
+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
 # 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:2.7 \
-# Install ruby (it's dependencies gdbm-libs) and ruby-libs, disabling week dependencies
- && microdnf -y install --setopt=install_weak_deps=0 --nodocs ruby-2.7.8 ruby-libs-2.7.8 gdbm-libs \
+RUN microdnf -y module enable ruby:3.1 \
+# Install ruby and ruby-libs, disabling week dependencies
+ && microdnf -y install --setopt=install_weak_deps=0 --nodocs ruby-3.1.2 ruby-libs-3.1.2 \
 # Install rubygems (it's dependencies rubygem-openssl rubygem-psych), disabling week dependencies
- && microdnf -y install --setopt=install_weak_deps=0 --nodocs rubygems-3.1.6 \
+ && microdnf -y install --setopt=install_weak_deps=0 --nodocs rubygems-3.3.7 \
  && gem install bundler -v 2.3.25 \
 # Install development dependent packages for gems native installation
  && microdnf -y install --nodocs gcc make redhat-rpm-config openssl ruby-devel gcc-c++ libtool libffi-devel bzip2 git \
@@ -34,8 +34,8 @@ RUN microdnf -y module enable ruby:2.7 \
  && bundle config --global jobs 9 \
  && bundle install --gemfile=/fluentd/Gemfile \
 # Install tini, init for containers (from EPEL repo)
- && microdnf -y install oracle-epel-release-el8 \
- && microdnf -y install tini-0.19.0 \
+ && microdnf -y install --setopt=install_weak_deps=0 --nodocs oracle-epel-release-el8 \
+ && microdnf -y install --nodocs tini-0.19.0 \
 # Install jemalloc (custom make with no docs)
  && cd /tmp && ls /tmp \
  && git clone -b 5.3.0 https://github.com/jemalloc/jemalloc.git && cd jemalloc/ \  
@@ -50,18 +50,18 @@ USER root
 WORKDIR /fluentd
 
 # Environment variables
-ENV PATH /fluentd/vendor/bundle/ruby/2.7.0/bin:$PATH
-ENV GEM_PATH /fluentd/vendor/bundle/ruby/2.7.0:$GEM_PATH
-ENV GEM_HOME /fluentd/vendor/bundle/ruby/2.7.0
+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
 # 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:2.7 \
-# Install ruby (it's dependencies gdbm-libs) and ruby-libs, disabling week dependencies
- && microdnf -y install --setopt=install_weak_deps=0 --nodocs ruby-2.7.8 ruby-libs-2.7.8 gdbm-libs \ 
+RUN microdnf -y module enable ruby:3.1 \
+# Install ruby and ruby-libs, disabling week dependencies
+ && microdnf -y install --setopt=install_weak_deps=0 --nodocs ruby-3.1.2 ruby-libs-3.1.2 \ 
 # Install rubygems (it's dependencies rubygem-openssl rubygem-psych), disabling week dependencies
- && microdnf -y install --setopt=install_weak_deps=0 --nodocs rubygems-3.1.6 \ 
+ && microdnf -y install --setopt=install_weak_deps=0 --nodocs rubygems-3.3.7 \ 
  && gem install bundler -v 2.3.25 \
  && bundle config --local path /fluentd/vendor/bundle \
 # clear caches

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

@@ -3,13 +3,12 @@
 
 source "https://rubygems.org"
 
-gem "oj", "3.14.1"
+gem "oj", "3.16.1"
 gem "json", "2.6.3"
-gem "ext_monitor", "0.1.2"
-gem "fluentd", "1.15.3"
+gem "fluentd", "1.16.2"
 gem "fluent-plugin-oci-logging-analytics", "2.0.5"
 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", "2.13.0"
-gem "fluent-plugin-kubernetes-objects", "1.2.1"
+gem "fluent-plugin-kubernetes_metadata_filter", "3.3.0"
+gem "fluent-plugin-kubernetes-objects", "1.2.3"

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

@@ -1,13 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
-    concurrent-ruby (1.2.0)
-    cool.io (1.7.1)
+    concurrent-ruby (1.2.2)
+    cool.io (1.8.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ext_monitor (0.1.2)
     ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
@@ -16,12 +15,12 @@ GEM
       fluentd (> 1.0.0, < 2)
     fluent-plugin-concat (2.5.0)
       fluentd (>= 0.14.0, < 2)
-    fluent-plugin-kubernetes-objects (1.2.1)
+    fluent-plugin-kubernetes-objects (1.2.3)
       fluentd (>= 1.9.1)
       http_parser.rb (= 0.8.0)
       kubeclient (~> 4.9.3)
-    fluent-plugin-kubernetes_metadata_filter (2.13.0)
-      fluentd (>= 0.14.0, < 1.16)
+    fluent-plugin-kubernetes_metadata_filter (3.3.0)
+      fluentd (>= 0.14.0, < 1.17)
       kubeclient (>= 4.0.0, < 5.0.0)
       lru_redux
     fluent-plugin-oci-logging-analytics (2.0.5)
@@ -35,17 +34,17 @@ GEM
     fluent-plugin-rewrite-tag-filter (2.4.0)
       fluent-config-regexp-type
       fluentd (>= 0.14.2, < 2)
-    fluentd (1.15.3)
+    fluentd (1.16.2)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
       msgpack (>= 1.3.1, < 2.0.0)
-      serverengine (>= 2.3.0, < 3.0.0)
-      sigdump (~> 0.2.2)
+      serverengine (>= 2.3.2, < 3.0.0)
+      sigdump (~> 0.2.5)
       strptime (>= 0.2.4, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
-      webrick (>= 1.4.2, < 1.8.0)
+      webrick (~> 1.4)
       yajl-ruby (~> 1.0)
     http (4.4.1)
       addressable (~> 2.3)
@@ -61,28 +60,28 @@ GEM
     http_parser.rb (0.8.0)
     inifile (3.0.0)
     json (2.6.3)
-    jsonpath (1.1.2)
+    jsonpath (1.1.4)
       multi_json
-    jwt (2.7.0)
+    jwt (2.7.1)
     kubeclient (4.9.3)
       http (>= 3.0, < 5.0)
       jsonpath (~> 1.0)
       recursive-open-struct (~> 1.1, >= 1.1.1)
       rest-client (~> 2.0)
     lru_redux (1.1.0)
-    mime-types (3.4.1)
+    mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    msgpack (1.7.1)
+    mime-types-data (3.2023.1003)
+    msgpack (1.7.2)
     multi_json (1.15.0)
     netrc (0.11.0)
     oci (2.18.0)
       inifile (~> 3.0, >= 3.0.0)
       json (>= 1.4.6, < 3.0.0)
       jwt (~> 2.1)
-    oj (3.14.1)
+    oj (3.16.1)
     prometheus-client (4.0.0)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     rake (13.0.6)
     recursive-open-struct (1.1.3)
     rest-client (2.1.0)
@@ -91,34 +90,34 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     rubyzip (2.3.2)
-    serverengine (2.3.1)
+    serverengine (2.3.2)
       sigdump (~> 0.2.2)
-    sigdump (0.2.4)
+    sigdump (0.2.5)
+    stringio (3.0.8)
     strptime (0.2.5)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.7)
+    tzinfo-data (1.2023.3)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    webrick (1.7.0)
+    webrick (1.8.1)
     yajl-ruby (1.4.3)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  ext_monitor (= 0.1.2)
   fluent-plugin-concat (~> 2.5.0)
-  fluent-plugin-kubernetes-objects (= 1.2.1)
-  fluent-plugin-kubernetes_metadata_filter (= 2.13.0)
+  fluent-plugin-kubernetes-objects (= 1.2.3)
+  fluent-plugin-kubernetes_metadata_filter (= 3.3.0)
   fluent-plugin-oci-logging-analytics (= 2.0.5)
   fluent-plugin-parser-cri (~> 0.1.1)
   fluent-plugin-rewrite-tag-filter (~> 2.4.0)
-  fluentd (= 1.15.3)
+  fluentd (= 1.16.2)
   json (= 2.6.3)
-  oj (= 3.14.1)
+  oj (= 3.16.1)
 
 BUNDLED WITH
    2.3.25