feat: pull upstream changes

.github/actions/setup/action.yaml

@@ -18,15 +18,13 @@ runs:
         python-version: '3.10'
 
     - name: Set up chart-testing
-      uses: helm/[email protected]
-      with:
-        version: '3.8.0'
+      uses: helm/[email protected]
 
     - name: Create kind cluster
-      uses: helm/kind-action@v1.5.0
+      uses: helm/kind-action@v1.8.0
       if: ${{ inputs.create-kind-cluster == 'true' }}
       with:
-        node_image: kindest/node:v1.24.12
+        config: ./.github/kind-1.24.yaml
 
     - name: Add Dependencies
       shell: bash

.github/kind-1.24.yaml

@@ -0,0 +1,11 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+nodes:
+  - role: control-plane
+    image: kindest/node:v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab
+    kubeadmConfigPatches:
+      - |
+        kind: InitConfiguration
+        nodeRegistration:
+          kubeletExtraArgs:
+            node-labels: "ingress-ready=true"

.github/workflows/ebpf-test.yaml

@@ -0,0 +1,37 @@
+name: Test eBPF Chart
+
+on:
+  pull_request:
+    paths:
+      - "charts/opentelemetry-ebpf/**"
+    branches:
+      - main
+
+jobs:
+  ebpf-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Setup
+        uses: ./.github/actions/setup
+        with:
+          create-kind-cluster: "true"
+
+      - name: Run chart-testing (install)
+        run: ct install --charts charts/opentelemetry-ebpf
+
+      - name: Run daemonset and deployment install test
+        run: |
+          kubectl apply -f ./charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered
+
+          kubectl rollout status deployment example-opentelemetry-collector --timeout=30s
+
+          kubectl apply -f ./charts/opentelemetry-ebpf/examples/cloud-collector/rendered
+
+          kubectl rollout status daemonset example-opentelemetry-ebpf-kernel-collector --timeout=30s
+          kubectl rollout status deployment example-opentelemetry-ebpf-cloud-collector --timeout=30s
+          kubectl rollout status deployment example-opentelemetry-ebpf-k8s-collector --timeout=30s
+          kubectl rollout status deployment example-opentelemetry-ebpf-reducer --timeout=30s

.github/workflows/operator-test.yaml

@@ -26,6 +26,11 @@ jobs:
       - name: Install Openshift route crd
         run: kubectl apply -f https://raw.githubusercontent.com/openshift/router/master/deploy/route_crd.yaml
 
+      - name: Install Prometheus CRDs
+        run: |
+          kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/main/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+          kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/main/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+
       - name: Install cert-manager
         run: |
           kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.6.1/cert-manager.yaml
@@ -42,12 +47,14 @@ jobs:
 
       - name: Use public target-allocator image in tests
         run: |
+          appVersion=$(cat ./charts/opentelemetry-operator/Chart.yaml | sed -nr 's/appVersion: ([0-9]+\.[0-9]+\.[0-9]+)/\1/p')
           LOCAL_TARGET_ALLOCATOR_IMG="local\/opentelemetry-operator-targetallocator:e2e"
