move prometheus exporter config to use readers

.github/actions/setup/action.yaml

@@ -19,7 +19,7 @@ runs:
 
     - uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: 3.8
 
     - name: Set up chart-testing
       uses: helm/[email protected]

.github/workflows/demo-test.yaml

@@ -19,6 +19,7 @@ jobs:
         uses: ./.github/actions/setup
         with:
           create-kind-cluster: "true"
+          helm-version: "v3.14.4"
 
       - name: Run chart-testing (install)
         run: "ct install --charts charts/opentelemetry-demo

.github/workflows/lint.yaml

@@ -17,7 +17,7 @@ jobs:
         uses: ./.github/actions/setup
         with:
           create-kind-cluster: "false"
-          helm-version: "v3.11.3"
+          helm-version: "v3.14.4"
 
       - name: Run chart-testing (lint)
         run: "ct lint --target-branch main

.github/workflows/operator-test.yaml

@@ -46,7 +46,7 @@ jobs:
           git clone -b v"$appVersion" --single-branch https://github.com/open-telemetry/opentelemetry-operator.git ./opentelemetry-operator
 
       - name: Install chainsaw
-        uses: kyverno/[email protected].10
+        uses: kyverno/[email protected].11
 
       - name: Install metrics-server
         run: |
@@ -98,7 +98,7 @@ jobs:
           git clone -b v"$appVersion" --single-branch https://github.com/open-telemetry/opentelemetry-operator.git ./opentelemetry-operator
 
       - name: Install chainsaw
-        uses: kyverno/[email protected].10
+        uses: kyverno/[email protected].11
 
       - name: Install metrics-server
         run: |

Makefile

@@ -7,7 +7,7 @@ generate-examples:
 	for chart_name in $(CHARTS); do \
 		helm dependency build charts/$${chart_name}; \
 		EXAMPLES_DIR=charts/$${chart_name}/examples; \
-		EXAMPLES=$$(find $${EXAMPLES_DIR} -type d -maxdepth 1 -mindepth 1 -exec basename \{\} \;); \
+		EXAMPLES=$$(find $${EXAMPLES_DIR} -maxdepth 1 -mindepth 1 -type d -exec basename \{\} \;); \
 		for example in $${EXAMPLES}; do \
 			echo "Generating example: $${example}"; \
 			VALUES=$$(find $${EXAMPLES_DIR}/$${example} -name *values.yaml); \
