Skip to content

Commit d039e5e

Browse files
jschoonejschoone
authored
Merge branch 'main' into renovate/patch-golang-deps
Signed-off-by: Jan Schoone <[email protected]>
2 parents c02c083 + b75f420 commit d039e5e

Some content is hidden

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

47 files changed

+2559
-1871
lines changed

‎.builder-image-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.27
1+
1.1.27

‎.github/actions/setup-go/action.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runs:
44
using: "composite"
55
steps:
66
- name: Install go
7-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
7+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
88
with:
99
go-version: "1.22"
1010
go-version-file: "go.mod"
@@ -16,14 +16,14 @@ runs:
1616
echo "::set-output name=go-build::$(go env GOCACHE)"
1717
echo "::set-output name=go-mod::$(go env GOMODCACHE)"
1818
- name: Go Mod Cache
19-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
19+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
2020
with:
2121
path: ${{ steps.go-cache-paths.outputs.go-mod }}
2222
key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
2323
restore-keys: |
2424
${{ runner.os }}-go-mod-
2525
- name: Go Build Cache
26-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
26+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
2727
with:
2828
path: ${{ steps.go-cache-paths.outputs.go-build }}
2929
key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
fetch-depth: 0
3434
- uses: ./.github/actions/setup-go
3535
- name: Set up QEMU
36-
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3
36+
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3
3737
- name: Set up Docker Buildx
38-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3
38+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3
3939

4040
- name: Generate metadata cso
4141
id: metacso
@@ -65,7 +65,7 @@ jobs:
6565
6666
# Load Golang cache build from GitHub
6767
- name: Load cso Golang cache build from GitHub
68-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
68+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
6969
id: cache
7070
with:
7171
path: /tmp/.cache/cso
@@ -83,7 +83,7 @@ jobs:
8383
8484
# Import GitHub's cache build to docker cache
8585
- name: Copy cso Golang cache to docker cache
86-
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
86+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
8787
with:
8888
provenance: false
8989
context: /tmp/.cache/cso
@@ -93,7 +93,7 @@ jobs:
9393
target: import-cache
9494

9595
- name: Build and push cso image
96-
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6
96+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
9797
id: docker_build_release_cso
9898
with:
9999
provenance: false
@@ -120,7 +120,7 @@ jobs:
120120
121121
# Upload artifact digests
122122
- name: Upload artifact digests
123-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
123+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
124124
with:
125125
name: image-digest
126126
path: image-digest
@@ -129,7 +129,7 @@ jobs:
129129
# Store docker's golang's cache build locally only on the main branch
130130
- name: Store cso Golang cache build locally
131131
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
132-
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
132+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
133133
with:
134134
provenance: false
135135
context: .

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
fetch-depth: 0
2424
- uses: ./.github/actions/setup-go
2525
- name: Set up QEMU
26-
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3
26+
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3
2727
- name: Set up Docker Buildx
28-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3
28+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3
2929

3030
- name: Generate metadata cso
3131
id: metacso
@@ -61,7 +61,7 @@ jobs:
6161
echo 'EOF' >> $GITHUB_ENV
6262
6363
- name: Build and push cso image
64-
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6
64+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
6565
id: docker_build_release_cso
6666
with:
6767
provenance: false
@@ -106,7 +106,7 @@ jobs:
106106
107107
# Upload artifact digests
108108
- name: Upload artifact digests
109-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
109+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
110110
with:
111111
name: image-digest cso
112112
path: image-digest
@@ -155,7 +155,7 @@ jobs:
155155
make release-notes
156156
157157
- name: Release
158-
uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2
158+
uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2
159159
with:
160160
draft: true
161161
files: out/*

‎.github/workflows/schedule-cache-cleaner-cso-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
# Load Golang cache build from GitHub
1717
- name: Load cso Golang cache build from GitHub
18-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
18+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
1919
id: cache
2020
with:
2121
path: /tmp/.cache/cso

‎.github/workflows/schedule-update-bot.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3434

3535
- name: Generate Token
36-
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1
36+
uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1
3737
id: generate-token
3838
with:
3939
app-id: ${{ secrets.SCS_APP_ID }}
@@ -45,7 +45,7 @@ jobs:
4545
echo "LOG_LEVEL=${{ github.event.inputs.logLevel || env.LOG_LEVEL }}" >> "$GITHUB_ENV"
4646
4747
- name: Renovate
48-
uses: renovatebot/github-action@936628dfbff213ab2eb95033c5e123cfcaf09ebb # v41.0.5
48+
uses: renovatebot/github-action@d385c88822a237acaead89c462fa0aef7502748f # v41.0.11
4949
env:
5050
RENOVATE_HOST_RULES: '[{"hostType": "docker", "matchHost": "ghcr.io", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
5151
RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '[".*"]'

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ toolchain go1.23.5
77
require (
88
github.com/go-logr/logr v1.4.2
99
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572
10-
github.com/google/cel-go v0.22.1
10+
github.com/google/cel-go v0.23.1
1111
github.com/google/go-github/v52 v52.0.0
1212
github.com/onsi/ginkgo/v2 v2.22.2
1313
github.com/onsi/gomega v1.36.2
1414
github.com/stretchr/testify v1.10.0
1515
golang.org/x/mod v0.22.0
16-
golang.org/x/oauth2 v0.24.0
16+
golang.org/x/oauth2 v0.25.0
1717
k8s.io/api v0.30.3
1818
k8s.io/apimachinery v0.30.3
1919
k8s.io/cli-runtime v0.30.3
@@ -22,12 +22,12 @@ require (
2222
oras.land/oras-go/v2 v2.5.0
2323
sigs.k8s.io/cluster-api v1.8.1
2424
sigs.k8s.io/cluster-api/test v1.8.1
25-
sigs.k8s.io/controller-runtime v0.18.7
26-
sigs.k8s.io/kind v0.25.0
25+
sigs.k8s.io/controller-runtime v0.18.6
26+
sigs.k8s.io/kind v0.26.0
2727
)
2828

2929
require (
30-
cel.dev/expr v0.18.0 // indirect
30+
cel.dev/expr v0.19.1 // indirect
3131
github.com/BurntSushi/toml v1.4.0 // indirect
3232
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3333
github.com/alessio/shellescape v1.4.2 // indirect

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
cel.dev/expr v0.18.0 h1:CJ6drgk+Hf96lkLikr4rFf19WrU0BOWEihyZnI2TAzo=
2-
cel.dev/expr v0.18.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
1+
cel.dev/expr v0.19.1 h1:NciYrtDRIR0lNCnH1LFJegdjspNx9fI59O7TWcua/W4=
2+
cel.dev/expr v0.19.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
33
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
44
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
55
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
@@ -98,8 +98,8 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
9898
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
9999
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
100100
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
101-
github.com/google/cel-go v0.22.1 h1:AfVXx3chM2qwoSbM7Da8g8hX8OVSkBFwX+rz2+PcK40=
102-
github.com/google/cel-go v0.22.1/go.mod h1:BuznPXXfQDpXKWQ9sPW3TzlAJN5zzFe+i9tIs0yC4s8=
101+
github.com/google/cel-go v0.23.1 h1:91ThhEZlBcE5rB2adBVXqvDoqdL8BG2oyhd0bK1I/r4=
102+
github.com/google/cel-go v0.23.1/go.mod h1:52Pb6QsDbC5kvgxvZhiL9QX1oZEkcUF/ZqaPx1J5Wwo=
103103
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
104104
github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
105105
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -275,8 +275,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
275275
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
276276
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
277277
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
278-
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
279-
golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
278+
golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
279+
golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
280280
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
281281
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
282282
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -396,8 +396,8 @@ sigs.k8s.io/controller-runtime v0.18.7 h1:WDnx8LTRY8Fn1j/7B+S/R9MeDjWNAzpDBoaSvM
396396
sigs.k8s.io/controller-runtime v0.18.7/go.mod h1:L9r3fUZhID7Q9eK9mseNskpaTg2n11f/tlb8odyzJ4Y=
397397
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
398398
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
399-
sigs.k8s.io/kind v0.25.0 h1:ugUvgesHKKA0yKmD6QtYTiEev+kPUpGxdTPbMGf8VTU=
400-
sigs.k8s.io/kind v0.25.0/go.mod h1:t7ueEpzPYJvHA8aeLtI52rtFftNgUYUaCwvxjk7phfw=
399+
sigs.k8s.io/kind v0.26.0 h1:8fS6I0Q5WGlmLprSpH0DarlOSdcsv0txnwc93J2BP7M=
400+
sigs.k8s.io/kind v0.26.0/go.mod h1:t7ueEpzPYJvHA8aeLtI52rtFftNgUYUaCwvxjk7phfw=
401401
sigs.k8s.io/kustomize/api v0.17.2 h1:E7/Fjk7V5fboiuijoZHgs4aHuexi5Y2loXlVOAVAG5g=
402402
sigs.k8s.io/kustomize/api v0.17.2/go.mod h1:UWTz9Ct+MvoeQsHcJ5e+vziRRkwimm3HytpZgIYqye0=
403403
sigs.k8s.io/kustomize/kyaml v0.17.1 h1:TnxYQxFXzbmNG6gOINgGWQt09GghzgTP6mIurOgrLCQ=

‎images/builder/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# If you make changes to this Dockerfile run `make builder-image-push`.
1818

1919
# Install Lychee
20-
FROM docker.io/library/alpine:3.20.3 AS lychee
20+
FROM docker.io/library/alpine:3.21.2 AS lychee
2121
# update: datasource=github-tags depName=lycheeverse/lychee versioning=semver
2222
ENV LYCHEE_VERSION="v0.15.1"
2323
# hadolint ignore=DL3018
@@ -34,7 +34,7 @@ FROM cgr.dev/chainguard/wolfi-base:latest AS wolfi
3434
# update: datasource=github-tags depName=kubernetes-sigs/cluster-api
3535
ARG CLUSTERCTL_VERSION="v1.8.1"
3636
# update: datasource=github-tags depName=helm/helm
37-
ENV HELM_VERSION="v3.16.3"
37+
ENV HELM_VERSION="v3.17.0"
3838
# update: datasource=github-tags depName=kubernetes-sigs/kind
3939
ARG KIND_VERSION="v0.24.0"
4040
# update: datasource=github-tags depName=kubernetes/kubernetes
@@ -58,9 +58,9 @@ RUN apk add -U --no-cache \
5858
trivy=~${TRIVY_VERSION#v}
5959

6060
# Install Golang CI Lint
61-
FROM docker.io/library/alpine:3.20.3 AS golangci
61+
FROM docker.io/library/alpine:3.21.2 AS golangci
6262
# update: datasource=github-tags depName=golangci/golangci-lint versioning=semver
63-
ENV GOLANGCI_VERSION="v1.62.2"
63+
ENV GOLANGCI_VERSION="v1.63.4"
6464
WORKDIR /
6565
# hadolint ignore=DL3018,DL4006
6666
RUN apk add --no-cache curl && \
@@ -70,12 +70,12 @@ RUN apk add --no-cache curl && \
7070
FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:3c206a451cec6d486367e758645269fd7d696c5ccb6ff59d8b03b0e45268a199 AS hadolint
7171

7272
# Install Trivy
73-
FROM docker.io/aquasec/trivy:0.57.1 AS trivy
73+
FROM docker.io/aquasec/trivy:0.58.2 AS trivy
7474

7575
############################
7676
# CSO Build Image Base #
7777
############################
78-
FROM docker.io/library/golang:1.23.3-bullseye
78+
FROM docker.io/library/golang:1.23.5-bullseye
7979

8080
# update: datasource=github-tags depName=adrienverge/yamllint versioning=semver
8181
ENV YAMLLINT_VERSION="v1.35.1"

‎vendor/github.com/google/cel-go/cel/env.go‎

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)