Skip to content

Commit ff218b1

Browse files
authored
Merge pull request #118 from kube-logging/renovate/all
chore(deps): update all dependencies
2 parents fa099a8 + 504d24e commit ff218b1

19 files changed

+309
-304
lines changed

.github/workflows/artifacts.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,24 +58,24 @@ jobs:
5858

5959
steps:
6060
- name: Checkout repository
61-
uses: actions/checkout@v4
61+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6262

6363
- name: Set up QEMU
64-
uses: docker/setup-qemu-action@v3
64+
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
6565

6666
- name: Set up Docker Buildx
67-
uses: docker/setup-buildx-action@v3
67+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
6868

6969
- name: Set up Cosign
70-
uses: sigstore/cosign-installer@v3
70+
uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
7171

7272
- name: Set image name
7373
id: image-name
7474
run: echo "value=ghcr.io/${{ github.repository }}" >> "$GITHUB_OUTPUT"
7575

7676
- name: Gather build metadata
7777
id: meta
78-
uses: docker/metadata-action@v5
78+
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
7979
with:
8080
images: ${{ steps.image-name.outputs.value }}
8181
flavor: |
@@ -95,7 +95,7 @@ jobs:
9595
# Multiple exporters are not supported yet
9696
# See https://github.com/moby/buildkit/pull/2760
9797
- name: Determine build output
98-
uses: haya14busa/[email protected]
98+
uses: haya14busa/action-cond@94f77f7a80cd666cb3155084e428254fea4281fd # v1.2.1
9999
id: build-output
100100
with:
101101
cond: ${{ inputs.publish }}
@@ -112,7 +112,7 @@ jobs:
112112

113113
- name: Build and push image
114114
id: build
115-
uses: docker/build-push-action@v6
115+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
116116
with:
117117
context: .
118118
platforms: linux/amd64,linux/arm64
@@ -173,14 +173,14 @@ jobs:
173173
output: trivy-results.sarif
174174

175175
- name: Upload Trivy scan results as artifact
176-
uses: actions/upload-artifact@v4
176+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
177177
with:
178178
name: "[${{ github.job }}] Trivy scan results"
179179
path: trivy-results.sarif
180180
retention-days: 5
181181

182182
- name: Upload Trivy scan results to GitHub Security tab
183-
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
183+
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
184184
with:
185185
sarif_file: trivy-results.sarif
186186

@@ -201,13 +201,13 @@ jobs:
201201

202202
steps:
203203
- name: Checkout repository
204-
uses: actions/checkout@v4
204+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
205205

206206
- name: Set up Helm
207-
uses: azure/[email protected]
207+
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
208208

209209
- name: Set up Cosign
210-
uses: sigstore/cosign-installer@v3
210+
uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
211211

212212
- name: Set chart name
213213
id: chart-name
@@ -242,7 +242,7 @@ jobs:
242242
echo "package=${{ steps.chart-name.outputs.value }}-${{ steps.version.outputs.value }}.tgz" >> "$GITHUB_OUTPUT"
243243
244244
- name: Upload chart as artifact
245-
uses: actions/upload-artifact@v4
245+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
246246
with:
247247
name: "[${{ github.job }}] Helm chart"
248248
path: ${{ steps.build.outputs.package }}
@@ -292,13 +292,13 @@ jobs:
292292
output: trivy-results.sarif
293293

294294
- name: Upload Trivy scan results as artifact
295-
uses: actions/upload-artifact@v4
295+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
296296
with:
297297
name: "[${{ github.job }}] Trivy scan results"
298298
path: trivy-results.sarif
299299
retention-days: 5
300300

301301
- name: Upload Trivy scan results to GitHub Security tab
302-
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
302+
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
303303
with:
304304
sarif_file: trivy-results.sarif

.github/workflows/ci.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515

1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1919

2020
- name: Set up Go
21-
uses: actions/setup-go@v5
21+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2222
with:
2323
go-version-file: '.go-version'
2424

@@ -34,10 +34,10 @@ jobs:
3434

3535
steps:
3636
- name: Checkout code
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3838

3939
- name: Set up Go
40-
uses: actions/setup-go@v5
40+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
4141
with:
4242
go-version-file: '.go-version'
4343

@@ -52,15 +52,15 @@ jobs:
5252

5353
steps:
5454
- name: Checkout code
55-
uses: actions/checkout@v4
55+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5656

5757
- name: Set up Go
58-
uses: actions/setup-go@v5
58+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
5959
with:
6060
go-version-file: '.go-version'
6161

6262
- name: Cache licenses
63-
uses: actions/cache@v4
63+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
6464
with:
6565
key: licensei-v2-${{ hashFiles('go.sum') }}
6666
path: |

.github/workflows/e2e.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ on:
88
pull_request:
99

1010
env:
11-
KUBECTL_VERSION: 'v1.26.6'
11+
KUBECTL_VERSION: 'v1.32.0'
1212

1313
jobs:
1414
build:
1515
name: Image build
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020

2121
- name: Set up Docker Buildx
22-
uses: docker/setup-buildx-action@v3
22+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
2323

2424
- name: Build and export
25-
uses: docker/build-push-action@v6
25+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
2626
with:
2727
context: .
2828
tags: controller:local
@@ -31,7 +31,7 @@ jobs:
3131
outputs: type=docker,dest=/tmp/controller.tar
3232

3333
- name: Upload artifact
34-
uses: actions/upload-artifact@v4
34+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
3535
with:
3636
name: controller
3737
path: /tmp/controller.tar
@@ -43,14 +43,14 @@ jobs:
4343
strategy:
4444
fail-fast: false
4545
matrix:
46-
kube: ["1.29", "1.30", "1.31"]
46+
kube: ["1.30", "1.31", "1.32"]
4747

