Merge pull request #82 from oracle-quickstart/v3.4.3

v3.4.3

Author: santhoshkvuda

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 2024-06-18
+### Changed
+- Fluentd collector container image uptake to 1.4.3 having OS and other dependency updates.
+- Dockerfile (supporting custom container image builds) changes to remove patch version dependency on ruby 3.1 and related packages.
+
 ## 2024-05-13
 ### Changed
 - Fluentd collector container image uptake to 1.4.2 having changes to uptake OCI 2.21.0. 

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.2
+version: 3.4.3
 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.2
+   url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.4.3
    # -- 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.2
+version: 3.4.3
 
 # 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.2"
+  version: "3.4.3"
   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.2
+    url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.4.3
   # 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

@@ -22,9 +22,9 @@ COPY Gemfile* /fluentd/
 # Install ruby, ruby-libs along with rubygems and bundler.
 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 \
+ && 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-3.3.7 \
+ && microdnf -y install --setopt=install_weak_deps=0 --nodocs rubygems \
  && gem install bundler -v 2.3.25 \
 # 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 \
@@ -59,9 +59,9 @@ ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1
 # Install ruby, ruby-libs along with rubygems and bundler.
 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 \ 
+ && 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-3.3.7 \ 
+ && microdnf -y install --setopt=install_weak_deps=0 --nodocs rubygems \ 
  && gem install bundler -v 2.3.25 \
  && bundle config --local path /fluentd/vendor/bundle \
 # clear caches