deps: upgrade kubectl and mock images to 2.24.0

(cherry picked from commit 26a44b2)

.changelog/3775.changed.txt

@@ -0,0 +1 @@
+deps: upgrade kubectl and mock images to 2.24.0

deploy/helm/sumologic/values.yaml

@@ -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:
@@ -4713,3 +4713,128 @@ pvcCleaner:
     ## securityContext for pvcCleaner pods
     securityContext:
       runAsUser: 1000
+
+## Configure instrumentation for OpenTelemetry-Operator
+instrumentation:
+  ## Specific for Sumo Logic chart - Instrumentation resource creation
+  instrumentationJobImage:
+    image:
+      repository: public.ecr.aws/sumologic/kubernetes-tools-kubectl
+      tag: 2.24.0
+
+  createDefaultInstrumentation: false
+  instrumentationNamespaces: ""
+
+  dotnet:
+    traces:
+      enabled: true
+    metrics:
+      enabled: true
+    ## Extra Environment Values - allows yaml definitions
+    # extraEnvVars:
+    #   - name: OTEL_CUSTOM_ENV_VAR
+    #     value: my_value
+
+  java:
+    traces:
+      enabled: true
+    metrics:
+      enabled: true
+
+    ## Extra Environment Values - allows yaml definitions
+    # extraEnvVars:
+    #   - name: OTEL_CUSTOM_ENV_VAR
+    #     value: my_value
+
+  python:
+    traces:
+      enabled: true
+    metrics:
+      enabled: true
+
+    ## Extra Environment Values - allows yaml definitions
+    # extraEnvVars:
+    #   - name: OTEL_CUSTOM_ENV_VAR
+    #     value: my_value
+
+  ## Current instrumentation doesn't support customization
+  ## for nodejs traces are always enabled.
+  nodejs:
+    metrics:
+      enabled: true
+    ## Extra Environment Values - allows yaml definitions
+    # extraEnvVars:
+    #   - name: OTEL_CUSTOM_ENV_VAR
+    #     value: my_value
+
+## The following section is not a subject of standard support scope and should be considered experimental
+## All of them are meant for debugging purposed and shouldn't be used on production environments
+debug:
+  ## Use it along with `debug.sumologicMock.enabled` in order to install collection locally without accessId, accessKey
+  enableLocalMode: false
+  sumologicMock:
+    enabled: false
+    image:
+      repository: public.ecr.aws/sumologic/sumologic-mock
+      tag: 2.24.0
+      pullPolicy: IfNotPresent
+    deployment:
+      nodeSelector: {}
+      tolerations: {}
+      securityContext: {}
+      ## Option to define priorityClassName to assign a priority class to pods.
+      priorityClassName:
+
+      ## Acceptable values for podAntiAffinity:
+      ## soft: specifies preferences that the scheduler will try to enforce but will not guarantee (Default)
+      ## hard: specifies rules that must be met for a pod to be scheduled onto a node
+      podAntiAffinity: "soft"
+      affinity: {}
+
+      resources:
+        limits:
+          memory: 2Gi
+          cpu: 1000m
+        requests:
+          memory: 768Mi
+          cpu: 100m
+
+      extraArgs: []
+
+  logs:
+    metadata:
+      print: false
+      forwardToSumologicMock: false
+      stopLogsIngestion: false
+    collector:
+      print: false
+      stopLogsIngestion: false
+    otellogswindows:
+      print: false
+      stopLogsIngestion: false
+
+  metrics:
+    metadata:
+      print: false
+      forwardToSumologicMock: false
+      stopLogsIngestion: false
+    collector:
+      print: false
+      stopLogsIngestion: false
+
+  instrumentation:
+    otelcolInstrumentation:
+      print: false
+      stopLogsIngestion: false
+    tracesGateway:
+      print: false
+      stopLogsIngestion: false
+    tracesSampler:
+      print: false
+      stopLogsIngestion: false
+      forwardToSumologicMock: false
+
+  events:
+    print: false
+    stopLogsIngestion: false
+    forwardToSumologicMock: false

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

tests/helm/testdata/goldenfile/sumologic-mock/basic.output.yaml