@@ -17,7 +17,7 @@ generate-examples:
 				mv $${EXAMPLES_DIR}/$${example}/rendered/$${chart_name}/templates/* "$${EXAMPLES_DIR}/$${example}/rendered"; \
 				SUBCHARTS_DIR=$${EXAMPLES_DIR}/$${example}/rendered/$${chart_name}/charts; \
 				if [ -d "$${SUBCHARTS_DIR}" ]; then \
-					SUBCHARTS=$$(find $${SUBCHARTS_DIR} -type d -maxdepth 1 -mindepth 1 -exec basename \{\} \;); \
+					SUBCHARTS=$$(find $${SUBCHARTS_DIR} -maxdepth 1 -mindepth 1 -type d -exec basename \{\} \;); \
 					for subchart in $${SUBCHARTS}; do \
 						mkdir -p "$${EXAMPLES_DIR}/$${example}/rendered/$${subchart}"; \
 						mv $${SUBCHARTS_DIR}/$${subchart}/templates/* "$${EXAMPLES_DIR}/$${example}/rendered/$${subchart}"; \
@@ -32,15 +32,15 @@ generate-examples:
 check-examples:
 	for chart_name in $(CHARTS); do \
 		EXAMPLES_DIR=charts/$${chart_name}/examples; \
-		EXAMPLES=$$(find $${EXAMPLES_DIR} -type d -maxdepth 1 -mindepth 1 -exec basename \{\} \;); \
+		EXAMPLES=$$(find $${EXAMPLES_DIR} -maxdepth 1 -mindepth 1 -type d -exec basename \{\} \;); \
 		for example in $${EXAMPLES}; do \
 			echo "Checking example: $${example}"; \
 			VALUES=$$(find $${EXAMPLES_DIR}/$${example} -name *values.yaml); \
 			for value in $${VALUES}; do \
 				helm dependency build charts/$${chart_name}; \
 				helm template example charts/$${chart_name} --namespace default --values $${value} --output-dir "${TMP_DIRECTORY}/$${example}"; \
 				SUBCHARTS_DIR=${TMP_DIRECTORY}/$${example}/$${chart_name}/charts; \
-				SUBCHARTS=$$(find $${SUBCHARTS_DIR} -type d -maxdepth 1 -mindepth 1 -exec basename \{\} \;); \
+				SUBCHARTS=$$(find $${SUBCHARTS_DIR} -maxdepth 1 -mindepth 1 -type d -exec basename \{\} \;); \
 				for subchart in $${SUBCHARTS}; do \
 					mkdir -p "${TMP_DIRECTORY}/$${example}/$${chart_name}/templates/$${subchart}"; \
 					mv ${TMP_DIRECTORY}/$${example}/$${chart_name}/charts/$${subchart}/templates/* "${TMP_DIRECTORY}/$${example}/$${chart_name}/templates/$${subchart}"; \
@@ -70,6 +70,7 @@ check-operator-crds:
 	$(call get-crd,${TMP_DIRECTORY}/crds/crd-opentelemetrycollector.yaml,https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$(OPERATOR_APP_VERSION)/bundle/community/manifests/opentelemetry.io_opentelemetrycollectors.yaml)
 	$(call get-crd,${TMP_DIRECTORY}/crds/crd-opentelemetryinstrumentation.yaml,https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$(OPERATOR_APP_VERSION)/bundle/community/manifests/opentelemetry.io_instrumentations.yaml)
 	$(call get-crd,${TMP_DIRECTORY}/crds/crd-opentelemetry.io_opampbridges.yaml,https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$(OPERATOR_APP_VERSION)/bundle/community/manifests/opentelemetry.io_opampbridges.yaml)
+
 	if diff ${TMP_DIRECTORY}/crds ./charts/opentelemetry-operator/conf/crds > /dev/null; then \
 		echo "Passed"; \
 		rm -rf ${TMP_DIRECTORY}; \
@@ -87,5 +88,7 @@ define get-crd
 @sed -i 's/opentelemetry-operator-webhook-service/{{ template "opentelemetry-operator.fullname" . }}-webhook/g' $(1)
 @sed -i '1s/^/{{- if .Values.crds.create }}\n/' $(1)
 @sed -i 's#\(.*\)path: /convert#&\n\1port: {{ .Values.admissionWebhooks.servicePort }}#' $(1)
+@sed -i 's#\(.*\)conversion:#{{- if .Values.admissionWebhooks.create }}\n&#' $(1)
+@sed -i 's#\(.*\)- v1beta1#&\n{{- end }}#' $(1)
 @echo '{{- end }}' >> $(1)
 endef

charts/opentelemetry-collector/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-collector
-version: 0.107.0
+version: 0.109.0
 description: OpenTelemetry Collector Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/
@@ -12,4 +12,4 @@ maintainers:
   - name: jaronoff97
   - name: TylerHelmuth
 icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
-appVersion: 0.110.0
+appVersion: 0.113.0

charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml

@@ -5,10 +5,10 @@ kind: ClusterRole
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.107.0
+    helm.sh/chart: opentelemetry-collector-0.109.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm
 
 rules:

charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml

@@ -5,10 +5,10 @@ kind: ClusterRoleBinding
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.107.0
+    helm.sh/chart: opentelemetry-collector-0.109.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm
 
 roleRef:

charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml

@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.107.0
+    helm.sh/chart: opentelemetry-collector-0.109.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm
 
 data:

charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml

@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.107.0
+    helm.sh/chart: opentelemetry-collector-0.109.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm
 
 spec:
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: b59255f59776bc33cdc8cec11469e415052e121c6097ca659cdda696202302c9
+        checksum/config: 05adf31e71768d6f4a0a72f54616072733e1605d80713238ee85456aafe75403
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -45,7 +45,7 @@ spec:
             - --config=/conf/relay.yaml
           securityContext:
             {}
-          image: "otel/opentelemetry-collector-k8s:0.110.0"
+          image: "otel/opentelemetry-collector-k8s:0.113.0"
           imagePullPolicy: IfNotPresent
           ports:
 

charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml

@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.107.0
+    helm.sh/chart: opentelemetry-collector-0.109.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm
 
     component: standalone-collector

charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml

@@ -6,8 +6,8 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.107.0
+    helm.sh/chart: opentelemetry-collector-0.109.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml

@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.107.0
+    helm.sh/chart: opentelemetry-collector-0.109.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm
 
 data:

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml

@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.107.0
+    helm.sh/chart: opentelemetry-collector-0.109.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm
 
 data:

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml

@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.107.0
+    helm.sh/chart: opentelemetry-collector-0.109.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm
 
 spec:
@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 6e843d5f37494e4c76040246c70126f9f48298504862cddc2b995d203e2cde05
+        checksum/config: 45bec5a8c8f33cc8d7481ff6d7c0dd4235104c3257bb9c0761f62a157d70c97a
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -43,7 +43,7 @@ spec:
             - --config=/conf/relay.yaml
           securityContext:
             {}
-          image: "otel/opentelemetry-collector-k8s:0.110.0"
+          image: "otel/opentelemetry-collector-k8s:0.113.0"
           imagePullPolicy: IfNotPresent
           ports:
 

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml

@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.107.0
+    helm.sh/chart: opentelemetry-collector-0.109.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm
 
 spec:
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 1d9b672e15b1e3dc257e79561b839026320701442d7cac2dbb43cf97ce93fc9c
+        checksum/config: 3ece6cc294f0ed92854413f33366d43d4b73621c702b50e6564565795cb9fbd0
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -45,7 +45,7 @@ spec:
             - --config=/conf/relay.yaml
           securityContext:
             {}
-          image: "otel/opentelemetry-collector-k8s:0.110.0"
+          image: "otel/opentelemetry-collector-k8s:0.113.0"
           imagePullPolicy: IfNotPresent
           ports:
 

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml

@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.107.0
+    helm.sh/chart: opentelemetry-collector-0.109.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm
 
     component: standalone-collector

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml

@@ -6,8 +6,8 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.107.0
+    helm.sh/chart: opentelemetry-collector-0.109.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm

charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml

@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.107.0
+    helm.sh/chart: opentelemetry-collector-0.109.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm
 
 data:

charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml

@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.107.0
+    helm.sh/chart: opentelemetry-collector-0.109.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm
 
 spec:
@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 6e4750252406892037bc4bf92dcdc69bdc19dfd0efd4e63b72c34bd709c561fb
+        checksum/config: 8bfee756de57aa564d26f9f90a47f3e28bfe2e238a54df8307b9dd6e5f224115
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -43,7 +43,7 @@ spec:
             - --config=/conf/relay.yaml
           securityContext:
             {}
-          image: "otel/opentelemetry-collector-k8s:0.110.0"
+          image: "otel/opentelemetry-collector-k8s:0.113.0"
           imagePullPolicy: IfNotPresent
           ports:
 

charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml

@@ -6,8 +6,8 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.107.0
+    helm.sh/chart: opentelemetry-collector-0.109.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm

charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml

@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.107.0
+    helm.sh/chart: opentelemetry-collector-0.109.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm
 
 data: