From 21c513e45b524f8701359d0c64bc8133d2c952bd Mon Sep 17 00:00:00 2001
From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>
Date: Fri, 2 Feb 2024 15:20:08 -0700
Subject: [PATCH 1/2] bump operator to 0.93.0

---
 charts/opentelemetry-operator/Chart.yaml          |  4 ++--
 .../crds/crd-opentelemetrycollector.yaml          | 15 +++++++++++++++
 .../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     |  6 +++---
 .../examples/default/rendered/role.yaml           |  4 ++--
 .../examples/default/rendered/rolebinding.yaml    |  4 ++--
 .../examples/default/rendered/service.yaml        |  8 ++++----
 .../examples/default/rendered/serviceaccount.yaml |  4 ++--
 .../tests/test-certmanager-connection.yaml        |  4 ++--
 .../rendered/tests/test-service-connection.yaml   |  8 ++++----
 13 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/charts/opentelemetry-operator/Chart.yaml b/charts/opentelemetry-operator/Chart.yaml
index 05dd88531..4870c455a 100644
--- a/charts/opentelemetry-operator/Chart.yaml
+++ b/charts/opentelemetry-operator/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-operator
-version: 0.46.0
+version: 0.47.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.92.1
+appVersion: 0.93.0
diff --git a/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml b/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml
index c505cb08b..40cc76ab3 100644
--- a/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml
+++ b/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml
@@ -3864,6 +3864,11 @@ spec:
                   metrics:
                     description: Metrics defines the metrics configuration for operands.
                     properties:
+                      DisablePrometheusAnnotations:
+                        description: DisablePrometheusAnnotations controls the automatic
+                          addition of default Prometheus annotations ('prometheus.io/scrape',
+                          'prometheus.io/port', and 'prometheus.io/path')
+                        type: boolean
                       enableMetrics:
                         description: EnableMetrics specifies if ServiceMonitor or
                           PodMonitor(for sidecar mode) should be created for the service
@@ -4254,6 +4259,10 @@ spec:
                   account to use with this instance. When set, the operator will not
                   automatically create a ServiceAccount for the collector.
                 type: string
+              shareProcessNamespace:
+                description: ShareProcessNamespace indicates if the pod's containers
+                  should share process namespace.
+                type: boolean
               targetAllocator:
                 description: TargetAllocator indicates a value which determines whether
                   to spawn a target allocation resource or not.
@@ -5175,6 +5184,7 @@ spec:
                       type: object
                     type: array
                   filterStrategy:
+                    default: relabel-config
                     description: FilterStrategy determines how to filter targets before
                       allocating them among the collectors. The only current option
                       is relabel-config (drops targets based on prom relabel_config).
@@ -5197,6 +5207,11 @@ spec:
                         description: Metrics defines the metrics configuration for
                           operands.
                         properties:
+                          DisablePrometheusAnnotations:
+                            description: DisablePrometheusAnnotations controls the
+                              automatic addition of default Prometheus annotations
+                              ('prometheus.io/scrape', 'prometheus.io/port', and 'prometheus.io/path')
+                            type: boolean
                           enableMetrics:
                             description: EnableMetrics specifies if ServiceMonitor
                               or PodMonitor(for sidecar mode) should be created 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 576961b87..d7e2d4380 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.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: webhook
@@ -91,9 +91,9 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.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 d78d0c470..f765856b8 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.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.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.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.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 51e687aaa..e496956f6 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.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager
@@ -253,9 +253,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager
@@ -271,9 +271,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.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 f2069ffd1..72048f6f6 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.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.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.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.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 7a752b438..5d791b8d3 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.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager
@@ -39,7 +39,7 @@ spec:
           env:
             - name: ENABLE_WEBHOOKS
               value: "true"
-          image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.92.1"
+          image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.93.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 9d033429b..afc2ad608 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.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.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 b732325a6..6add32a8a 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.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.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 fa5b909de..88ddb7eb6 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.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.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.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.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 0fd9bce69..e15a258ec 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.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.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 ceaef1dda..4fa1b0494 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.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.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 bc1756d43..49912f916 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.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.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.46.0
+    helm.sh/chart: opentelemetry-operator-0.47.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.92.1"
+    app.kubernetes.io/version: "0.93.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager

From 303b4e8239be82be722196fd86bc567833ea02ea Mon Sep 17 00:00:00 2001
From: TylerHelmuth <12352919+TylerHelmuth@users.noreply.github.com>
Date: Fri, 2 Feb 2024 19:52:50 -0700
Subject: [PATCH 2/2] Update collector version

---
 .../examples/default/rendered/deployment.yaml    |  2 +-
 charts/opentelemetry-operator/values.schema.json | 16 ++++++++--------
 charts/opentelemetry-operator/values.yaml        |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml b/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml
index 5d791b8d3..f1f4b737c 100644
--- a/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml
+++ b/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml
@@ -33,7 +33,7 @@ spec:
             - --enable-leader-election
             - --health-probe-addr=:8081
             - --webhook-port=9443
-            - --collector-image=otel/opentelemetry-collector-contrib:0.92.0
+            - --collector-image=otel/opentelemetry-collector-contrib:0.93.0
           command:
             - /manager
           env:
diff --git a/charts/opentelemetry-operator/values.schema.json b/charts/opentelemetry-operator/values.schema.json
index 4c7f0f658..4473ad6ac 100644
--- a/charts/opentelemetry-operator/values.schema.json
+++ b/charts/opentelemetry-operator/values.schema.json
@@ -142,13 +142,13 @@
                             "default": "",
                             "title": "The tag Schema",
                             "examples": [
-                                "v0.92.0"
+                                "v0.93.0"
                             ]
                         }
                     },
                     "examples": [{
                         "repository": "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator",
-                        "tag": "v0.92.0"
+                        "tag": "v0.93.0"
                     }]
                 },
                 "collectorImage": {
@@ -173,13 +173,13 @@
                             "default": "",
                             "title": "The tag Schema",
                             "examples": [
-                                "0.92.0"
+                                "0.93.0"
                             ]
                         }
                     },
                     "examples": [{
                         "repository": "otel/opentelemetry-collector-contrib",
-                        "tag": "0.92.0"
+                        "tag": "0.93.0"
                     }]
                 },
                 "opampBridgeImage": {
@@ -923,11 +923,11 @@
             "examples": [{
                 "image": {
                     "repository": "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator",
-                    "tag": "v0.92.0"
+                    "tag": "v0.93.0"
                 },
                 "collectorImage": {
                     "repository": "otel/opentelemetry-collector-contrib",
-                    "tag": "0.92.0"
+                    "tag": "0.93.0"
                 },
                 "opampBridgeImage": {
                     "repository": "",
@@ -1674,11 +1674,11 @@
         "manager": {
             "image": {
                 "repository": "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator",
-                "tag": "v0.92.0"
+                "tag": "v0.93.0"
             },
             "collectorImage": {
                 "repository": "otel/opentelemetry-collector-contrib",
-                "tag": "0.92.0"
+                "tag": "0.93.0"
             },
             "opampBridgeImage": {
                 "repository": "",
diff --git a/charts/opentelemetry-operator/values.yaml b/charts/opentelemetry-operator/values.yaml
index 55c2f7241..27971d29b 100644
--- a/charts/opentelemetry-operator/values.yaml
+++ b/charts/opentelemetry-operator/values.yaml
@@ -32,7 +32,7 @@ manager:
     tag: ""
   collectorImage:
     repository: otel/opentelemetry-collector-contrib
-    tag: 0.92.0
+    tag: 0.93.0
   opampBridgeImage:
     repository: ""
     tag: ""