Skip to content

Commit

Permalink
Merge pull request #146 from kube-logging/renovate/all
Browse files Browse the repository at this point in the history
chore(deps): update all dependencies
  • Loading branch information
csatib02 authored Mar 10, 2025
2 parents 7245b27 + 9e773cd commit ace72fb
Show file tree
Hide file tree
Showing 9 changed files with 234 additions and 240 deletions.
45 changes: 16 additions & 29 deletions .github/workflows/artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,22 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Set up QEMU
uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3.4.0
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0

- name: Set up Cosign
uses: sigstore/cosign-installer@c56c2d3e59e4281cc41dea2217323ba5694b171e # v3.8.0
uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
if: ${{ inputs.publish }}

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

- name: Gather build metadata
id: meta
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
with:
images: ${{ steps.image-name.outputs.value }}
flavor: |
Expand All @@ -91,37 +92,27 @@ jobs:
org.opencontainers.image.authors=Kube logging authors
org.opencontainers.image.documentation=https://todo.docs
# Multiple exporters are not supported yet
# See https://github.com/moby/buildkit/pull/2760
- name: Determine build output
uses: haya14busa/action-cond@94f77f7a80cd666cb3155084e428254fea4281fd # v1.2.1
id: build-output
with:
cond: ${{ inputs.publish }}
if_true: type=image,push=true
if_false: type=oci,dest=image.tar

- name: Login to GitHub Container Registry
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ github.token }}
if: inputs.publish
if: ${{ inputs.publish }}

- name: Build and push image
id: build
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
with:
context: .
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
outputs: ${{ steps.build-output.outputs.value }},name=target
# push: ${{ inputs.publish }}
outputs: |
type=image,push=${{ inputs.publish }},name=target,annotation-index.org.opencontainers.image.description=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.description'] }}
type=oci,dest=image.tar,name=target,annotation-index.org.opencontainers.image.description=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.description'] }}
- name: Sign image with GitHub OIDC Token
if: ${{ inputs.publish && github.repository_owner == 'kube-logging' }} # Check if the workflow is called by the same GitHub organization
Expand Down Expand Up @@ -153,10 +144,6 @@ jobs:
id: image-ref
run: echo "value=${{ steps.image-name.outputs.value }}@${{ steps.build.outputs.digest }}" >> "$GITHUB_OUTPUT"

- name: Fetch image
run: skopeo --insecure-policy copy docker://${{ steps.image-name.outputs.value }}:${{ steps.meta.outputs.version }} oci-archive:image.tar
if: inputs.publish

- name: Extract OCI tarball
run: |
mkdir -p image
Expand All @@ -173,14 +160,14 @@ jobs:
output: trivy-results.sarif

- name: Upload Trivy scan results as artifact
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: "[${{ github.job }}] Trivy scan results"
path: trivy-results.sarif
retention-days: 5

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
with:
sarif_file: trivy-results.sarif

Expand All @@ -207,7 +194,7 @@ jobs:
uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0

- name: Set up Cosign
uses: sigstore/cosign-installer@c56c2d3e59e4281cc41dea2217323ba5694b171e # v3.8.0
uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1

- name: Set chart name
id: chart-name
Expand Down Expand Up @@ -242,7 +229,7 @@ jobs:
echo "package=${{ steps.chart-name.outputs.value }}-${{ steps.version.outputs.value }}.tgz" >> "$GITHUB_OUTPUT"
- name: Upload chart as artifact
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: "[${{ github.job }}] Helm chart"
path: ${{ steps.build.outputs.package }}
Expand Down Expand Up @@ -292,13 +279,13 @@ jobs:
output: trivy-results.sarif

- name: Upload Trivy scan results as artifact
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: "[${{ github.job }}] Trivy scan results"
path: trivy-results.sarif
retention-days: 5

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
with:
sarif_file: trivy-results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
go-version-file: '.go-version'

- name: Cache licenses
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
with:
key: licensei-v2-${{ hashFiles('go.sum') }}
path: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0

- name: Build and export
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
with:
context: .
tags: controller:local
Expand All @@ -31,7 +31,7 @@ jobs:
outputs: type=docker,dest=/tmp/controller.tar

- name: Upload artifact
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: controller
path: /tmp/controller.tar
Expand All @@ -47,10 +47,10 @@ jobs:

steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0

- name: Download artifact
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
with:
name: controller
path: /tmp
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
- name: Archive Test Results
if: always()
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: script-e2e-test-cluster-logs-${{ matrix.kube }}
path: build/_test
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.24.0-alpine3.20@sha256:79f7ffeff943577c82791c9e125ab806f133ae3d8af8ad8916704922ddcc9dd8 AS builder
FROM --platform=$BUILDPLATFORM golang:1.24.1-alpine3.20@sha256:3d9132b88a6317b846b55aa8e821821301906fe799932ecbc4f814468c6977a5 AS builder

