Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge from Upstream (#1) #3514

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 0 additions & 30 deletions .chloggen/3090-enable-multiinstrumentation-by-default.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/3149-add-must-gather.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions .chloggen/add_all_receiver_defaults.yaml

This file was deleted.

19 changes: 0 additions & 19 deletions .chloggen/fips.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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. collector, target allocator, auto-instrumentation, opamp, github action)
component: collector
component: 'github action'

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Improves healthcheck parsing capabilities, allowing for future extensions to configure a healthcheck other than the v1 healthcheck extension.
note: Add new line character at the end of PrometheusRule file.

# One or more tracking issues related to the change
issues: [3184]
issues: [3503]

# (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.
Expand Down
36 changes: 0 additions & 36 deletions .chloggen/remove_localhost_fg.yaml

This file was deleted.

24 changes: 0 additions & 24 deletions .chloggen/resource-attribute-from-annotations.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@ change_type: bug_fix
component: auto-instrumentation

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Fix ApacheHttpd, Nginx and SDK injectors to honour their container-names annotations.
note: Reverts PR 3379 which inadvertently broke users setting JAVA_TOOL_OPTIONS

# One or more tracking issues related to the change
issues: [3313]
issues: [3463]

# (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: This is a breaking change if anyone is accidentally using the enablement flag with container names for these 3 injectors.
subtext: |
Reverts a previous PR which was causing JAVA_TOOL_OPTIONS to not be overriden when
set by users. This was resulting in application crashloopbackoffs for users relying
on java autoinstrumentation.
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
component: operator
component: collector

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Use 0.0.0.0 as otlp receiver default address
note: support for creating a service for extensions when ports are specified.

# One or more tracking issues related to the change
issues: [3126]
issues: [3460]

# (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.
Expand Down
3 changes: 0 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,3 @@

# AutoInstrumentation owners
# TBD

# Target Allocator owners
cmd/otel-allocator @open-telemetry/operator-ta-maintainers
13 changes: 0 additions & 13 deletions .github/workflows/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,3 @@ jobs:
run: |
make chlog-validate \
|| { echo "New ./.chloggen/*.yaml file failed validation."; exit 1; }

# In order to validate any links in the yaml file, render the config to markdown
- name: Render .chloggen changelog entries
run: make chlog-preview > changelog_preview.md
- name: Install markdown-link-check
run: npm install -g markdown-link-check
- name: Run markdown-link-check
run: |
markdown-link-check \
--verbose \
--config .github/workflows/check_links_config.json \
changelog_preview.md \
|| { echo "Check that anchor links are lowercase"; exit 1; }
2 changes: 0 additions & 2 deletions .github/workflows/continuous-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ jobs:
with:
path: |
/home/runner/.cache/golangci-lint
/home/runner/go/pkg/mod
./bin
key: golangcilint-${{ hashFiles('**/go.sum') }}
restore-keys: |
golangcilint-
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,29 @@ jobs:
- e2e-pdb
- e2e-prometheuscr
- e2e-targetallocator
- e2e-targetallocator-cr
- e2e-upgrade
- e2e-multi-instrumentation
- e2e-metadata-filters
- e2e-ta-collector-mtls
include:
- group: e2e-instrumentation
setup: "add-instrumentation-params prepare-e2e"
- group: e2e-multi-instrumentation
setup: "add-instrumentation-params prepare-e2e"
- group: e2e-metadata-filters
setup: "add-operator-arg OPERATOR_ARG='--annotations-filter=.*filter.out --annotations-filter=config.*.gke.io.* --labels-filter=.*filter.out' prepare-e2e"
- group: e2e-ta-collector-mtls
setup: "add-operator-arg OPERATOR_ARG='--feature-gates=operator.targetallocator.mtls' add-certmanager-permissions prepare-e2e"
- group: e2e-automatic-rbac
setup: "add-rbac-permissions-to-operator prepare-e2e"
- group: e2e-native-sidecar
setup: "add-operator-arg OPERATOR_ARG='--feature-gates=operator.sidecarcontainers.native' prepare-e2e"
kube-version: "1.29"
- group: e2e-targetallocator
setup: "enable-targetallocator-cr prepare-e2e"
- group: e2e-targetallocator-cr
setup: "enable-targetallocator-cr prepare-e2e"
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v4
Expand All @@ -56,8 +67,6 @@ jobs:
with:
path: bin
key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}-${{ steps.setup-go.outputs.go-version }}
- name: Install chainsaw
uses: kyverno/[email protected]
- name: Install tools
run: make install-tools
- name: Prepare e2e tests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-autoinstrumentation-nodejs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4

- name: Read version
run: echo VERSION=$(cat autoinstrumentation/nodejs/package.json | jq -r '.dependencies."@opentelemetry/sdk-node"') >> $GITHUB_ENV
run: echo VERSION=$(cat autoinstrumentation/nodejs/package.json | jq -r '.dependencies."@opentelemetry/auto-instrumentations-node"') >> $GITHUB_ENV

- name: Docker meta
id: meta
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: autoinstrumentation/nodejs
platforms: linux/amd64,linux/arm64
platforms: linux/amd64,linux/arm64,linux/s390x,linux/ppc64le
push: ${{ github.event_name == 'push' }}
build-args: version=${{ env.VERSION }}
tags: ${{ steps.meta.outputs.tags }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable-operator-hub-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
env:
VERSION: ${{ env.version }}
run: |
mkdir operators/opentelemetry-operator/${VERSION}
mkdir operators/opentelemetry-operator/${VERSION}
cp -R ./tmp/bundle/${{ inputs.folder }}/* operators/opentelemetry-operator/${VERSION}
rm -rf ./tmp

Expand All @@ -73,7 +73,7 @@ jobs:
message="Update the opentelemetry to $VERSION"
body="Release opentelemetry-operator \`$VERSION\`.

cc @pavolloffay @frzifus @yuriolisa @jaronoff97 @TylerHelmuth @swiatekm
cc @pavolloffay @frzifus @yuriolisa @jaronoff97 @TylerHelmuth @swiatekm @iblancasa
"
branch="update-opentelemetry-operator-to-${VERSION}"

Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# Binaries for programs and plugins
*.exe
*.exe~
Expand Down Expand Up @@ -39,8 +38,9 @@ config/manager/kustomization.yaml
kubeconfig
tests/_build/
config/rbac/extra-permissions-operator/
config/rbac/certmanager-permissions/

# autoinstrumentation artifacts
build
node_modules
package-lock.json
package-lock.json
Empty file added .linkspector.yml
Empty file.
Loading