@@ -0,0 +1,64 @@
+---
+# Source: sumologic/templates/sumologic-mock/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: RELEASE-NAME-sumologic-mock
+  namespace: sumologic
+  labels:
+    app: RELEASE-NAME-sumologic-mock
+    sumologic.com/app: sumologic-mock
+    chart: "sumologic-%CURRENT_CHART_VERSION%"
+    release: "RELEASE-NAME"
+    heritage: "Helm"
+  annotations:
+    helm.sh/hook: pre-install,pre-upgrade
+    helm.sh/hook-weight: "1"
+spec:
+  selector:
+    matchLabels:
+      app: RELEASE-NAME-sumologic-mock
+  template:
+    metadata:
+      annotations:
+      labels:
+        app: RELEASE-NAME-sumologic-mock
+        chart: "sumologic-%CURRENT_CHART_VERSION%"
+        release: "RELEASE-NAME"
+        heritage: "Helm"
+        sumologic.com/app: sumologic-mock
+    spec:
+      serviceAccountName: RELEASE-NAME-sumologic-mock
+      nodeSelector:
+        kubernetes.io/os: linux
+      securityContext: {}
+      containers:
+        - ports:
+            - containerPort: 3000
+          image: public.ecr.aws/sumologic/sumologic-mock:2.24.0
+          name: sumologic-mock
+          args:
+            - sumologic-mock
+            - --hostname=RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.
+          securityContext:
+            capabilities:
+              drop:
+                - ALL
+          imagePullPolicy: Always
+          livenessProbe:
+            httpGet:
+              path: /metrics
+              port: 3000
+            initialDelaySeconds: 15
+            periodSeconds: 20
+          resources:
+            limits:
+              cpu: 1000m
+              memory: 2Gi
+            requests:
+              cpu: 100m
+              memory: 768Mi
+      hostname: sumologic-mock
+      restartPolicy: Always
+      imagePullSecrets:
+        - name: regcred

tests/helm/testdata/goldenfile/sumologic-mock/complex.output.yaml

@@ -0,0 +1,111 @@
+---
+# Source: sumologic/templates/sumologic-mock/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: RELEASE-NAME-sumologic-mock
+  namespace: collection
+  labels:
+    app: RELEASE-NAME-sumologic-mock
+    sumologic.com/app: sumologic-mock
+    chart: "sumologic-%CURRENT_CHART_VERSION%"
+    release: "RELEASE-NAME"
+    heritage: "Helm"
+  annotations:
+    helm.sh/hook: pre-install,pre-upgrade
+    helm.sh/hook-weight: "1"
+spec:
+  selector:
+    matchLabels:
+      app: RELEASE-NAME-sumologic-mock
+  template:
+    metadata:
+      annotations:
+      labels:
+        app: RELEASE-NAME-sumologic-mock
+        chart: "sumologic-%CURRENT_CHART_VERSION%"
+        release: "RELEASE-NAME"
+        heritage: "Helm"
+        sumologic.com/app: sumologic-mock
+    spec:
+      serviceAccountName: RELEASE-NAME-sumologic-mock
+      nodeSelector:
+        disktype: ssd
+        kubernetes.io/os: linux
+      tolerations:
+        - effect: NoSchedule
+          key: key1
+          operator: Equal
+          value: value1
+      affinity:
+        nodeAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - preference:
+                matchExpressions:
+                  - key: another-node-label-key
+                    operator: In
+                    values:
+                      - another-node-label-value
+              weight: 1
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: kubernetes.io/e2e-az-name
+                    operator: In
+                    values:
+                      - e2e-az1
+                      - e2e-az2
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchExpressions:
+                    - key: app
+                      operator: In
+                      values:
+                        - RELEASE-NAME-sumologic-otelcol-logs
+                        - RELEASE-NAME-sumologic-otelcol-metrics
+                        - RELEASE-NAME-sumologic-otelcol-events
+                        - RELEASE-NAME-sumologic-otelcol-instrumentation
+                    - key: app
+                      operator: In
+                      values:
+                        - prometheus-operator-prometheus
+                topologyKey: "kubernetes.io/hostname"
+      securityContext:
+        allowPrivilegeEscalation: false
+      priorityClassName: "high-priority"
+      containers:
+        - ports:
+            - containerPort: 3000
+          image: public.ecr.aws/sumologic/sumologic-mock:2.24.0
+          name: sumologic-mock
+          args:
+            - sumologic-mock
+            - --hostname=RELEASE-NAME-sumologic-mock.collection.svc.cluster.local.
+            - --print-logs
+            - --print-metrics
+            - --print-headers
+          securityContext:
+            capabilities:
+              drop:
+                - ALL
+          imagePullPolicy: Always
+          livenessProbe:
+            httpGet:
+              path: /metrics
+              port: 3000
+            initialDelaySeconds: 15
+            periodSeconds: 20
+          resources:
+            limits:
+              cpu: 2000m
+              memory: 3Gi
+            requests:
+              cpu: 1000m
+              memory: 1Gi
+      hostname: sumologic-mock
+      restartPolicy: Always
+      imagePullSecrets:
+        - name: regcred