chore(chart-deps): update otel-operator to version 0.120.2

apps.yaml

@@ -220,7 +220,7 @@ appsInfo:
     chartName: trivy-operator
   otel:
     title: OpenTelemetry Operator
-    appVersion: 0.153.0
+    appVersion: 0.156.0
     repo: https://github.com/open-telemetry/opentelemetry-operator
     maintainers: Grafana labs
     relatedLinks:

chart/chart-index/Chart.yaml

@@ -89,7 +89,7 @@ dependencies:
     repository: https://oauth2-proxy.github.io/manifests
   - name: opentelemetry-operator
     alias: otel-operator
-    version: 0.117.0
+    version: 0.120.2
     repository: https://open-telemetry.github.io/opentelemetry-helm-charts
   - name: policy-reporter
     version: 3.7.4

charts/otel-operator/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.153.0
+appVersion: 0.156.0
 description: OpenTelemetry Operator Helm chart for Kubernetes
 home: https://opentelemetry.io/
 icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
@@ -12,4 +12,4 @@ name: opentelemetry-operator
 sources:
 - https://github.com/open-telemetry/opentelemetry-operator
 type: application
-version: 0.117.0
+version: 0.120.2

charts/otel-operator/ci/crds-annotations-values.yaml

@@ -0,0 +1,7 @@
+crds:
+  annotations:
+    example.com/managed-by: opentelemetry-operator-chart
+
+manager:
+  collectorImage:
+    repository: "otel/opentelemetry-collector-k8s"

charts/otel-operator/crds/crd-opentelemetry.io_opampbridges.yaml

@@ -874,6 +874,13 @@ spec:
                 type: object
               serviceAccount:
                 type: string
+              tls:
+                properties:
+                  insecure:
+                    type: boolean
+                  insecure_skip_verify:
+                    type: boolean
+                type: object
               tolerations:
                 items:
                   properties:

charts/otel-operator/crds/crd-opentelemetrycollector.yaml

@@ -9878,8 +9878,47 @@ spec:
                 > 0) || !has(self.additionalContainers)'
           status:
             properties:
+              conditions:
+                items:
+                  properties:
+                    lastTransitionTime:
+                      format: date-time
+                      type: string
+                    message:
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
               image:
                 type: string
+              observedGeneration:
+                format: int64
+                type: integer
               scale:
                 properties:
                   replicas:

charts/otel-operator/templates/clusterrole.yaml

@@ -206,6 +206,16 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - operators.coreos.com
+    resources:
+      - clusterserviceversions
+    verbs:
+      - get
+      - list
+      - patch
+      - update
+      - watch
   - apiGroups:
       - coordination.k8s.io
     resources:
@@ -312,6 +322,7 @@ rules:
       {{- if get .Values.manager.featureGatesMap "operator.clusterobservability" }}
       - clusterobservabilities/status
       {{- end}}
+      - instrumentations/status
       - opampbridges/status
     verbs:
       - get

charts/otel-operator/templates/tests/test-certmanager-connection.yaml

@@ -15,7 +15,7 @@ spec:
       image: "{{ .Values.testFramework.image.repository }}:{{ .Values.testFramework.image.tag }}"
       env:
         - name: CERT_MANAGER_CLUSTERIP
-          value: "cert-manager-webhook"
+          value: "cert-manager-webhook.cert-manager"
         - name: CERT_MANAGER_PORT
           value: "443"
       command:
@@ -24,11 +24,17 @@ spec:
         # The following shell script tests if the cert-manager service is up. If the service is up, when we try
         # to wget its exposed port, we will get an HTTP error 400.
         - |
-          wget_output=$(wget -q "$CERT_MANAGER_CLUSTERIP:$CERT_MANAGER_PORT")
-          if wget_output=="wget: server returned error: HTTP/1.0 400 Bad Request"
-          then exit 0
-          else exit 1
-          fi
+          i=0
+          while [ "$i" -lt 30 ]; do
+            wget_output=$(wget -q "$CERT_MANAGER_CLUSTERIP:$CERT_MANAGER_PORT" 2>&1 || true)
+            if [ "$wget_output" = "wget: server returned error: HTTP/1.0 400 Bad Request" ]; then
+              exit 0
+            fi
+            i=$((i + 1))
+            sleep 2
+          done
+          echo "$wget_output"
+          exit 1
       {{- with .Values.testFramework.securityContext }}
       securityContext: {{ toYaml . | nindent 12 }}
       {{- end }}

charts/otel-operator/templates/tests/test-service-connection.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ include "opentelemetry-operator.fullname" . }}-metrics"
+  name: "{{ include "opentelemetry-operator.fullname" . }}-metrics-test"
   namespace: {{ template "opentelemetry-operator.namespace" . }}
   labels:
     {{- include "opentelemetry-operator.labels" . | nindent 4 }}
@@ -24,11 +24,17 @@ spec:
         # The following shell script tests if the controller-manager-metrics-service is up.
         # If the service is up, when we try to wget its exposed port, we will get an HTTP error 400.
         - |
-          wget_output=$(wget -q "$MANAGER_METRICS_SERVICE_CLUSTERIP:$MANAGER_METRICS_SERVICE_PORT")
-          if wget_output=="wget: server returned error: HTTP/1.0 400 Bad Request"
-          then exit 0
-          else exit 1
-          fi
+          i=0
+          while [ "$i" -lt 30 ]; do
+            wget_output=$(wget -q "$MANAGER_METRICS_SERVICE_CLUSTERIP:$MANAGER_METRICS_SERVICE_PORT" 2>&1 || true)
+            if [ "$wget_output" = "wget: server returned error: HTTP/1.0 400 Bad Request" ]; then
+              exit 0
+            fi
+            i=$((i + 1))
+            sleep 2
+          done
+          echo "$wget_output"
+          exit 1
       {{- with .Values.testFramework.securityContext }}
       securityContext: {{ toYaml . | nindent 12 }}
       {{- end }}
@@ -55,7 +61,7 @@ spec:
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ include "opentelemetry-operator.fullname" . }}-webhook"
+  name: "{{ include "opentelemetry-operator.fullname" . }}-webhook-test"
   namespace: {{ template "opentelemetry-operator.namespace" . }}
   labels:
     {{- include "opentelemetry-operator.labels" . | nindent 4 }}
@@ -77,11 +83,17 @@ spec:
         # The following shell script tests if the webhook service is up. If the service is up, when we try
         # to wget its exposed port, we will get an HTTP error 400.
         - |
-          wget_output=$(wget -q "$WEBHOOK_SERVICE_CLUSTERIP:$WEBHOOK_SERVICE_PORT")
-          if wget_output=="wget: server returned error: HTTP/1.0 400 Bad Request"
-          then exit 0
-          else exit 1
-          fi
+          i=0
+          while [ "$i" -lt 30 ]; do
+            wget_output=$(wget -q "$WEBHOOK_SERVICE_CLUSTERIP:$WEBHOOK_SERVICE_PORT" 2>&1 || true)
+            if [ "$wget_output" = "wget: server returned error: HTTP/1.0 400 Bad Request" ]; then
+              exit 0
+            fi
+            i=$((i + 1))
+            sleep 2
+          done
+          echo "$wget_output"
+          exit 1
       {{- with .Values.testFramework.securityContext }}
       securityContext: {{ toYaml . | nindent 12 }}
       {{- end }}

charts/otel-operator/values.schema.json

@@ -664,6 +664,14 @@
               "examples": [
                 false
               ]
+            },
+            "operator.collector.usedefaulttelemetryshape": {
+              "type": "boolean",
+              "default": false,
+              "title": "Use collector defaults for injected Prometheus telemetry metric names",
+              "examples": [
+                false
+              ]
             }
           },
           "examples": [
@@ -1812,6 +1820,19 @@
           "examples": [
             true
           ]
+        },
+        "annotations": {
+          "type": "object",
+          "default": {},
+          "title": "CRD Annotations",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "examples": [
+            {
+              "example.com/managed-by": "opentelemetry-operator-chart"
+            }
+          ]
         }
       },
       "examples": [

charts/otel-operator/values.yaml

@@ -55,7 +55,7 @@ manager:
     imagePullPolicy: IfNotPresent
   collectorImage:
     repository: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s
-    tag: 0.153.0
+    tag: 0.156.0
   opampBridgeImage:
     repository: ""
     tag: ""
@@ -349,6 +349,9 @@ admissionWebhooks:
 ## See https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-operator/UPGRADING.md#0560-to-0570 for more details.
 crds:
   create: true
+  # Annotations to add to all CRDs managed by this chart.
+  # For example, "example.com/managed-by: opentelemetry-operator-chart".
+  annotations: {}
 
 ## Create the provided Roles and RoleBindings
 ##