RUN apk add --update --no-cache ca-certificates make git curl

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CONTROLLER_TOOLS_VERSION := 0.17.2
KUSTOMIZE_VERSION := 5.5.0

# renovate: datasource=github-releases depName=golangci/golangci-lint versioning=semver
GOLANGCI_LINT_VERSION := 1.64.5
GOLANGCI_LINT_VERSION := 1.64.6

# renovate: datasource=github-releases depName=kubernetes-sigs/kind versioning=semver
KIND_VERSION ?= 0.26.0
Expand Down
6 changes: 3 additions & 3 deletions charts/telemetry-controller/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: opentelemetry-operator
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
version: 0.80.2
digest: sha256:4105d6fc0ee7d95d48a6e790020c83cad0cc068b02b5939f3ad9faca8886c72b
generated: "2025-02-19T10:01:38.686316953Z"
version: 0.82.0
digest: sha256:91dd3295164ed937e8c11889c48095de9d2cf7f5f7a10d4cd6ed9f2469c8045c
generated: "2025-03-08T10:43:34.740938065Z"
2 changes: 1 addition & 1 deletion charts/telemetry-controller/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ sources:
- https://github.com/kube-logging/telemetry-controller
dependencies:
- name: opentelemetry-operator
version: 0.80.2
version: 0.82.0
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
117 changes: 59 additions & 58 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@ require (
emperror.dev/errors v0.8.1
github.com/cisco-open/operator-tools v0.37.0
github.com/go-logr/logr v1.4.2
github.com/google/go-cmp v0.6.0
github.com/google/go-cmp v0.7.0
github.com/hashicorp/go-multierror v1.1.1
github.com/mitchellh/mapstructure v1.5.0
github.com/onsi/ginkgo/v2 v2.22.2
github.com/onsi/ginkgo/v2 v2.23.0
github.com/onsi/gomega v1.36.2
github.com/open-telemetry/opentelemetry-operator v0.118.0
github.com/prometheus/client_golang v1.21.0
github.com/open-telemetry/opentelemetry-operator v0.120.0
github.com/prometheus/client_golang v1.21.1
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component v0.120.0
go.opentelemetry.io/collector/config/configauth v0.120.0
go.opentelemetry.io/collector/config/configcompression v1.26.0
go.opentelemetry.io/collector/config/configopaque v1.26.0
go.opentelemetry.io/collector/config/configtelemetry v0.120.0
go.opentelemetry.io/collector/otelcol v0.120.0
go.opentelemetry.io/collector/pipeline v0.120.0
go.opentelemetry.io/collector/service v0.120.0
go.opentelemetry.io/collector/component v1.27.0
go.opentelemetry.io/collector/config/configauth v0.121.0
go.opentelemetry.io/collector/config/configcompression v1.27.0
go.opentelemetry.io/collector/config/configopaque v1.27.0
go.opentelemetry.io/collector/config/configtelemetry v0.121.0
go.opentelemetry.io/collector/otelcol v0.121.0
go.opentelemetry.io/collector/pipeline v0.121.0
go.opentelemetry.io/collector/service v0.121.0
go.uber.org/zap v1.27.0
k8s.io/api v0.32.2
k8s.io/apimachinery v0.32.2
k8s.io/client-go v0.32.2
sigs.k8s.io/controller-runtime v0.20.2
sigs.k8s.io/controller-runtime v0.20.3
sigs.k8s.io/yaml v1.4.0
)

