From eedb1cefc7db9f0c0f3446c7515d5ce3216f9ebb Mon Sep 17 00:00:00 2001 From: zhenyus Date: Wed, 16 Apr 2025 05:49:54 +0800 Subject: [PATCH] fix: update CA injection annotations and webhook service URLs for OpenTelemetry operator Signed-off-by: zhenyus --- .../0.122.0/opentelemetry-operator.yaml | 14 +++++++------- .../templates/authentication/opentelemetry.yaml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cluster/manifests/freeleaps-logging-system/opentelemetry-operator/0.122.0/opentelemetry-operator.yaml b/cluster/manifests/freeleaps-logging-system/opentelemetry-operator/0.122.0/opentelemetry-operator.yaml index ace66784..d50a81fb 100644 --- a/cluster/manifests/freeleaps-logging-system/opentelemetry-operator/0.122.0/opentelemetry-operator.yaml +++ b/cluster/manifests/freeleaps-logging-system/opentelemetry-operator/0.122.0/opentelemetry-operator.yaml @@ -1890,7 +1890,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - cert-manager.io/inject-ca-from: opentelemetry-operator-system/opentelemetry-operator-serving-cert + cert-manager.io/inject-ca-from: freeleaps-logging-system/opentelemetry-operator-serving-cert controller-gen.kubebuilder.io/version: v0.17.1 labels: app.kubernetes.io/name: opentelemetry-operator @@ -3659,7 +3659,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - cert-manager.io/inject-ca-from: opentelemetry-operator-system/opentelemetry-operator-serving-cert + cert-manager.io/inject-ca-from: freeleaps-logging-system/opentelemetry-operator-serving-cert controller-gen.kubebuilder.io/version: v0.17.1 labels: app.kubernetes.io/name: opentelemetry-operator @@ -12966,7 +12966,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - cert-manager.io/inject-ca-from: opentelemetry-operator-system/opentelemetry-operator-serving-cert + cert-manager.io/inject-ca-from: freeleaps-logging-system/opentelemetry-operator-serving-cert controller-gen.kubebuilder.io/version: v0.17.1 labels: app.kubernetes.io/name: opentelemetry-operator @@ -16809,8 +16809,8 @@ metadata: namespace: freeleaps-logging-system spec: dnsNames: - - opentelemetry-operator-webhook-service.opentelemetry-operator-system.svc - - opentelemetry-operator-webhook-service.opentelemetry-operator-system.svc.cluster.local + - opentelemetry-operator-webhook-service.freeleaps-logging-system.svc + - opentelemetry-operator-webhook-service.freeleaps-logging-system.svc.cluster.local issuerRef: kind: Issuer name: opentelemetry-operator-selfsigned-issuer @@ -16833,7 +16833,7 @@ apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: annotations: - cert-manager.io/inject-ca-from: opentelemetry-operator-system/opentelemetry-operator-serving-cert + cert-manager.io/inject-ca-from: freeleaps-logging-system/opentelemetry-operator-serving-cert labels: app.kubernetes.io/name: opentelemetry-operator name: opentelemetry-operator-mutating-webhook-configuration @@ -16942,7 +16942,7 @@ apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: annotations: - cert-manager.io/inject-ca-from: opentelemetry-operator-system/opentelemetry-operator-serving-cert + cert-manager.io/inject-ca-from: freeleaps-logging-system/opentelemetry-operator-serving-cert labels: app.kubernetes.io/name: opentelemetry-operator name: opentelemetry-operator-validating-webhook-configuration diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml index 64f0784d..1ef1b909 100644 --- a/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml +++ b/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml @@ -7,7 +7,7 @@ metadata: spec: mode: sidecar image: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest - config: | + config: receivers: filelog: include: