Update Helm Operator to 4.13.0

.github/workflows/dev_builds.yaml

@@ -7,87 +7,87 @@
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       OPERATOR_IMAGE_NAME: sumologic-kubernetes-collection-helm-operator-dev
       BUNDLE_IMAGE_NAME: sumologic-kubernetes-collection-helm-operator-bundle-dev
       CATALOG_IMAGE_NAME: sumologic-kubernetes-collection-helm-operator-catalog-dev
 
       ECR_URL: public.ecr.aws/sumologic
       LATEST_TAG: "latest"
 
     steps:
       - uses: actions/checkout@v2.3.4
 
       - name: Install Operator Package Manager (OPM)
         run: |
           sudo wget -q "https://github.com/operator-framework/operator-registry/releases/download/${OPM_VERSION}/linux-amd64-opm" -O /usr/bin/opm && sudo chmod +x /usr/bin/opm
         env:
           OPM_VERSION: v1.45.0
 
       - name: Checkout submodules
         run: git submodule update --init
 
       - name: Extract tag
         id: extract_tag
         run: echo "tag=$(echo $(git describe --tags --always))" >> $GITHUB_OUTPUT
 
       - name: Print tag
         run: echo "Running release build for ${{ steps.extract_tag.outputs.tag }}"
 
       - name: Extract release number
         id: extract_release_number
         # count git tags omitting rc versions
         run: echo "release_number=$(echo $(git tag | sed '/rc/d' | wc -l))" >> $GITHUB_OUTPUT
 
       - name: Log in to AWS Public ECR to publish operator
         run: make login-ecr
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_OPERATOR_DEV }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_OPERATOR_DEV }}
 
       - name: Build and push operator image
         run: make docker-build docker-push \
           IMG=${ECR_URL}/${OPERATOR_IMAGE_NAME}:${{ steps.extract_tag.outputs.tag }} \
           VERSION=${{ steps.extract_tag.outputs.tag }} \
           RELEASE_NUMBER=${{ steps.extract_release_number.outputs.release_number }}
 
       - name: Set 'latest' tag for operator image
         run: docker tag ${ECR_URL}/${OPERATOR_IMAGE_NAME}:${{ steps.extract_tag.outputs.tag }} ${ECR_URL}/${OPERATOR_IMAGE_NAME}:${LATEST_TAG}
 
       - name: Push 'latest' tag for operator image
         run: make docker-push IMG=${ECR_URL}/${OPERATOR_IMAGE_NAME}:${LATEST_TAG}
 
       - name: Log in to AWS Public ECR to publish bundle
         run: make login-ecr
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_BUNDLE_DEV }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_BUNDLE_DEV }}
 
       - name: Build and push bundle image
         run: make bundle-build bundle-push \
           BUNDLE_IMG=${ECR_URL}/${BUNDLE_IMAGE_NAME}:${{ steps.extract_tag.outputs.tag }}
 
       - name: Set 'latest' tag for bundle image
         run: docker tag ${ECR_URL}/${BUNDLE_IMAGE_NAME}:${{ steps.extract_tag.outputs.tag }} ${ECR_URL}/${BUNDLE_IMAGE_NAME}:${LATEST_TAG}
 
       - name: Push 'latest' tag for bundle image
         run: make docker-push IMG=${ECR_URL}/${BUNDLE_IMAGE_NAME}:${LATEST_TAG}
 
       - name: Log in to AWS Public ECR to publish catalog
         run: make login-ecr
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_CATALOG_DEV }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_CATALOG_DEV }}
 
       - name: Build and push catalog image
         run: make catalog-build catalog-push \
           CATALOG_IMG=${ECR_URL}/${CATALOG_IMAGE_NAME}:${{ steps.extract_tag.outputs.tag }} \
           BUNDLE_IMGS=${ECR_URL}/${BUNDLE_IMAGE_NAME}:${{ steps.extract_tag.outputs.tag }}
 
       - name: Set 'latest' tag for catalog image
         run: docker tag ${ECR_URL}/${CATALOG_IMAGE_NAME}:${{ steps.extract_tag.outputs.tag }} ${ECR_URL}/${CATALOG_IMAGE_NAME}:${LATEST_TAG}
 
       - name: Push 'latest' tag for catalog image
         run: make docker-push IMG=${ECR_URL}/${CATALOG_IMAGE_NAME}:${LATEST_TAG}
 

.github/workflows/pull_requests.yml

@@ -8,33 +8,33 @@
 
 jobs:
   check:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - name: Install shellcheck
         run: |
             curl --retry 10 --retry-max-time 120 --retry-delay 5 -Lo- https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.x86_64.tar.xz | tar -xJf -
             sudo cp shellcheck-v0.7.1/shellcheck /usr/local/bin && rm -rf shellcheck-v0.7.1
       - name: shellcheck
         run: make shellcheck
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: '3.11.6' # set the same Python version as in Vagrant virtual machine
       - name: Install pylint
         run: sudo apt-get install --yes pylint
       - name: Run pylint
         run: make pylint
       - name: Install black for formatting of Python scripts
         run: sudo apt-get install --yes black
       - name: Check black version
         run: black --version
       - name: Check formatting of Python scripts
         run: make black-check
 
   test-bundle-status:
     name: Test whether bundle.yaml is up to date
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - uses: imranismail/setup-kustomize@v2.1.0
@@ -45,7 +45,7 @@
 
   test-helm-operator:
     name: Test Helm operator
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 45
     env:
       IMG: sumologic/sumologic-kubernetes-helm-operator:test
@@ -58,7 +58,7 @@
       - name: Install Helm in tested version
         run: |
           sudo mkdir /opt/helm3
-          sudo curl "https://get.helm.sh/helm-v3.8.2-linux-amd64.tar.gz" | tar -xz -C /opt/helm3
+          sudo curl "https://get.helm.sh/helm-v3.18.2-linux-amd64.tar.gz" | tar -xz -C /opt/helm3
           sudo rm /usr/local/bin/helm
           sudo ln -s /opt/helm3/linux-amd64/helm /usr/bin/helm3
           sudo ln -s /usr/bin/helm3 /usr/bin/helm
@@ -68,13 +68,15 @@
         run: kustomize version
       - uses: AbsaOSS/k3d-action@v2
         id: single-cluster
-        name: Create single k3d Cluster
+        name: Create single k3d Cluster 
         with:
           cluster-name: "k3s-default"
           args: >-
-            --agents 1
+            --agents 2
             --no-lb
-            --k3s-arg "--no-deploy=traefik,servicelb,metrics-server@server:*"
+            --k3s-arg "--no-deploy=traefik,servicelb,metrics-server@server:*" 
+
+
       - name: Checkout submodules
         run: git submodule update --init
       - name: Build helm operator image

.github/workflows/release_builds.yaml

