Skip to content

Commit 103c475

Browse files
committed
Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-operator into 3350-ta-matchlabels
2 parents cfe4dcd + 27e7271 commit 103c475

File tree

206 files changed

+6182
-988
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+6182
-988
lines changed

.chloggen/2947-updating-ds-sf-depl-mutation.yaml

-16
This file was deleted.

.chloggen/2779-kubeletstatsreiver-inject-en-vars.yaml .chloggen/fix-allocator-metric.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2-
change_type: enhancement
2+
change_type: breaking
33

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

77
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8-
note: Inject environment K8S_NODE_NAME environment variable for the Kubelet Stats Receiver.
8+
note: "change metric `opentelemetry_allocator_targets_remaining` type from counter to gauge"
99

1010
# One or more tracking issues related to the change
11-
issues: [2779]
11+
issues: [3578]
1212

1313
# (Optional) One or more lines of additional information to render under the primary note.
1414
# These lines will be padded with 2 spaces and then inserted directly into the document.

.chloggen/3332-musl-python-autoinstrumentation.yaml .chloggen/operator32.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2-
change_type: enhancement
2+
change_type: 'enhancement'
33

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

77
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8-
note: add config for installing musl based auto-instrumentation for Python
8+
note: Add support for Kubernetes `1.32`
99

1010
# One or more tracking issues related to the change
11-
issues: [2264]
11+
issues: [3544]
1212

1313
# (Optional) One or more lines of additional information to render under the primary note.
1414
# These lines will be padded with 2 spaces and then inserted directly into the document.

.github/workflows/changelog.yaml

+1-14
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Setup Go
3434
uses: actions/setup-go@v5
3535
with:
36-
go-version: "~1.22.4"
36+
go-version: "~1.23.4"
3737

3838
- name: Ensure no changes to the CHANGELOG
3939
run: |
@@ -65,16 +65,3 @@ jobs:
6565
run: |
6666
make chlog-validate \
6767
|| { echo "New ./.chloggen/*.yaml file failed validation."; exit 1; }
68-
69-
# In order to validate any links in the yaml file, render the config to markdown
70-
- name: Render .chloggen changelog entries
71-
run: make chlog-preview > changelog_preview.md
72-
- name: Install markdown-link-check
73-
run: npm install -g markdown-link-check
74-
- name: Run markdown-link-check
75-
run: |
76-
markdown-link-check \
77-
--verbose \
78-
--config .github/workflows/check_links_config.json \
79-
changelog_preview.md \
80-
|| { echo "Check that anchor links are lowercase"; exit 1; }

.github/workflows/continuous-integration.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/setup-go@v5
2323
id: setup-go
2424
with:
25-
go-version: "~1.22.4"
25+
go-version: "~1.23.4"
2626

2727
- name: Cache tools
2828
uses: actions/cache@v4
@@ -46,7 +46,7 @@ jobs:
4646
- name: Set up Go
4747
uses: actions/setup-go@v5
4848
with:
49-
go-version: "~1.22.4"
49+
go-version: "~1.23.4"
5050

5151
- name: Cache tools
5252
uses: actions/cache@v4
@@ -62,8 +62,6 @@ jobs:
6262
with:
6363
path: |
6464
/home/runner/.cache/golangci-lint
65-
/home/runner/go/pkg/mod
66-
./bin
6765
key: golangcilint-${{ hashFiles('**/go.sum') }}
6866
restore-keys: |
6967
golangcilint-
@@ -81,7 +79,7 @@ jobs:
8179
- name: Set up Go
8280
uses: actions/setup-go@v5
8381
with:
84-
go-version: "~1.22.4"
82+
go-version: "~1.23.4"
8583

8684
- name: Initialize CodeQL
8785
uses: github/codeql-action/init@v3

.github/workflows/e2e.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# should be compatible with them.
2222
kube-version:
2323
- "1.23"
24-
- "1.31"
24+
- "1.32"
2525
group:
2626
- e2e
2727
- e2e-automatic-rbac
@@ -31,6 +31,7 @@ jobs:
3131
- e2e-pdb
3232
- e2e-prometheuscr
3333
- e2e-targetallocator
34+
- e2e-targetallocator-cr
3435
- e2e-upgrade
3536
- e2e-multi-instrumentation
3637
- e2e-metadata-filters
@@ -51,14 +52,16 @@ jobs:
5152
kube-version: "1.29"
5253
- group: e2e-targetallocator
5354
setup: "enable-targetallocator-cr prepare-e2e"
55+
- group: e2e-targetallocator-cr
56+
setup: "enable-targetallocator-cr prepare-e2e"
5457
steps:
5558
- name: Check out code into the Go module directory
5659
uses: actions/checkout@v4
5760
- name: Set up Go
5861
uses: actions/setup-go@v5
5962
id: setup-go
6063
with:
61-
go-version: "~1.22.4"
64+
go-version: "~1.23.4"
6265
- name: Cache tools
6366
uses: actions/cache@v4
6467
with:

.github/workflows/publish-autoinstrumentation-java.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java
3838
tags: |
3939
type=match,pattern=v(.*),group=1,value=v${{ env.VERSION }}
40+
type=semver,pattern={{major}},value=v${{ env.VERSION }}
4041
4142
- name: Set up QEMU
4243
uses: docker/setup-qemu-action@v3

.github/workflows/publish-autoinstrumentation-nodejs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- uses: actions/checkout@v4
2727

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

3131
- name: Docker meta
3232
id: meta

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Set up Go
3737
uses: actions/setup-go@v5
3838
with:
39-
go-version: "~1.22.4"
39+
go-version: "~1.23.4"
4040

4141
- name: "generate release resources"
4242
run: make release-artifacts IMG_PREFIX="ghcr.io/open-telemetry/opentelemetry-operator" VERSION=${DESIRED_VERSION}

.github/workflows/scorecard.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ jobs:
1818
matrix:
1919
kube-version:
2020
- "1.23"
21-
- "1.31"
21+
- "1.32"
2222

2323
steps:
2424

2525
- name: Set up Go
2626
uses: actions/setup-go@v5
2727
id: setup-go
2828
with:
29-
go-version: "~1.22.4"
29+
go-version: "~1.23.4"
3030

3131
- name: Check out code into the Go module directory
3232
uses: actions/checkout@v4

.golangci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
run:
2-
concurrency: 4
2+
concurrency: 3
33
timeout: 5m
44
issues-exit-code: 1
55
tests: true

.linkspector.yml

Whitespace-only changes.

0 commit comments

Comments
 (0)