Skip to content

Commit 738fbda

Browse files
yuriolisayuriolisa
committed
Add support to set image pull policy for agent images
2 parents 26966f0 + 117c337 commit 738fbda

File tree

392 files changed

+38205
-40924
lines changed

Some content is hidden

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

392 files changed

+38205
-40924
lines changed

‎.chloggen/feat_enable-ta-crd.yaml

-16
This file was deleted.

‎.github/workflows/changelog.yaml

+1-1
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.23.5"
36+
go-version: "~1.23.6"
3737

3838
- name: Ensure no changes to the CHANGELOG
3939
run: |

‎.github/workflows/continuous-integration.yaml

+3-3
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.23.5"
25+
go-version: "~1.23.6"
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.23.5"
49+
go-version: "~1.23.6"
5050

5151
- name: Cache tools
5252
uses: actions/cache@v4
@@ -79,7 +79,7 @@ jobs:
7979
- name: Set up Go
8080
uses: actions/setup-go@v5
8181
with:
82-
go-version: "~1.23.5"
82+
go-version: "~1.23.6"
8383

8484
- name: Initialize CodeQL
8585
uses: github/codeql-action/init@v3

‎.github/workflows/e2e.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
uses: actions/setup-go@v5
6262
id: setup-go
6363
with:
64-
go-version: "~1.23.5"
64+
go-version: "~1.23.6"
6565
- name: Cache tools
6666
uses: actions/cache@v4
6767
with:

‎.github/workflows/publish-autoinstrumentation-php.yaml

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
name: "Publish PHP Auto-Instrumentation"
2+
3+
on:
4+
push:
5+
paths:
6+
- 'autoinstrumentation/php/**'
7+
- '.github/workflows/publish-autoinstrumentation-php.yaml'
8+
branches:
9+
- main
10+
pull_request:
11+
paths:
12+
- 'autoinstrumentation/php/**'
13+
- '.github/workflows/publish-autoinstrumentation-php.yaml'
14+
workflow_dispatch:
15+
16+
concurrency:
17+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
18+
cancel-in-progress: true
19+
20+
jobs:
21+
publish:
22+
runs-on: ubuntu-22.04
23+
24+
steps:
25+
- uses: actions/checkout@v4
26+
27+
- name: Read version
28+
run: echo "VERSION=$(cat autoinstrumentation/php/version.txt)" >> $GITHUB_ENV
29+
30+
- name: Docker meta
31+
id: meta
32+
uses: docker/metadata-action@v5
33+
with:
34+
images: |
35+
otel/autoinstrumentation-php
36+
ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-php
37+
tags: |
38+
type=match,pattern=v(.*),group=1,value=v${{ env.VERSION }}
39+
40+
- name: Set up Docker Buildx
41+
uses: docker/setup-buildx-action@v3
42+
43+
- name: Cache Docker layers
44+
uses: actions/cache@v4
45+
with:
46+
path: /tmp/.buildx-cache
47+
key: ${{ runner.os }}-buildx-${{ github.sha }}
48+
restore-keys: |
49+
${{ runner.os }}-buildx-
50+
51+
- name: Log into Docker.io
52+
uses: docker/login-action@v3
53+
if: ${{ github.event_name == 'push' }}
54+
with:
55+
username: ${{ secrets.DOCKER_USERNAME }}
56+
password: ${{ secrets.DOCKER_PASSWORD }}
57+
58+
- name: Login to GitHub Package Registry
59+
uses: docker/login-action@v3
60+
if: ${{ github.event_name == 'push' }}
61+
with:
62+
registry: ghcr.io
63+
username: ${{ github.repository_owner }}
64+
password: ${{ secrets.GITHUB_TOKEN }}
65+
66+
- name: Prepare files for docker image
67+
run: pushd ./autoinstrumentation/php ; ./prepare_files_for_docker_image.sh --ext-ver ${{ env.VERSION }} --dest-dir ${PWD}/files_for_docker_image ; popd
68+
69+
- name: Build and push
70+
uses: docker/build-push-action@v6
71+
with:
72+
context: autoinstrumentation/php
73+
push: ${{ github.event_name == 'push' }}
74+
build-args: SUB_DIR_WITH_FILES_FOR_DOCKER_IMAGE=files_for_docker_image
75+
tags: ${{ steps.meta.outputs.tags }}
76+
labels: ${{ steps.meta.outputs.labels }}
77+
cache-from: type=local,src=/tmp/.buildx-cache
78+
cache-to: type=local,dest=/tmp/.buildx-cache

‎.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.23.5"
39+
go-version: "~1.23.6"
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/setup-go@v5
2727
id: setup-go
2828
with:
29-
go-version: "~1.23.5"
29+
go-version: "~1.23.6"
3030

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

‎.github/workflows/shellcheck.yaml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: shellcheck
2+
on:
3+
push:
4+
branches:
5+
- main
6+
pull_request:
7+
permissions: {}
8+
9+
jobs:
10+
shellcheck:
11+
name: shellcheck
12+
runs-on: ubuntu-24.04
13+
env:
14+
VERSION: v0.10.0
15+
steps:
16+
- uses: actions/checkout@v4
17+
- name: shellcheck ci scripts
18+
uses: ludeeus/[email protected]
19+
env:
20+
SHELLCHECK_OPTS: -x -e SC2059 -e SC2086
21+
with:
22+
scandir: ".ci"
23+
severity: warning
24+
version: ${{ env.VERSION }}
25+
- name: shellcheck hack scripts
26+
uses: ludeeus/[email protected]
27+
env:
28+
SHELLCHECK_OPTS: -x -e SC2059 -e SC2086
29+
with:
30+
scandir: "hack"
31+
severity: warning
32+
version: ${{ env.VERSION }}