@@ -12,86 +12,86 @@
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       OPERATOR_IMAGE_NAME: sumologic-kubernetes-collection-helm-operator
       BUNDLE_IMAGE_NAME: sumologic-kubernetes-collection-helm-operator-bundle
       CATALOG_IMAGE_NAME: sumologic-kubernetes-collection-helm-operator-catalog
 
       ECR_URL: public.ecr.aws/sumologic
       LATEST_TAG: "latest"
 
     steps:
       - uses: actions/checkout@v2.3.4
 
       - name: Install Operator Package Manager (OPM)
         run: |
           sudo wget -q "https://github.com/operator-framework/operator-registry/releases/download/${OPM_VERSION}/linux-amd64-opm" -O /usr/bin/opm && sudo chmod +x /usr/bin/opm
         env:
           OPM_VERSION: v1.45.0
 
       - name: Checkout submodules
         run: git submodule update --init
 
       - name: Extract tag
         id: extract_tag
         run: echo "tag=$(echo ${GITHUB_REF#refs/tags/v})" >> $GITHUB_OUTPUT
 
       - name: Print tag
         run: echo "Running release build for ${{ steps.extract_tag.outputs.tag }}"
 
       - name: Extract release number
         id: extract_release_number
         # count git tags omitting rc versions
         run: echo "release_number=$(echo $(git tag | sed '/rc/d' | wc -l))" >> $GITHUB_OUTPUT
 
       - name: Log in to AWS Public ECR to publish operator
         run: make login-ecr
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_OPERATOR }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_OPERATOR }}
 
       - name: Build and push operator image
         run: make docker-build docker-push \
           IMG=${ECR_URL}/${OPERATOR_IMAGE_NAME}:${{ steps.extract_tag.outputs.tag }} \
           VERSION=${{ steps.extract_tag.outputs.tag }} \
           RELEASE_NUMBER=${{ steps.extract_release_number.outputs.release_number }}
 
       - name: Set 'latest' tag for operator image
         run: docker tag ${ECR_URL}/${OPERATOR_IMAGE_NAME}:${{ steps.extract_tag.outputs.tag }} ${ECR_URL}/${OPERATOR_IMAGE_NAME}:${LATEST_TAG}
 
       - name: Push 'latest' tag for operator image
         run: make docker-push IMG=${ECR_URL}/${OPERATOR_IMAGE_NAME}:${LATEST_TAG}
 
       - name: Log in to AWS Public ECR to publish bundle
         run: make login-ecr
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_BUNDLE }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_BUNDLE }}
 
       - name: Build and push bundle image
         run: make bundle-build bundle-push \
           BUNDLE_IMG=${ECR_URL}/${BUNDLE_IMAGE_NAME}:${{ steps.extract_tag.outputs.tag }}
 
       - name: Set 'latest' tag for bundle image
         run: docker tag ${ECR_URL}/${BUNDLE_IMAGE_NAME}:${{ steps.extract_tag.outputs.tag }} ${ECR_URL}/${BUNDLE_IMAGE_NAME}:${LATEST_TAG}
 
       - name: Push 'latest' tag for bundle image
         run: make docker-push IMG=${ECR_URL}/${BUNDLE_IMAGE_NAME}:${LATEST_TAG}
 
       - name: Log in to AWS Public ECR to publish catalog
         run: make login-ecr
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_CATALOG }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_CATALOG }}
 
       - name: Build and push catalog image
         run: make catalog-build catalog-push \
           CATALOG_IMG=${ECR_URL}/${CATALOG_IMAGE_NAME}:${{ steps.extract_tag.outputs.tag }} \
           BUNDLE_IMGS=${ECR_URL}/${BUNDLE_IMAGE_NAME}:${{ steps.extract_tag.outputs.tag }}
 
       - name: Set 'latest' tag for catalog image
         run: docker tag ${ECR_URL}/${CATALOG_IMAGE_NAME}:${{ steps.extract_tag.outputs.tag }} ${ECR_URL}/${CATALOG_IMAGE_NAME}:${LATEST_TAG}
 
       - name: Push 'latest' tag for catalog image
         run: make docker-push IMG=${ECR_URL}/${CATALOG_IMAGE_NAME}:${LATEST_TAG}

.gitignore

@@ -17,3 +17,4 @@ bin
 config.yaml
 ubuntu-bionic-18.04-cloudimg-console.log
 .vagrant/
+scripts/__pycache__/

Dockerfile

@@ -1,9 +1,9 @@
 # Build the manager binary
-FROM quay.io/operator-framework/helm-operator:v1.33.0
+FROM  quay.io/operator-framework/helm-operator:v1.40.0
 
 ARG VERSION=${VERSION}
 ARG RELEASE_NUMBER=${RELEASE_NUMBER}
-ARG HELM_VERSION=3.15.3
+ARG HELM_VERSION=3.18.3
 
 LABEL name="Sumologic Kubernetes Collection Helm Operator"
 LABEL maintainer="collection@sumologic.com"
@@ -15,7 +15,7 @@ LABEL description="Sumologic Kubernetes Collection Helm Operator deploys https:/
 
 USER root
 
-RUN microdnf update && microdnf install -y tar gzip wget patch && microdnf clean all
+RUN microdnf update -y && microdnf install -y tar gzip wget patch && microdnf clean all
 
 RUN wget "https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz" && \
     tar -xzvf "helm-v${HELM_VERSION}-linux-amd64.tar.gz" && \

Makefile

@@ -9,7 +9,7 @@ VERSION ?= 0.0.1
 RELEASE_NUMBER ?= 0
 
 # Sumo Logic Kubernetes Collection Chart branch name
-COLLECTION_BRANCH ?= release-v4.9
+COLLECTION_BRANCH ?= release-v4.13
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")

bundle.yaml

@@ -422,6 +422,7 @@ data:
       healthProbeBindAddress: :8081
     metrics:
       bindAddress: 127.0.0.1:8080
+
     leaderElection:
       leaderElect: true
       resourceName: 811c9dc5.sumologic.com
@@ -468,7 +469,7 @@ spec:
         - --upstream=http://127.0.0.1:8080/
         - --logtostderr=true
         - --v=10
-        image: registry.connect.redhat.com/sumologic/kube-rbac-proxy:v0.18.0-ubi
+        image: registry.connect.redhat.com/sumologic/kube-rbac-proxy@sha256:e1f49fcf5b7e86d9eb49c16dbbf9484cb486f55f999fd51d7c738c3b1f2666cf
         name: kube-rbac-proxy
         ports:
         - containerPort: 8443
