From 8bfed52eb6fd873b721b33e387c3f304955e7563 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Wed, 27 Sep 2023 11:16:35 -0600 Subject: [PATCH] bump operator to 0.85.0 --- charts/opentelemetry-operator/Chart.yaml | 4 ++-- .../crds/crd-opentelemetrycollector.yaml | 17 +++++++++++++++++ .../operator-webhook-with-cert-manager.yaml | 8 ++++---- .../examples/default/rendered/certmanager.yaml | 8 ++++---- .../examples/default/rendered/clusterrole.yaml | 12 ++++++------ .../default/rendered/clusterrolebinding.yaml | 8 ++++---- .../examples/default/rendered/deployment.yaml | 8 ++++---- .../examples/default/rendered/role.yaml | 4 ++-- .../examples/default/rendered/rolebinding.yaml | 4 ++-- .../examples/default/rendered/service.yaml | 8 ++++---- .../default/rendered/serviceaccount.yaml | 4 ++-- .../tests/test-certmanager-connection.yaml | 4 ++-- .../rendered/tests/test-service-connection.yaml | 8 ++++---- charts/opentelemetry-operator/values.yaml | 4 ++-- 14 files changed, 59 insertions(+), 42 deletions(-) diff --git a/charts/opentelemetry-operator/Chart.yaml b/charts/opentelemetry-operator/Chart.yaml index 25621d6e1..83c10ff8b 100644 --- a/charts/opentelemetry-operator/Chart.yaml +++ b/charts/opentelemetry-operator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-operator -version: 0.38.0 +version: 0.39.0 description: OpenTelemetry Operator Helm chart for Kubernetes type: application home: https://opentelemetry.io/ @@ -11,4 +11,4 @@ maintainers: - name: dmitryax - name: TylerHelmuth icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png -appVersion: 0.84.0 +appVersion: 0.85.0 diff --git a/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml b/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml index efef24c32..560496ee0 100644 --- a/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml +++ b/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml @@ -2117,6 +2117,23 @@ spec: configuration. Refer to the OpenTelemetry Collector documentation for details. type: string + configmaps: + description: ConfigMaps is a list of ConfigMaps in the same namespace + as the OpenTelemetryCollector object, which shall be mounted into + the Collector Pods. + items: + properties: + mountpath: + type: string + name: + description: Configmap defines name and path where the configMaps + should be mounted. + type: string + required: + - mountpath + - name + type: object + type: array env: description: ENV vars to set on the OpenTelemetry Collector's Pods. These can then in certain cases be consumed in the config file for diff --git a/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml b/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml index f0f0e13e4..22e8915fb 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml @@ -6,9 +6,9 @@ metadata: annotations: cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: webhook @@ -85,9 +85,9 @@ metadata: annotations: cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: webhook diff --git a/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml b/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml index 922faaf5f..6936aabe2 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml @@ -4,9 +4,9 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: webhook @@ -29,9 +29,9 @@ apiVersion: cert-manager.io/v1 kind: Issuer metadata: labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: webhook diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml index dd359408a..faff1e6e9 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager @@ -214,9 +214,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager @@ -232,9 +232,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml index f36b51b3c..8d4cef4aa 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager @@ -25,9 +25,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager diff --git a/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml b/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml index 0cc041c2a..3940943ab 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml @@ -4,9 +4,9 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager @@ -33,13 +33,13 @@ spec: - --enable-leader-election - --health-probe-addr=:8081 - --webhook-port=9443 - - --collector-image=otel/opentelemetry-collector-contrib:0.84.0 + - --collector-image=otel/opentelemetry-collector-contrib:0.85.0 command: - /manager env: - name: ENABLE_WEBHOOKS value: "true" - image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:v0.84.0" + image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:v0.85.0" name: manager ports: - containerPort: 8080 diff --git a/charts/opentelemetry-operator/examples/default/rendered/role.yaml b/charts/opentelemetry-operator/examples/default/rendered/role.yaml index bde6c3ce1..ad0872408 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/role.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/role.yaml @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager diff --git a/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml b/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml index d7ab0ad73..38666303f 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager diff --git a/charts/opentelemetry-operator/examples/default/rendered/service.yaml b/charts/opentelemetry-operator/examples/default/rendered/service.yaml index 344e08a93..623bf0193 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/service.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/service.yaml @@ -4,9 +4,9 @@ apiVersion: v1 kind: Service metadata: labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager @@ -31,9 +31,9 @@ apiVersion: v1 kind: Service metadata: labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager diff --git a/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml index ecd90dcc7..12426a747 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml @@ -6,9 +6,9 @@ metadata: name: opentelemetry-operator namespace: default labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager diff --git a/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml b/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml index 8dac467c2..9eb1a13be 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml @@ -6,9 +6,9 @@ metadata: name: "example-opentelemetry-operator-cert-manager" namespace: default labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: webhook diff --git a/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml b/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml index b61f8808d..c9ad6bfd4 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml @@ -6,9 +6,9 @@ metadata: name: "example-opentelemetry-operator-metrics" namespace: default labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager @@ -43,9 +43,9 @@ metadata: name: "example-opentelemetry-operator-webhook" namespace: default labels: - helm.sh/chart: opentelemetry-operator-0.38.0 + helm.sh/chart: opentelemetry-operator-0.39.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.84.0" + app.kubernetes.io/version: "0.85.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager diff --git a/charts/opentelemetry-operator/values.yaml b/charts/opentelemetry-operator/values.yaml index 776c815af..dfb8039e2 100644 --- a/charts/opentelemetry-operator/values.yaml +++ b/charts/opentelemetry-operator/values.yaml @@ -29,10 +29,10 @@ pdb: manager: image: repository: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator - tag: v0.84.0 + tag: v0.85.0 collectorImage: repository: otel/opentelemetry-collector-contrib - tag: 0.84.0 + tag: 0.85.0 targetAllocatorImage: repository: "" tag: ""