‎.golangci.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ run:
77
# all available settings of specific linters
88
linters-settings:
99
goheader:
10-
template-path: header.txt
10+
template: |-
11+
Copyright The OpenTelemetry Authors
12+
SPDX-License-Identifier: Apache-2.0
1113
goimports:
1214
local-prefixes: github.com/open-telemetry/opentelemetry-operator
1315
gci:

‎CHANGELOG.md

+34
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,40 @@
22

33
<!-- next version -->
44

5+
## 0.118.0
6+
7+
### 🚀 New components 🚀
8+
9+
- `target allocator`: Introduce TargetAllocator CRD (#2422)
10+
See the [CRD changelog](./docs/crd-changelog.md) for more information.
11+
12+
### 💡 Enhancements 💡
13+
14+
- `target allocator`: Support camelcase matchLabels and matchExpressions in target allocator config (#3350)
15+
16+
### 🧰 Bug fixes 🧰
17+
18+
- `collector`: Fix config handling with null values. (#3452)
19+
Fix the defaulting webhook error `src and dst must not be nil` caused by defaulting a known component with a null value:
20+
e.g.
21+
```yaml
22+
receivers:
23+
zipkin:
24+
```
25+
- `collector`: Prevent mounting secrets to collector when TA is not deployed and mTLS feature gate is enabled (#3456)
26+
27+
### Components
28+
29+
* [OpenTelemetry Collector - v0.118.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.118.0)
30+
* [OpenTelemetry Contrib - v0.118.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.118.0)
31+
* [Java auto-instrumentation - v1.33.6](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.33.6)
32+
* [.NET auto-instrumentation - v1.2.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.2.0)
33+
* [Node.JS - v0.53.0](https://github.com/open-telemetry/opentelemetry-js/releases/tag/experimental%2Fv0.53.0)
34+
* [Python - v0.50b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.50b0)
35+
* [Go - v0.19.0-alpha](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/v0.19.0-alpha)
36+
* [ApacheHTTPD - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
37+
* [Nginx - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
38+
539
## 0.117.0
640

741
### 🛑 Breaking changes 🛑

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Get CA certificates from alpine package repo
2-
FROM alpine:3.20 as certificates
2+
FROM alpine:3.21 as certificates
33

44
RUN apk --no-cache add ca-certificates
55

‎Makefile

+7-2
Original file line numberDiff line numberDiff line change
@@ -625,8 +625,13 @@ api-docs: crdoc kustomize
625625
cp -r config/crd/* $$TMP_MANIFEST_DIR; \
626626
$(MAKE) CRD_OPTIONS=$(CRD_OPTIONS),maxDescLen=1200 MANIFEST_DIR=$$TMP_MANIFEST_DIR/bases manifests ;\
627627
TMP_DIR=$$(mktemp -d) ; \
628-
$(KUSTOMIZE) build $$TMP_MANIFEST_DIR -o $$TMP_DIR/crd-output.yaml ;\
629-
$(CRDOC) --resources $$TMP_DIR/crd-output.yaml --output docs/api.md ;\
628+
$(KUSTOMIZE) build $$TMP_MANIFEST_DIR -o $$TMP_DIR ;\
629+
mkdir -p docs/api ;\
630+
for crdmanifest in $$TMP_DIR/*; do \
631+
filename="$$(basename -s .opentelemetry.io.yaml $$crdmanifest)" ;\
632+
filename="$${filename#apiextensions.k8s.io_v1_customresourcedefinition_}" ;\
633+
$(CRDOC) --resources $$crdmanifest --output docs/api/$$filename.md ;\
634+
done;\
630635
}
631636

632637

‎RELEASE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ The operator should be released within a week after the [OpenTelemetry collector
4444

4545
| Version | Release manager |
4646
|----------|-----------------|
47-
| v0.118.0 | @iblancasa |
4847
| v0.119.0 | @frzifus |
4948
| v0.120.0 | @yuriolisa |
5049
| v0.121.0 | @pavolloffay |
5150
| v0.122.0 | @TylerHelmuth |
5251
| v0.123.0 | @jaronoff97 |
5352
| v0.124.0 | @swiatekm |
53+
| v0.125.0 | @iblancasa |

‎apis/v1alpha1/allocation_strategy.go

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
// Copyright The OpenTelemetry Authors
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
2+
// SPDX-License-Identifier: Apache-2.0
143

154
package v1alpha1
165

‎apis/v1alpha1/convert.go

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
// Copyright The OpenTelemetry Authors
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
2+
// SPDX-License-Identifier: Apache-2.0
143

154
package v1alpha1
165

‎apis/v1alpha1/convert_test.go

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
// Copyright The OpenTelemetry Authors
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
2+
// SPDX-License-Identifier: Apache-2.0
143

154
package v1alpha1
165

‎apis/v1alpha1/groupversion_info.go

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
// Copyright The OpenTelemetry Authors
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
2+
// SPDX-License-Identifier: Apache-2.0
143

154
// Package v1alpha1 contains API Schema definitions for the core v1alpha1 API group.
165
// +kubebuilder:object:generate=true

‎apis/v1alpha1/ingress_type.go

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
// Copyright The OpenTelemetry Authors
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
2+
// SPDX-License-Identifier: Apache-2.0
143

154
package v1alpha1
165

‎apis/v1alpha1/instrumentation_types.go

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
// Copyright The OpenTelemetry Authors
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
2+
// SPDX-License-Identifier: Apache-2.0
143

154
package v1alpha1
165

0 commit comments

Comments
 (0)