@@ -490,49 +491,49 @@ spec:
         - name: OPERATOR_NAME
           value: sumologic-kubernetes-collection-helm-operator
         - name: RELATED_IMAGE_AUTOINSTRUMENTATION_DOTNET
-          value: registry.connect.redhat.com/sumologic/autoinstrumentation-dotnet@sha256:e99182dd7c0c8611cdc852bcc2e0866e635077b50b7e739022269cc8721f4109
+          value: registry.connect.redhat.com/sumologic/autoinstrumentation-dotnet@sha256:f4f385c4489c74b5c43f2fe6b6620a9eb8d9ecab470567236b3c45f636106640
         - name: RELATED_IMAGE_AUTOINSTRUMENTATION_JAVA
-          value: registry.connect.redhat.com/sumologic/autoinstrumentation-java@sha256:7fdb03d08173964f234f8262e872f67a42527173195b2e39cf56581c6a784f92
+          value: registry.connect.redhat.com/sumologic/autoinstrumentation-java@sha256:242958b7d8905f4ac02f6ad38897ba58b9badf2a6213a389e67dcc71fee3630c
         - name: RELATED_IMAGE_AUTOINSTRUMENTATION_NODEJS
-          value: registry.connect.redhat.com/sumologic/autoinstrumentation-nodejs@sha256:f6d2109be49cbfc725ca7f0ebbc06b74c699e55a7f18690e9959de8bcf294028
+          value: registry.connect.redhat.com/sumologic/autoinstrumentation-nodejs@sha256:c206eef4fdecaa58b4f01e5e7f0dbd74e9606eab2b4debf47461d36191e248d1
         - name: RELATED_IMAGE_AUTOINSTRUMENTATION_PYTHON
-          value: registry.connect.redhat.com/sumologic/autoinstrumentation-python@sha256:2cf6a7fb9680539a1c352c24827cd01e152e27d865916e6112a07c8c94f32973
+          value: registry.connect.redhat.com/sumologic/autoinstrumentation-python@sha256:f0fa45fa45e64c7df88f21181ae18ee96fe83cd3988258663d0806ea6f39e6bb
         - name: RELATED_IMAGE_BUSYBOX
           value: registry.connect.redhat.com/sumologic/busybox@sha256:209bc8e0b1d958fc699f3bb75b1248544e372ad35cdc46c991bd1698f641e1f9
         - name: RELATED_IMAGE_KUBE_RBAC_PROXY
-          value: registry.connect.redhat.com/sumologic/kube-rbac-proxy@sha256:6081af347a86a9cd51232f60e9f5567bdaddf0377927a462ced91524ce80bf95
+          value: registry.connect.redhat.com/sumologic/kube-rbac-proxy@sha256:e1f49fcf5b7e86d9eb49c16dbbf9484cb486f55f999fd51d7c738c3b1f2666cf
         - name: RELATED_IMAGE_KUBE_STATE_METRICS
-          value: registry.connect.redhat.com/sumologic/kube-state-metrics@sha256:473614d1c0de0f9f0b5314eab40d3172f5180332a2009be590ce474b85cb898e
+          value: registry.connect.redhat.com/sumologic/kube-state-metrics@sha256:3551ededa327a35db798ec8286cd843580e3ae395d2231e041e8c4b7621127ee
         - name: RELATED_IMAGE_KUBERNETES_SETUP
-          value: registry.connect.redhat.com/sumologic/kubernetes-setup@sha256:157290d458724d63dde2d8b2b81b8184618ae07de6776f56ab33f3e3cb0566b5
+          value: registry.connect.redhat.com/sumologic/kubernetes-setup@sha256:f07eaf68fa11ffc708e4485a83bd3763fc5712f7d73d29edfe5b9c9e08f05df6
         - name: RELATED_IMAGE_KUBERNETES_TOOLS_KUBECTL
           value: registry.connect.redhat.com/sumologic/kubernetes-tools-kubectl@sha256:d3155b864cc74f327adedf7d013a8f0fcb11c2e73a5655b7cafa848824e80172
         - name: RELATED_IMAGE_METRICS_SERVER
           value: registry.connect.redhat.com/sumologic/metrics-server@sha256:65d2a3ddc4b4183f438fa18b655079c93c905cb9e3b8c54977336205dc1fff07
         - name: RELATED_IMAGE_NGINX_UNPRIVILEGED
           value: registry.connect.redhat.com/sumologic/nginx-unprivileged@sha256:7260555d16c94c4fe1e016626b4cb8a5c0de6b700e2eea28744331fb298f71ae
         - name: RELATED_IMAGE_NODE_EXPORTER
