Merge conflicts

Author: dbudziwojskiNR

charts/nr-k8s-otel-collector/Chart.yaml

@@ -17,7 +17,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.8.26
+version: 0.8.27
 
 dependencies:
   - name: common-library

charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrole.yaml

@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.0.3
-    helm.sh/chart: nr-k8s-otel-collector-0.8.26
+    helm.sh/chart: nr-k8s-otel-collector-0.8.27
 rules:
   - apiGroups:
     - ""

charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrolebinding.yaml

@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.0.3
-    helm.sh/chart: nr-k8s-otel-collector-0.8.26
+    helm.sh/chart: nr-k8s-otel-collector-0.8.27
 subjects:
   - kind: ServiceAccount
     name: example-nr-k8s-otel-collector

charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset-configmap.yaml

@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.0.3
-    helm.sh/chart: nr-k8s-otel-collector-0.8.26
+    helm.sh/chart: nr-k8s-otel-collector-0.8.27
 data:
   daemonset-config.yaml: |
     receivers:
@@ -515,7 +515,7 @@ data:
             value: 'true'
           - key: "newrelic.chart.version"
             action: upsert
-            value: 0.8.26
+            value: 0.8.27
           - key: service.name
             action: delete
           - key: service_name

charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset.yaml

@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.0.3
-    helm.sh/chart: nr-k8s-otel-collector-0.8.26
+    helm.sh/chart: nr-k8s-otel-collector-0.8.27
 spec:
   selector:
     matchLabels:
@@ -24,7 +24,7 @@ spec:
         app.kubernetes.io/name: nr-k8s-otel-collector
         component: daemonset
       annotations:
-        checksum/config: 122f07fcba881511661fbe6828a4ca8544f9215ee0f4f8c982494ccbc9f7b59d
+        checksum/config: 7d943e1901a3e67a0b2518cfdf55c9365db247e3f7bde3a152449e5edb762213
     spec:
       serviceAccountName: example-nr-k8s-otel-collector
       containers:

charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment-configmap.yaml

@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.0.3
-    helm.sh/chart: nr-k8s-otel-collector-0.8.26
+    helm.sh/chart: nr-k8s-otel-collector-0.8.27
 data:
   deployment-config.yaml: |
     receivers:
@@ -486,7 +486,7 @@ data:
             value: 'true'
           - key: "newrelic.chart.version"
             action: upsert
-            value: 0.8.26
+            value: 0.8.27
           - key: service.name
             action: delete
           - key: service_name
@@ -508,7 +508,7 @@ data:
             value: 'true'
           - key: "newrelic.chart.version"
             action: upsert
-            value: 0.8.26
+            value: 0.8.27
 
       transform/events:
         log_statements:

charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment.yaml

@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.0.3
-    helm.sh/chart: nr-k8s-otel-collector-0.8.26
+    helm.sh/chart: nr-k8s-otel-collector-0.8.27
 spec:
   replicas: 1
   minReadySeconds: 5
@@ -26,7 +26,7 @@ spec:
         app.kubernetes.io/name: nr-k8s-otel-collector
         component: deployment
       annotations:
-        checksum/config: e0c6f285d7aa760c6e11c786207e2b51c9fe15cd1d394b692b8a1e7630844550
+        checksum/config: 39a11e2f28a2f1903df7bac88bb1e4d2fc10cc17cf0a7f7967938b6b386162f5
     spec:
       serviceAccountName: example-nr-k8s-otel-collector
       containers:

charts/nr-k8s-otel-collector/examples/k8s/rendered/secret.yaml

@@ -10,6 +10,6 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.0.3
-    helm.sh/chart: nr-k8s-otel-collector-0.8.26
+    helm.sh/chart: nr-k8s-otel-collector-0.8.27
 data:
   licenseKey: PE5SX2xpY2Vuc2VLZXk+

charts/nr-k8s-otel-collector/examples/k8s/rendered/service.yaml

@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.0.3
-    helm.sh/chart: nr-k8s-otel-collector-0.8.26
+    helm.sh/chart: nr-k8s-otel-collector-0.8.27
 spec:
   type: ClusterIP
   ports:

charts/nr-k8s-otel-collector/examples/k8s/rendered/serviceaccount.yaml

@@ -10,5 +10,5 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.0.3
-    helm.sh/chart: nr-k8s-otel-collector-0.8.26
+    helm.sh/chart: nr-k8s-otel-collector-0.8.27
   annotations: