Merge branch 'main' into ta/really-consistent-hashing

.chloggen/bump-dotnet-1.1.0.yaml → .chloggen/.bump-dotnet-1.2.0.yaml

@@ -5,12 +5,12 @@ change_type: enhancement
 component: autoinstrumentation
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Bump OpenTelemetry .NET Automatic Instrumentation to 1.1.0
+note: Bump OpenTelemetry .NET Automatic Instrumentation to 1.2.0
 
 # One or more tracking issues related to the change
-issues: [2252]
+issues: [2382]
 
 # (Optional) One or more lines of additional information to render under the primary note.
 # These lines will be padded with 2 spaces and then inserted directly into the document.
 # Use pipe (|) for multiline entries.
-subtext:
+subtext:

.chloggen/1368-create-operator-bridge-crd-in-operator.yaml → .chloggen/2364-foreground-delete.yaml

@@ -1,14 +1,14 @@
 # One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
-change_type: 'enhancement'
+change_type: bug_fix
 
 # The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
-component: operator-opamp-bridge
+component: operator
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: "Creates the CRD for the OpAMPBridge resource"
+note: fixes ability to do a foreground cascading delete
 
 # One or more tracking issues related to the change
-issues: [1368]
+issues: [2364]
 
 # (Optional) One or more lines of additional information to render under the primary note.
 # These lines will be padded with 2 spaces and then inserted directly into the document.

.chloggen/bump-nodejs-dependencies.yaml → .chloggen/TA-liveness-probe.yaml

@@ -5,10 +5,10 @@ change_type: enhancement
 component: operator
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: "Bump NodeJS dependencies. Also, increase the size of the default size for the volume used to copy the autoinstrumentation libraries from 150M to 200M"
+note: add liveness probe to target allocator deployment generation
 
 # One or more tracking issues related to the change
-issues: [2240, 2237]
+issues: [2258]
 
 # (Optional) One or more lines of additional information to render under the primary note.
 # These lines will be padded with 2 spaces and then inserted directly into the document.

.chloggen/enhanced-status.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
+component: operator
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: added reconciliation errors for CRD events
+
+# One or more tracking issues related to the change
+issues: [1972]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/bug-fix-labeling-process.yaml → .chloggen/issue-2366-fix.yaml

@@ -2,15 +2,15 @@
 change_type: bug_fix
 
 # The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
-component: Operator
+component: operator
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Fixed the labeling process which was broken at the moment to capture the current image tag when the users set the sha256 reference. 
+note: lifecycle spec removed from cloned initContainer
 
 # One or more tracking issues related to the change
-issues: [1982]
+issues: [2366]
 
 # (Optional) One or more lines of additional information to render under the primary note.
 # These lines will be padded with 2 spaces and then inserted directly into the document.
 # Use pipe (|) for multiline entries.
-subtext: ""
+subtext:

.chloggen/main.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
+component: operator
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: add missing pod in the rbac
+
+# One or more tracking issues related to the change
+issues: [1679]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/sa-fix.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
+component: operator
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: check if service account specified in otelcol before creating service account resource for collectors
+
+# One or more tracking issues related to the change
+issues: [2372]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/ta-readiness-probe.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
+component: operator
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: add readiness probe to target allocator deployment generation
+
+# One or more tracking issues related to the change
+issues: [2258]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/ta-readiness.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
+component: target allocator
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: add readyz endpoint to TA
+
+# One or more tracking issues related to the change
+issues: [2258]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/fix-TA-kubeconfig.yaml → .chloggen/target-allocator-delayed-collector-instances.yaml

@@ -5,12 +5,12 @@ change_type: bug_fix
 component: target allocator
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: reset kubeconfig to empty string when using in-cluster config
+note: Save targets discovered before collector instances come up
 
 # One or more tracking issues related to the change
-issues: [2262]
+issues: [2350]
 
 # (Optional) One or more lines of additional information to render under the primary note.
 # These lines will be padded with 2 spaces and then inserted directly into the document.
 # Use pipe (|) for multiline entries.
-subtext: ""
+subtext:

.github/dependabot.yml

@@ -41,6 +41,10 @@ updates:
         patterns:
           - "k8s.io/*"
           - "sigs.k8s.io/*"
+      otel:
+        patterns:
+          - go.opentelemetry.io/otel
+          - go.opentelemetry.io/otel/*
   - package-ecosystem: gomod
     directory: /cmd/otel-allocator
     schedule:

.github/workflows/e2e.yaml

@@ -34,19 +34,23 @@ jobs:
          - e2e-opampbridge
 
     steps:
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v4
+
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: "~1.21.1"
+        go-version: "~1.21.3"
+        cache-dependency-path: |
+          go.sum
+          cmd/otel-allocator/go.sum
+          cmd/operator-opamp-bridge/go.sum
 
     - name: Setup kind
       env:
         KIND_VERSION: "0.20.0"
       run: go install sigs.k8s.io/kind@v${KIND_VERSION}
 
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v4
-
     - name: "install kuttl"
       run: ./hack/install-kuttl.sh
 

.github/workflows/publish-images.yaml

@@ -7,13 +7,20 @@ on:
 
   workflow_dispatch:
 
+env:
+  PLATFORMS: linux/amd64,linux/arm64,linux/s390x,linux/ppc64le
+
 jobs:
   publish:
     name: Publish container images
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '~1.21.3'
+
       - name: Unshallow 
         run: git fetch --prune --unshallow
 
@@ -34,7 +41,15 @@ jobs:
           grep -v '\#' versions.txt | grep autoinstrumentation-apache-httpd | awk -F= '{print "AUTO_INSTRUMENTATION_NGINX_VERSION="$2}' >> $GITHUB_ENV
           echo "VERSION_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
           echo "VERSION=$(git describe --tags | sed 's/^v//')" >> $GITHUB_ENV
-
+      
+      - name: Build the binary for each supported architecture
+        run: |
+          for platform in $(echo $PLATFORMS | tr "," "\n"); do
+            arch=${platform#*/}
+            echo "Building manager for $arch"
+            make manager ARCH=$arch
+          done
+        
       - name: Docker meta
         id: docker_meta
         uses: docker/metadata-action@v5
@@ -82,23 +97,9 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/s390x,linux/ppc64le
+          platforms: ${{ env.PLATFORMS }}
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
-          build-args: |
-            VERSION_PKG=github.com/open-telemetry/opentelemetry-operator/internal/version
-            VERSION=${{ env.VERSION }}
-            VERSION_DATE=${{ env.VERSION_DATE }}
-            OTELCOL_VERSION=${{ env.OTELCOL_VERSION }}
-            TARGETALLOCATOR_VERSION=${{ env.TARGETALLOCATOR_VERSION }}
-            OPERATOR_OPAMP_BRIDGE_VERSION=${{ env.OPERATOR_OPAMP_BRIDGE_VERSION }}
-            AUTO_INSTRUMENTATION_JAVA_VERSION=${{ env.AUTO_INSTRUMENTATION_JAVA_VERSION }}
-            AUTO_INSTRUMENTATION_NODEJS_VERSION=${{ env.AUTO_INSTRUMENTATION_NODEJS_VERSION }}
-            AUTO_INSTRUMENTATION_PYTHON_VERSION=${{ env.AUTO_INSTRUMENTATION_PYTHON_VERSION }}
-            AUTO_INSTRUMENTATION_DOTNET_VERSION=${{ env.AUTO_INSTRUMENTATION_DOTNET_VERSION }}
-            AUTO_INSTRUMENTATION_GO_VERSION=${{ env.AUTO_INSTRUMENTATION_GO_VERSION }}
-            AUTO_INSTRUMENTATION_APACHE_HTTPD_VERSION=${{ env.AUTO_INSTRUMENTATION_APACHE_HTTPD_VERSION }}
-            AUTO_INSTRUMENTATION_NGINX_VERSION=${{ env.AUTO_INSTRUMENTATION_NGINX_VERSION }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache

.github/workflows/publish-operator-opamp-bridge.yaml

@@ -11,18 +11,35 @@ on:
       - 'v*'
   workflow_dispatch:
 
+env:
+  PLATFORMS: linux/amd64,linux/arm64,linux/s390x,linux/ppc64le
+
 jobs:
   publish:
     runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
+
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '~1.21.3'
+          cache-dependency-path: 'cmd/operator-opamp-bridge/go.sum'
 
+      # TODO: We're currently not using this. Should we?
       - name: Read version
         run: |
           echo "VERSION=$(git describe --tags | sed 's/^v//')" >> $GITHUB_ENV
           echo "VERSION_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
 
+      - name: Build the binary for each supported architecture
+        run: |
+          for platform in $(echo $PLATFORMS | tr "," "\n"); do
+            arch=${platform#*/}
+            echo "Building operator-opamp-bridge for $arch"
+            make operator-opamp-bridge ARCH=$arch
+          done
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
@@ -69,11 +86,8 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: cmd/operator-opamp-bridge
-          platforms: linux/amd64,linux/arm64,linux/s390x,linux/ppc64le
+          platforms: ${{ env.PLATFORMS }}
           push: true
-          build-args: |
-            VERSION=${{ env.VERSION }}
-            VERSION_DATE=${{ env.VERSION_DATE }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=local,src=/tmp/.buildx-cache

.github/workflows/publish-target-allocator.yaml

@@ -11,18 +11,35 @@ on:
       - 'v*'
   workflow_dispatch:
 
+env:
+  PLATFORMS: linux/amd64,linux/arm64,linux/s390x,linux/ppc64le
+
 jobs:
   publish:
     runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
 
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '~1.21.3'
+          cache-dependency-path: 'cmd/otel-allocator/go.sum'
+
+      # TODO: We're currently not using this. Should we?
       - name: Read version
         run: |
           echo "VERSION=$(git describe --tags | sed 's/^v//')" >> $GITHUB_ENV
           echo "VERSION_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
 
+      - name: Build the binary for each supported architecture
+        run: |
+          for platform in $(echo $PLATFORMS | tr "," "\n"); do
+            arch=${platform#*/}
+            echo "Building target allocator for $arch"
+            make targetallocator ARCH=$arch
+          done
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
@@ -69,11 +86,8 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: cmd/otel-allocator
-          platforms: linux/amd64,linux/arm64,linux/s390x,linux/ppc64le
+          platforms: ${{ env.PLATFORMS }}
           push: true
-          build-args: |
-            VERSION=${{ env.VERSION }}
-            VERSION_DATE=${{ env.VERSION_DATE }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=local,src=/tmp/.buildx-cache