Merge branch 'release-v3.19' into otel-upgrade-102

SumoLogic · Jul 26, 2024 · 9b0380a · 9b0380a
2 parents 76d311c + f766cf9
commit 9b0380a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.changelog/3775.changed.txt b/.changelog/3775.changed.txt
@@ -0,0 +1 @@
+deps: upgrade kubectl and mock images to 2.24.0
diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md
@@ -455,7 +455,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
 | `opentelemetry-operator.manager.resources.requests.memory`                            | Used to set requested Memory for OpenTelemetry-Operator Manager.                                                                                                                                                                                                                                                                                                     | `256Mi`                                                                                                                                                                              |
 | `opentelemetry-operator.instrumentationNamespaces`                                    | Used to create `Instrumentation` resources in specified namespaces.                                                                                                                                                                                                                                                                                                  | `Nil`                                                                                                                                                                                |
 | `opentelemetry-operator.instrumentationJobImage.image.repository`                     | Name of the image repository used to apply Instrumentation resource                                                                                                                                                                                                                                                                                                  | `public.ecr.aws/sumologic/kubernetes-tools-kubectl`                                                                                                                                  |
-| `opentelemetry-operator.instrumentationJobImage.image.tag`                            | Name of the image tag used to apply Instrumentation resource                                                                                                                                                                                                                                                                                                         | `2.20.0`                                                                                                                                                                             |
+| `opentelemetry-operator.instrumentationJobImage.image.tag`                            | Name of the image tag used to apply Instrumentation resource                                                                                                                                                                                                                                                                                                         | `2.24.0`                                                                                                                                                                             |
 | `opentelemetry-operator.admissionWebhooks`                                            | Admission webhooks make sure only requests with correctly formatted rules will get into the Operator. They also enable the sidecar injection for OpenTelemetryCollector and Instrumentation CR's.                                                                                                                                                                    | See [values.yaml]                                                                                                                                                                    |
 | `opentelemetry-operator.manager.env`                                                  | Additional environment variables for opentelemetry-operator helm chart.                                                                                                                                                                                                                                                                                              | {}                                                                                                                                                                                   |
 | `otelcolInstrumentation.enabled`                                                      | Enables Sumo Otel Distro Collector StatefulSet to collect telemetry data. [See docs for more information.](/docs/opentelemetry-collector/traces.md)                                                                                                                                                                                                                  | `true`                                                                                                                                                                               |
@@ -639,7 +639,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
 | `pvcCleaner.metrics.enabled`                                                          | Flag to enable cleaning unused PVCs for otelcol metrics statefulsets.                                                                                                                                                                                                                                                                                                | `false`                                                                                                                                                                              |
 | `pvcCleaner.logs.enabled`                                                             | Flag to enable cleaning unused PVCs for otelcol logs statefulsets.                                                                                                                                                                                                                                                                                                   | `false`                                                                                                                                                                              |
 | `pvcCleaner.job.image.repository`                                                     | Image repository for pvcCleaner docker containers.                                                                                                                                                                                                                                                                                                                   | `public.ecr.aws/sumologic/kubernetes-tools-kubectl`                                                                                                                                  |
-| `pvcCleaner.job.image.tag`                                                            | Image tag for pvcCleaner docker containers.                                                                                                                                                                                                                                                                                                                          | `2.20.0`                                                                                                                                                                             |
+| `pvcCleaner.job.image.tag`                                                            | Image tag for pvcCleaner docker containers.                                                                                                                                                                                                                                                                                                                          | `2.24.0`                                                                                                                                                                             |
 | `pvcCleaner.job.image.pullPolicy`                                                     | Image pullPolicy for pvcCleaner docker containers.                                                                                                                                                                                                                                                                                                                   | `IfNotPresent`                                                                                                                                                                       |
 | `pvcCleaner.job.resources`                                                            | Resource requests and limits for the pvcCleaner containers.                                                                                                                                                                                                                                                                                                          | `{"limits": {"memory": "256Mi", "cpu": "2000m"}, "requests": {"memory": "64Mi", "cpu": "100m"}}`                                                                                     |
 | `pvcCleaner.job.nodeSelector`                                                         | Node selector for pvcCleaner job. [See docs/best-practices.md for more information.](/docs/best-practices.md)                                                                                                                                                                                                                                                        | `{}`                                                                                                                                                                                 |

diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
@@ -4613,7 +4613,7 @@ opentelemetry-operator:
   instrumentationJobImage:
     image:
       repository: public.ecr.aws/sumologic/kubernetes-tools-kubectl
-      tag: 2.20.0
+      tag: 2.24.0
 
   createDefaultInstrumentation: false
   instrumentationNamespaces: ""
@@ -4679,7 +4679,7 @@ pvcCleaner:
   job:
     image:
       repository: public.ecr.aws/sumologic/kubernetes-tools-kubectl
-      tag: 2.20.0
+      tag: 2.24.0
       pullPolicy: IfNotPresent
 
     resources:

diff --git a/tests/helm/testdata/goldenfile/opentelemetry_operator_instrumentation_cr_job/job.output.yaml b/tests/helm/testdata/goldenfile/opentelemetry_operator_instrumentation_cr_job/job.output.yaml
@@ -19,7 +19,7 @@ spec:
       serviceAccountName: RELEASE-NAME-sumologic
       containers:
         - name: instrumentation-cr-applier
-          image: public.ecr.aws/sumologic/kubernetes-tools-kubectl:2.20.0
+          image: public.ecr.aws/sumologic/kubernetes-tools-kubectl:2.24.0
           volumeMounts:
             - name: instrumentation-cr-configmap
               mountPath: /tmp/instrumentation-cr.yaml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		deps: upgrade kubectl and mock images to 2.24.0