-          value: registry.connect.redhat.com/sumologic/node-exporter@sha256:7acec4473ddf508514dca1d08335cfd071e345d7eca660793d59e09ef9f0491f
+          value: registry.connect.redhat.com/sumologic/node-exporter:1.8.2-ubi
         - name: RELATED_IMAGE_OPENTELEMETRY_OPERATOR
-          value: registry.connect.redhat.com/sumologic/opentelemetry-operator@sha256:a714dd6995f5c3f479488c8ca281fe1a5dd92b1103c4b00b9c68f47826172267
+          value: registry.connect.redhat.com/sumologic/opentelemetry-operator:0.115.0-ubi
         - name: RELATED_IMAGE_PROMETHEUS_CONFIG_RELOADER
           value: registry.connect.redhat.com/sumologic/prometheus-config-reloader@sha256:0b605d36782afd8f50fd631d0e9c7b19d39ce962af89b7a737b2f09a8ceff291
         - name: RELATED_IMAGE_PROMETHEUS_OPERATOR
           value: registry.connect.redhat.com/sumologic/prometheus-operator@sha256:58a329e6582456b32abebb470086191f8366b927af4703741613993465f116b8
         - name: RELATED_IMAGE_PROMETHEUS
-          value: registry.connect.redhat.com/sumologic/prometheus@sha256:4e483f18b2fc1642a32c6a41a802e5351627173710fec674d461a0e4109568a7
+          value: registry.connect.redhat.com/sumologic/prometheus@sha256:0ef6eaf570a40499dd5de92a79593e950bc771b014e0ee6ff7419b4b82a36fcc
         - name: RELATED_IMAGE_SUMOLOGIC_OTEL_COLLECTOR
-          value: registry.connect.redhat.com/sumologic/sumologic-otel-collector@sha256:986d8432eb84cad7c2ac69bdf5a48831a76d23d9d9cb08595e091b4f1f802533
+          value: registry.connect.redhat.com/sumologic/sumologic-otel-collector@sha256:4554d43dba204e3ec8e91b36442a438f10234fa0cb4db7fb7880b257a6485112
         - name: RELATED_IMAGE_TAILING_SIDECAR_OPERATOR
-          value: registry.connect.redhat.com/sumologic/tailing-sidecar-operator@sha256:faf736cd82ceee3e97990da0346487e51ddc9fbc9a0647042f640d2012ef9f35
+          value: registry.connect.redhat.com/sumologic/tailing-sidecar-operator@sha256:c16b8b18e9b263fc3eb24059bba512bcfc3201b32105af6e5518392826ddd66c
         - name: RELATED_IMAGE_TAILING_SIDECAR
-          value: registry.connect.redhat.com/sumologic/tailing-sidecar@sha256:48203fa961951147802711ed4769ab2d42e4adb4593a6e50c639d9cc4fb75242
+          value: registry.connect.redhat.com/sumologic/tailing-sidecar@sha256:738d653a78dc415243ab3627db9135768175fb7f51d0803566f5d9e824c8744b
         - name: RELATED_IMAGE_TELEGRAF_OPERATOR
           value: registry.connect.redhat.com/sumologic/telegraf-operator@sha256:ff958222be01c0c3966474463e43bbd5bcf348790dd34bb761718cb1cea2d793
         - name: RELATED_IMAGE_TELEGRAF
           value: registry.connect.redhat.com/sumologic/telegraf@sha256:75efd2e509c6017ea0fc5c9103ce068cbc89087b16506a4ef48cb5ff00eab84e
         - name: RELATED_IMAGE_THANOS
-          value: registry.connect.redhat.com/sumologic/thanos@sha256:5f132bb32e337ed474cb031ae1fcb0320e493097e81ba6915bd1f5361687529a
+          value: registry.connect.redhat.com/sumologic/thanos@sha256:16faf7191668e86d8b576bba055dd0cbdeb009635976b9e07bd00f926032f11c
         image: registry.connect.redhat.com/sumologic/sumologic-kubernetes-collection-helm-operator:4.9.0-3
         livenessProbe:
           httpGet: