From 27f036a5fca1e9a003048f39d5b4507038392b54 Mon Sep 17 00:00:00 2001 From: svcAPLBot <174728082+svcAPLBot@users.noreply.github.com> Date: Wed, 5 Aug 2026 00:59:40 +0000 Subject: [PATCH] chore(chart-deps): update otel-operator to version 0.120.1 --- apps.yaml | 2 +- chart/chart-index/Chart.yaml | 2 +- charts/otel-operator/Chart.yaml | 4 +- .../crd-opentelemetry.io_opampbridges.yaml | 7 ++++ .../crds/crd-opentelemetrycollector.yaml | 39 +++++++++++++++++++ .../otel-operator/templates/clusterrole.yaml | 11 ++++++ .../tests/test-certmanager-connection.yaml | 18 ++++++--- .../tests/test-service-connection.yaml | 36 +++++++++++------ charts/otel-operator/values.schema.json | 8 ++++ charts/otel-operator/values.yaml | 2 +- 10 files changed, 106 insertions(+), 23 deletions(-) diff --git a/apps.yaml b/apps.yaml index 61e2342f51..171f505db9 100644 --- a/apps.yaml +++ b/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: diff --git a/chart/chart-index/Chart.yaml b/chart/chart-index/Chart.yaml index 4210fb2d2f..3fae0e79b9 100644 --- a/chart/chart-index/Chart.yaml +++ b/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.1 repository: https://open-telemetry.github.io/opentelemetry-helm-charts - name: policy-reporter version: 3.7.4 diff --git a/charts/otel-operator/Chart.yaml b/charts/otel-operator/Chart.yaml index d873142c37..28da36c531 100644 --- a/charts/otel-operator/Chart.yaml +++ b/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.1 diff --git a/charts/otel-operator/crds/crd-opentelemetry.io_opampbridges.yaml b/charts/otel-operator/crds/crd-opentelemetry.io_opampbridges.yaml index ba7f25c052..de86ebe9b1 100644 --- a/charts/otel-operator/crds/crd-opentelemetry.io_opampbridges.yaml +++ b/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: diff --git a/charts/otel-operator/crds/crd-opentelemetrycollector.yaml b/charts/otel-operator/crds/crd-opentelemetrycollector.yaml index 791ef62314..b4c9df546f 100644 --- a/charts/otel-operator/crds/crd-opentelemetrycollector.yaml +++ b/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: diff --git a/charts/otel-operator/templates/clusterrole.yaml b/charts/otel-operator/templates/clusterrole.yaml index 189d687aea..2870fd240c 100644 --- a/charts/otel-operator/templates/clusterrole.yaml +++ b/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 diff --git a/charts/otel-operator/templates/tests/test-certmanager-connection.yaml b/charts/otel-operator/templates/tests/test-certmanager-connection.yaml index 000766e98a..5fcbd38e73 100644 --- a/charts/otel-operator/templates/tests/test-certmanager-connection.yaml +++ b/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 }} diff --git a/charts/otel-operator/templates/tests/test-service-connection.yaml b/charts/otel-operator/templates/tests/test-service-connection.yaml index f5769e716f..af989b9fca 100644 --- a/charts/otel-operator/templates/tests/test-service-connection.yaml +++ b/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 }} diff --git a/charts/otel-operator/values.schema.json b/charts/otel-operator/values.schema.json index dcce78559f..e1ca0c2929 100644 --- a/charts/otel-operator/values.schema.json +++ b/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": [ diff --git a/charts/otel-operator/values.yaml b/charts/otel-operator/values.yaml index b40c471b1a..21bf5c5e7e 100644 --- a/charts/otel-operator/values.yaml +++ b/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: ""