Expand Down Expand Up @@ -63,7 +63,7 @@ require (
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/cel-go v0.22.0 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/google/uuid v1.6.0 // indirect
Expand All @@ -74,12 +74,12 @@ require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/klauspost/compress v1.18.0 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
github.com/knadh/koanf/v2 v2.1.2 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mailru/easyjson v0.9.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
Expand All @@ -96,47 +96,48 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
github.com/shirou/gopsutil/v4 v4.25.1 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/cobra v1.9.1 // indirect
github.com/spf13/pflag v1.0.6 // indirect
github.com/stoewer/go-strcase v1.3.0 // indirect
github.com/tklauser/go-sysconf v0.3.13 // indirect
github.com/tklauser/numcpus v0.7.0 // indirect
github.com/wayneashleyberry/terminal-dimensions v1.1.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.120.0 // indirect
go.opentelemetry.io/collector/component/componenttest v0.120.0 // indirect
go.opentelemetry.io/collector/confmap v1.26.0 // indirect
go.opentelemetry.io/collector/confmap/xconfmap v0.120.0 // indirect
go.opentelemetry.io/collector/connector v0.120.0 // indirect
go.opentelemetry.io/collector/connector/connectortest v0.120.0 // indirect
go.opentelemetry.io/collector/connector/xconnector v0.120.0 // indirect
go.opentelemetry.io/collector/consumer v1.26.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.120.0 // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.120.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.120.0 // indirect
go.opentelemetry.io/collector/exporter v0.120.0 // indirect
go.opentelemetry.io/collector/exporter/exportertest v0.120.0 // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.120.0 // indirect
go.opentelemetry.io/collector/extension v0.120.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.120.0 // indirect
go.opentelemetry.io/collector/extension/extensioncapabilities v0.120.0 // indirect
go.opentelemetry.io/collector/extension/extensiontest v0.120.0 // indirect
go.opentelemetry.io/collector/featuregate v1.26.0 // indirect
go.opentelemetry.io/collector/internal/fanoutconsumer v0.120.0 // indirect
go.opentelemetry.io/collector/internal/telemetry v0.120.0 // indirect
go.opentelemetry.io/collector/pdata v1.26.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.120.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.120.0 // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.120.0 // indirect
go.opentelemetry.io/collector/processor v0.120.0 // indirect
go.opentelemetry.io/collector/processor/processortest v0.120.0 // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.120.0 // indirect
go.opentelemetry.io/collector/receiver v0.120.0 // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.120.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.120.0 // indirect
go.opentelemetry.io/collector/semconv v0.120.0 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.121.0 // indirect
go.opentelemetry.io/collector/component/componenttest v0.121.0 // indirect
go.opentelemetry.io/collector/confmap v1.27.0 // indirect
go.opentelemetry.io/collector/confmap/xconfmap v0.121.0 // indirect
go.opentelemetry.io/collector/connector v0.121.0 // indirect
go.opentelemetry.io/collector/connector/connectortest v0.121.0 // indirect
go.opentelemetry.io/collector/connector/xconnector v0.121.0 // indirect
go.opentelemetry.io/collector/consumer v1.27.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.121.0 // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.121.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.121.0 // indirect
go.opentelemetry.io/collector/exporter v0.121.0 // indirect
go.opentelemetry.io/collector/exporter/exportertest v0.121.0 // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.121.0 // indirect
go.opentelemetry.io/collector/extension v1.27.0 // indirect
go.opentelemetry.io/collector/extension/extensionauth v0.121.0 // indirect
go.opentelemetry.io/collector/extension/extensioncapabilities v0.121.0 // indirect
go.opentelemetry.io/collector/extension/extensiontest v0.121.0 // indirect
go.opentelemetry.io/collector/featuregate v1.27.0 // indirect
go.opentelemetry.io/collector/internal/fanoutconsumer v0.121.0 // indirect
go.opentelemetry.io/collector/internal/telemetry v0.121.0 // indirect
go.opentelemetry.io/collector/pdata v1.27.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.121.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.121.0 // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.121.0 // indirect
go.opentelemetry.io/collector/processor v0.121.0 // indirect
go.opentelemetry.io/collector/processor/processortest v0.121.0 // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.121.0 // indirect
go.opentelemetry.io/collector/receiver v0.121.0 // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.121.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.121.0 // indirect
go.opentelemetry.io/collector/semconv v0.121.0 // indirect
go.opentelemetry.io/collector/service/hostcapabilities v0.121.0 // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.9.0 // indirect
go.opentelemetry.io/contrib/config v0.14.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
Expand Down Expand Up @@ -168,7 +169,7 @@ require (
golang.org/x/sys v0.30.0 // indirect
golang.org/x/term v0.29.0 // indirect
golang.org/x/text v0.22.0 // indirect
golang.org/x/time v0.7.0 // indirect
golang.org/x/time v0.8.0 // indirect
golang.org/x/tools v0.30.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
gonum.org/v1/gonum v0.15.1 // indirect
Expand All @@ -180,15 +181,15 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.32.1 // indirect
k8s.io/apiserver v0.32.1 // indirect
k8s.io/component-base v0.32.1 // indirect
k8s.io/apiextensions-apiserver v0.32.2 // indirect
k8s.io/apiserver v0.32.2 // indirect
k8s.io/component-base v0.32.2 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
)

// v1.51.0 is present in the go.mod file of the opentelemetry-operator as retracted
Expand Down
Loading

0 comments on commit ace72fb

Please sign in to comment.