-          PUBLIC_TARGET_ALLOCATOR_IMG="ghcr.io\/open-telemetry\/opentelemetry-operator\/target-allocator:0.1.0"
+          PUBLIC_TARGET_ALLOCATOR_IMG="ghcr.io\/open-telemetry\/opentelemetry-operator\/target-allocator:$appVersion"
 
           sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/smoke-targetallocator/*.yaml
           sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/targetallocator-features/00-install.yaml
           sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/prometheus-config-validation/*.yaml
+          sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/targetallocator-prometheuscr/00-install.yaml
 
       - name: Install kuttl
         run: |
@@ -67,4 +74,5 @@ jobs:
           kubectl wait --timeout=5m --for=condition=available deployment my-opentelemetry-operator -n opentelemetry-operator-system
 
       - name: Run e2e tests
-        run:  kubectl kuttl test ./opentelemetry-operator/tests/e2e --config ./charts/opentelemetry-operator/kuttl-test.yaml
+        working-directory: ./opentelemetry-operator
+        run:  kubectl kuttl test ./tests/e2e --config ../charts/opentelemetry-operator/kuttl-test.yaml --crd-dir ../charts/opentelemetry-operator/crds

.github/workflows/release.yaml

@@ -17,7 +17,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v4
       -
         name: Setup Helm Repo
         run: |

Makefile

@@ -1,5 +1,5 @@
 TMP_DIRECTORY = ./tmp
-CHARTS ?= opentelemetry-collector opentelemetry-operator opentelemetry-demo
+CHARTS ?= opentelemetry-collector opentelemetry-operator opentelemetry-demo opentelemetry-ebpf
 
 .PHONY: generate-examples
 generate-examples:
@@ -57,14 +57,16 @@ check-examples:
 update-operator-crds:
 	APP_VERSION=$$(cat ./charts/opentelemetry-operator/Chart.yaml | sed -nr 's/appVersion: ([0-9]+\.[0-9]+\.[0-9]+)/\1/p') ; \
 	curl -s -o ./charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml ; \
-	curl -s -o ./charts/opentelemetry-operator/crds/crd-opentelemetryinstrumentation.yaml https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_instrumentations.yaml
+	curl -s -o ./charts/opentelemetry-operator/crds/crd-opentelemetryinstrumentation.yaml https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_instrumentations.yaml ; \
+	curl -s -o ./charts/opentelemetry-operator/crds/crd-opentelemetry.io_opampbridges.yaml https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_opampbridges.yaml
 
 .PHONY: check-operator-crds
 check-operator-crds:
 	APP_VERSION=$$(cat ./charts/opentelemetry-operator/Chart.yaml | sed -nr 's/appVersion: ([0-9]+\.[0-9]+\.[0-9]+)/\1/p'); \
 	mkdir -p ${TMP_DIRECTORY}/crds; \
 	curl -s -o "${TMP_DIRECTORY}/crds/crd-opentelemetrycollector.yaml" https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml; \
 	curl -s -o "${TMP_DIRECTORY}/crds/crd-opentelemetryinstrumentation.yaml" https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_instrumentations.yaml; \
+	curl -s -o "${TMP_DIRECTORY}/crds/crd-opentelemetry.io_opampbridges.yaml" https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_opampbridges.yaml; \
 	if diff ${TMP_DIRECTORY}/crds ./charts/opentelemetry-operator/crds > /dev/null; then \
 		echo "Passed"; \
 		rm -rf ${TMP_DIRECTORY}; \

README.md

@@ -45,6 +45,7 @@ See [CONTRIBUTING.md](./CONTRIBUTING.md).
 Approvers ([@open-telemetry/helm-approvers](https://github.com/orgs/open-telemetry/teams/helm-approvers)):
 
 - [Alex Birca](https://github.com/Allex1), Adobe
+- [Jared Tan](https://github.com/JaredTan95), DaoCloud
 - [Pierre Tessier](https://github.com/puckpuck), Honeycomb
 - [Povilas](https://github.com/povilasv), Coralogix
 

charts/opentelemetry-collector/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## OpenTelemetry Collector
 
+
+### v0.78.0 / 2023-12-13
+- [CHORE] Pull upstream changes
+- [CHORE] Bump Collector to 0.91.0
+- [CHORE] Enable Go memory limit feature flag by default.
+
 ### v0.77.5 / 2023-11-30
 - [FEAT] Add gke/autopilot distribution.
 

charts/opentelemetry-collector/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-collector
-version: 0.77.8
+version: 0.78.0
 description: OpenTelemetry Collector Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/
@@ -12,4 +12,4 @@ sources:
 icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
 maintainers:
   - name: povilasv
-appVersion: 0.90.1
+appVersion: 0.91.0

charts/opentelemetry-collector/UPGRADING.md

@@ -13,9 +13,15 @@ When enabled, the chart will remove the Memory Ballast Extension from the collec
 of the configured `resources.limits.memory`.  If no `resources.limits.memory` are set when `useGOMEMLIMIT` is enabled then a `GOMEMLIMIT` environment variable WILL NOT be
 created but the Memory Ballast Extension will still be removed.
 
-If you are not interested in using `GOMEMLIMIT` then this change does not affect you.  But, depending on the progress made in [Issue 891](https://github.com/open-telemetry/opentelemetry-helm-charts/issues/891),
+Depending on the progress made in [Issue 891](https://github.com/open-telemetry/opentelemetry-helm-charts/issues/891),
 the use of `GOMEMLIMIT` may completely replace the Memory Ballast Extension in the future.
 
+## 0.75.1 to 0.76.0
+
+Enable the `useGOMEMLIMIT` feature flag by default. This means by default the chart now does not use the Memory Ballast Extension and any custom configuraiton applied to the Memory Ballast Extension is ignored.
+
+**If you're still interested in using the Memory Ballast Extension set this back to false.**
+
 ## 0.69.3 to 0.70.0
 
 The following deprecated fields have been removed.  Please use the new values:

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

@@ -15,15 +15,15 @@ config:
       logs:
         exporters:
          - otlp
-         - logging
+         - debug
       metrics:
         exporters:
          - otlp
-         - logging
+         - debug
       traces:
         exporters:
          - otlp
-         - logging
+         - debug
 
 resources:
   limits:

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

@@ -5,11 +5,12 @@ kind: ClusterRole
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.77.8
+    helm.sh/chart: opentelemetry-collector-0.78.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.90.1"
+    app.kubernetes.io/version: "0.91.0"
     app.kubernetes.io/managed-by: Helm
+
 rules:
   - apiGroups: [""]
     resources: ["pods", "endpoints", "nodes/stats", "nodes/metrics", "nodes", "services"]

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

@@ -5,11 +5,12 @@ kind: ClusterRoleBinding
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.77.8
+    helm.sh/chart: opentelemetry-collector-0.78.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.90.1"
+    app.kubernetes.io/version: "0.91.0"
     app.kubernetes.io/managed-by: Helm
+
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

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

@@ -6,23 +6,23 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.77.8
+    helm.sh/chart: opentelemetry-collector-0.78.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.90.1"
+    app.kubernetes.io/version: "0.91.0"
     app.kubernetes.io/managed-by: Helm
+
 data:
   relay: |
     exporters:
+      debug: {}
       logging: {}
       otlp:
         endpoint: example-opentelemetry-collector:4317
         tls:
           insecure: true
     extensions:
       health_check: {}
-      memory_ballast:
-        size_in_percentage: 40
     processors:
       batch: {}
       memory_limiter:
@@ -62,12 +62,11 @@ data:
     service:
       extensions:
       - health_check
-      - memory_ballast
       pipelines:
         logs:
           exporters:
           - otlp
-          - logging
+          - debug
           processors:
           - memory_limiter
           - batch
@@ -76,7 +75,7 @@ data:
         metrics:
           exporters:
           - otlp
-          - logging
+          - debug
           processors:
           - memory_limiter
           - batch
@@ -87,7 +86,7 @@ data:
         traces:
           exporters:
           - otlp
-          - logging
+          - debug
           processors:
           - memory_limiter
           - batch

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

@@ -6,22 +6,22 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.77.8
+    helm.sh/chart: opentelemetry-collector-0.78.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.90.1"
+    app.kubernetes.io/version: "0.91.0"
     app.kubernetes.io/managed-by: Helm
+
 data:
   relay: |
     exporters:
+      debug: {}
       logging: {}
     extensions:
       health_check: {}
       k8s_observer:
         auth_type: serviceAccount
         observe_pods: true
-      memory_ballast:
-        size_in_percentage: 40
     processors:
       batch: {}
       filter/k8s_extra_metrics:
@@ -97,20 +97,19 @@ data:
     service:
       extensions:
       - health_check
-      - memory_ballast
       - k8s_observer
       pipelines:
         logs:
           exporters:
-          - logging
+          - debug
           processors:
           - memory_limiter
           - batch
           receivers:
           - otlp
         metrics:
           exporters:
-          - logging
+          - debug
           processors:
           - memory_limiter
           - batch
@@ -121,7 +120,7 @@ data:
           - prometheus/k8s_extra_metrics
         traces:
           exporters:
-          - logging
+          - debug
           processors:
           - memory_limiter
           - batch

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

@@ -6,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.77.8
+    helm.sh/chart: opentelemetry-collector-0.78.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.90.1"
+    app.kubernetes.io/version: "0.91.0"
     app.kubernetes.io/managed-by: Helm
+
 spec:
   selector:
     matchLabels:
@@ -22,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 5c10055f755ffbd6be8a9a575a7b7d8504afa4d15c0cb9c230ef90352b1b41b6
+        checksum/config: 282a36758c865c5a8aeb00d3afcf56ae120194ba8126ce546ee652edfb9066ca
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -41,7 +42,7 @@ spec:
             - --config=/conf/relay.yaml
           securityContext:
             {}
-          image: "otel/opentelemetry-collector-contrib:0.90.1"
+          image: "otel/opentelemetry-collector-contrib:0.91.0"
           imagePullPolicy: IfNotPresent
           ports:
 
@@ -80,6 +81,8 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: status.hostIP
+            - name: GOMEMLIMIT
+              value: 156MiB
           livenessProbe:
             httpGet:
               path: /