From fce6cb43c9f2dc164e4cc22d1febeb4ad750b871 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 12 Jun 2023 17:32:27 +0300 Subject: [PATCH] [operator] - BUMP operator/collector to v0.79.0 (#810) --- charts/opentelemetry-operator/Chart.yaml | 4 ++-- .../crds/crd-opentelemetrycollector.yaml | 18 +++++++++++++++++- .../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 ++-- .../tests/test-service-connection.yaml | 8 ++++---- charts/opentelemetry-operator/values.yaml | 4 ++-- 14 files changed, 59 insertions(+), 43 deletions(-) diff --git a/charts/opentelemetry-operator/Chart.yaml b/charts/opentelemetry-operator/Chart.yaml index 2c88d8d8a..ef15cc83a 100644 --- a/charts/opentelemetry-operator/Chart.yaml +++ b/charts/opentelemetry-operator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-operator -version: 0.31.0 +version: 0.32.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.78.0 +appVersion: 0.79.0 diff --git a/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml b/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml index 24bac842a..7b5938ba2 100644 --- a/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml +++ b/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml @@ -26,9 +26,15 @@ spec: jsonPath: .status.version name: Version type: string + - jsonPath: .status.scale.statusReplicas + name: Ready + type: string - jsonPath: .metadata.creationTimestamp name: Age type: date + - jsonPath: .status.image + name: Image + type: string name: v1alpha1 schema: openAPIV3Schema: @@ -1646,7 +1652,7 @@ spec: type: integer minReplicas: description: 'MinReplicas sets a lower bound to the autoscaling feature. Set - this if your are using autoscaling. It must be at least 1 Deprecated: + this if you are using autoscaling. It must be at least 1 Deprecated: use "OpenTelemetryCollector.Spec.Autoscaler.MinReplicas" instead.' format: int32 type: integer @@ -4268,6 +4274,10 @@ spec: description: OpenTelemetryCollectorStatus defines the observed state of OpenTelemetryCollector. properties: + image: + description: Image indicates the container image to use for the OpenTelemetry + Collector. + type: string messages: description: 'Messages about actions performed by the operator on this resource. Deprecated: use Kubernetes events instead.' @@ -4294,6 +4304,12 @@ spec: description: The selector used to match the OpenTelemetryCollector's deployment or statefulSet pods. type: string + statusReplicas: + description: StatusReplicas is the number of pods targeted by + this OpenTelemetryCollector's with a Ready Condition / Total + number of non-terminated pods targeted by this OpenTelemetryCollector's + (their labels match the selector). Deployment, Daemonset, StatefulSet. + type: string type: object version: description: Version of the managed OpenTelemetry Collector (operand) 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 753e42d86..1925fdfda 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.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.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.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.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 ce6c4e790..fd6235ef7 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.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.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.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.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 6e9d36ae9..47dfa3a28 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.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager @@ -201,9 +201,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: opentelemetry-operator-0.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager @@ -219,9 +219,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: opentelemetry-operator-0.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.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 99318aba1..1588321c1 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.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.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.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.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 8c48f51c7..61fa3e2a1 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.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.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.78.0 + - --collector-image=otel/opentelemetry-collector-contrib:0.79.0 command: - /manager env: - name: ENABLE_WEBHOOKS value: "true" - image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:v0.78.0" + image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:v0.79.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 a1f1066e7..c99bd35ef 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.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.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 cbaf5b9f8..2b1e09610 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.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.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 4357926c4..5dbdfadc3 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.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.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.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.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 006a09bee..ed51d75e5 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.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.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 8afee54b5..9e24759ff 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.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.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 d6642f421..61e0291c8 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.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.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.31.0 + helm.sh/chart: opentelemetry-operator-0.32.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.78.0" + app.kubernetes.io/version: "0.79.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 11c5684ac..3a03fcb3c 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.78.0 + tag: v0.79.0 collectorImage: repository: otel/opentelemetry-collector-contrib - tag: 0.78.0 + tag: 0.79.0 targetAllocatorImage: repository: "" tag: ""