4848
steps:
4949
- name: Set up Docker Buildx
50-
uses: docker/setup-buildx-action@v3
50+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
5151

5252
- name: Download artifact
53-
uses: actions/download-artifact@v4
53+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
5454
with:
5555
name: controller
5656
path: /tmp
@@ -61,24 +61,24 @@ jobs:
6161
docker image ls -a
6262
6363
- name: Set up kubectl
64-
uses: azure/[email protected]
64+
uses: azure/setup-kubectl@3e0aec4d80787158d308d7b364cb1b702e7feb7f # v4.0.0
6565
with:
6666
version: ${{ env.KUBECTL_VERSION }}
6767

6868
- name: Checkout code
69-
uses: actions/checkout@v4
69+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7070

7171
# See https://github.com/kubernetes-sigs/kind/releases/tag/v0.20.0
7272
- name: Determine KinD node image version
7373
id: node_image
7474
run: |
7575
case ${{ matrix.kube }} in
76-
1.29)
77-
NODE_IMAGE=kindest/node:v1.29.4@sha256:ea40a6bd365a17f71fd3883a1d34a0791d7d6b0eb75832c6d85b6f2326827f1e ;;
7876
1.30)
7977
NODE_IMAGE=kindest/node:v1.30.0@sha256:2af5d1b382926abcd6336312d652cd045b7cc47475844a608669c71b1fefcfbc ;;
8078
1.31)
8179
NODE_IMAGE=kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865 ;;
80+
1.32)
81+
NODE_IMAGE=kindest/node:v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027
8282
esac
8383
8484
echo "image=$NODE_IMAGE" >> $GITHUB_OUTPUT
@@ -99,7 +99,7 @@ jobs:
9999
100100
- name: Archive Test Results
101101
if: always()
102-
uses: actions/upload-artifact@v4
102+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
103103
with:
104104
name: script-e2e-test-cluster-logs-${{ matrix.kube }}
105105
path: build/_test

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.23.3-alpine3.20@sha256:25db3a0508ff009054bf467f25e1ab395fced0f93b69459dd736ae523e61c781 AS builder
2+
FROM golang:1.23.5-alpine3.20@sha256:def59a601e724ddac5139d447e8e9f7d0aeec25db287a9ee1615134bcda266e2 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

@@ -25,7 +25,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o ma
2525

2626
# Use distroless as minimal base image to package the manager binary
2727
# Refer to https://github.com/GoogleContainerTools/distroless for more details
28-
FROM gcr.io/distroless/static:nonroot@sha256:6cd937e9155bdfd805d1b94e037f9d6a899603306030936a3b11680af0c2ed58
28+
FROM gcr.io/distroless/static:nonroot@sha256:6ec5aa99dc335666e79dc64e4a6c8b89c33a543a1967f20d360922a80dd21f02
2929
WORKDIR /
3030
COPY --from=builder /workspace/manager .
3131
USER 65532:65532

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
####
44

55
# renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools versioning=semver
6-
CONTROLLER_TOOLS_VERSION := 0.16.5
6+
CONTROLLER_TOOLS_VERSION := 0.17.1
77

88
# renovate: datasource=github-releases depName=kubernetes-sigs/kustomize versioning=semver
99
KUSTOMIZE_VERSION := 5.5.0
1010

1111
# renovate: datasource=github-releases depName=golangci/golangci-lint versioning=semver
12-
GOLANGCI_LINT_VERSION := 1.62.2
12+
GOLANGCI_LINT_VERSION := 1.63.4
1313

1414
# renovate: datasource=github-releases depName=kubernetes-sigs/kind versioning=semver
15-
KIND_VERSION ?= 0.25.0
15+
KIND_VERSION ?= 0.26.0
1616

1717
# renovate: datasource=go depName=github.com/goph/licensei versioning=semver
1818
LICENSEI_VERSION = 0.9.0
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: opentelemetry-operator
33
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
4-
version: 0.75.1
5-
digest: sha256:0c744fbe3936c4ce825d13bd36a26e93e59db534079ebf19f3681003bad3751c
6-
generated: "2024-12-16T10:04:49.161150849Z"
4+
version: 0.79.0
5+
digest: sha256:6a9d6bd22942b572971a7d80bb625c72c250a149c2b6142f533bce96d6905d76
6+
generated: "2025-01-29T21:20:39.8090993Z"

charts/telemetry-controller/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ sources:
1313
- https://github.com/kube-logging/telemetry-controller
1414
dependencies:
1515
- name: opentelemetry-operator
16-
version: 0.75.1
16+
version: 0.79.0
1717
repository: https://open-telemetry.github.io/opentelemetry-helm-charts

charts/telemetry-controller/crds/telemetry.kube-logging.dev_bridges.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: bridges.telemetry.kube-logging.dev
88
spec:
99
group: telemetry.kube-logging.dev

charts/telemetry-controller/crds/telemetry.kube-logging.dev_collectors.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: collectors.telemetry.kube-logging.dev
88
spec:
99
group: telemetry.kube-logging.dev

charts/telemetry-controller/crds/telemetry.kube-logging.dev_outputs.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: outputs.telemetry.kube-logging.dev
88
spec:
99
group: telemetry.kube-logging.dev
@@ -530,9 +530,6 @@ spec:
530530
type: string
531531
headers:
532532
additionalProperties:
533-
description: |-
534-
String alias that is marshaled and printed in an opaque way.
535-
To recover the original value, cast it to a string.
536533
type: string
537534
description: |-
538535
Additional headers attached to each HTTP request sent by the client.

0 commit comments

Comments
 (0)