Skip to content

Commit 99584e7

Browse files
stefanprodanstefanprodan
committed
Build with Go 1.26
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
1 parent 16e901e commit 99584e7

11 files changed

Lines changed: 92 additions & 107 deletions

File tree

‎.github/workflows/backport.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ jobs:
77
permissions:
88
contents: write # for reading and creating branches.
99
pull-requests: write # for creating pull requests against release branches.
10-
uses: fluxcd/gha-workflows/.github/workflows/backport.yaml@v0.5.0
10+
uses: fluxcd/gha-workflows/.github/workflows/backport.yaml@v0.6.0
1111
secrets:
1212
github-token: ${{ secrets.BOT_GITHUB_TOKEN }}

‎.github/workflows/code-scan.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
permissions:
1010
contents: read # for reading the repository code.
1111
security-events: write # for uploading the CodeQL analysis results.
12-
uses: fluxcd/gha-workflows/.github/workflows/code-scan.yaml@v0.5.0
12+
uses: fluxcd/gha-workflows/.github/workflows/code-scan.yaml@v0.6.0
1313
secrets:
1414
github-token: ${{ secrets.GITHUB_TOKEN }}
1515
fossa-token: ${{ secrets.FOSSA_TOKEN }}

‎.github/workflows/e2e.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
contents: read # for reading the repository code.
1212
steps:
1313
- name: Test suite setup
14-
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.5.0
14+
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.6.0
1515
with:
16-
go-version: 1.25.x
16+
go-version: 1.26.x
1717
- name: Run tests
1818
run: make test
1919
- name: Check if working tree is dirty

‎.github/workflows/labels-sync.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
permissions:
1212
contents: read # for reading the labels file.
1313
issues: write # for creating and updating labels.
14-
uses: fluxcd/gha-workflows/.github/workflows/labels-sync.yaml@v0.5.0
14+
uses: fluxcd/gha-workflows/.github/workflows/labels-sync.yaml@v0.6.0
1515
secrets:
1616
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
contents: write # for creating the GitHub release.
1616
id-token: write # for creating OIDC tokens for signing.
1717
packages: write # for pushing and signing container images.
18-
uses: fluxcd/gha-workflows/.github/workflows/controller-release.yaml@v0.5.0
18+
uses: fluxcd/gha-workflows/.github/workflows/controller-release.yaml@v0.6.0
1919
with:
2020
controller: ${{ github.event.repository.name }}
2121
release-candidate-prefix: ${{ github.event.inputs.tag }}

‎Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG GO_VERSION=1.25
2-
ARG XX_VERSION=1.6.1
1+
ARG GO_VERSION=1.26
2+
ARG XX_VERSION=1.9.0
33

44
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
55

@@ -35,7 +35,7 @@ ARG TARGETARCH
3535
ENV CGO_ENABLED=0
3636
RUN xx-go build -trimpath -a -o source-watcher cmd/main.go
3737

38-
FROM alpine:3.22
38+
FROM alpine:3.23
3939

4040
ARG TARGETPLATFORM
4141
RUN apk --no-cache add ca-certificates \

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ dev-deploy: manifests
105105

106106
# Run go tidy to cleanup go.mod
107107
tidy:
108-
cd api; rm -f go.sum; go mod tidy -compat=1.25
109-
rm -f go.sum; go mod tidy -compat=1.25
108+
cd api; rm -f go.sum; go mod tidy -compat=1.26
109+
rm -f go.sum; go mod tidy -compat=1.26
110110

111111
# Run go fmt against code
112112
fmt:

‎api/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.25.0
55
require (
66
github.com/fluxcd/pkg/apis/meta v1.25.0
77
k8s.io/apimachinery v0.35.0
8-
sigs.k8s.io/controller-runtime v0.23.0
8+
sigs.k8s.io/controller-runtime v0.23.1
99
)
1010

1111
require (
@@ -17,14 +17,14 @@ require (
1717
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
1818
github.com/x448/float16 v0.8.4 // indirect
1919
go.yaml.in/yaml/v2 v2.4.3 // indirect
20-
golang.org/x/net v0.49.0 // indirect
21-
golang.org/x/text v0.33.0 // indirect
20+
golang.org/x/net v0.50.0 // indirect
21+
golang.org/x/text v0.34.0 // indirect
2222
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
2323
gopkg.in/inf.v0 v0.9.1 // indirect
2424
k8s.io/klog/v2 v2.130.1 // indirect
2525
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
2626
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
2727
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
2828
sigs.k8s.io/randfill v1.0.0 // indirect
29-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
29+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
3030
)

‎api/go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
5454
go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
5555
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
5656
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
57-
golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
58-
golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
59-
golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
60-
golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
57+
golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
58+
golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
59+
golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
60+
golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
6161
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
6262
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
63-
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
64-
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
65-
golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
66-
golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
67-
golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
68-
golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
63+
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
64+
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
65+
golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
66+
golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
67+
golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
68+
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
6969
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
7070
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
7171
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -83,13 +83,13 @@ k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZ
8383
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
8484
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=
8585
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
86-
sigs.k8s.io/controller-runtime v0.23.0 h1:Ubi7klJWiwEWqDY+odSVZiFA0aDSevOCXpa38yCSYu8=
87-
sigs.k8s.io/controller-runtime v0.23.0/go.mod h1:DBOIr9NsprUqCZ1ZhsuJ0wAnQSIxY/C6VjZbmLgw0j0=
86+
sigs.k8s.io/controller-runtime v0.23.1 h1:TjJSM80Nf43Mg21+RCy3J70aj/W6KyvDtOlpKf+PupE=
87+
sigs.k8s.io/controller-runtime v0.23.1/go.mod h1:B6COOxKptp+YaUT5q4l6LqUJTRpizbgf9KSRNdQGns0=
8888
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
8989
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
9090
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
9191
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
92-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco=
93-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
92+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 h1:2WOzJpHUBVrrkDjU4KBT8n5LDcj824eX0I5UKcgeRUs=
93+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
9494
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
9595
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

‎go.mod‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/fluxcd/source-watcher/v2
22

3-
go 1.25.0
3+
go 1.26.0
44

55
replace github.com/fluxcd/source-watcher/api/v2 => ./api
66

@@ -9,25 +9,25 @@ replace github.com/fluxcd/source-watcher/api/v2 => ./api
99
replace github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.1-0.20220411205349-bde1400a84be
1010

1111
require (
12-
github.com/bmatcuk/doublestar/v4 v4.9.2
13-
github.com/fluxcd/pkg/apis/event v0.22.0
12+
github.com/bmatcuk/doublestar/v4 v4.10.0
13+
github.com/fluxcd/pkg/apis/event v0.24.0
1414
github.com/fluxcd/pkg/apis/meta v1.25.0
15-
github.com/fluxcd/pkg/artifact v0.7.0
15+
github.com/fluxcd/pkg/artifact v0.8.0
1616
github.com/fluxcd/pkg/http/fetch v0.22.0
17-
github.com/fluxcd/pkg/runtime v0.96.0
17+
github.com/fluxcd/pkg/runtime v0.100.0
1818
github.com/fluxcd/pkg/tar v0.17.0
1919
github.com/fluxcd/pkg/testserver v0.13.0
2020
github.com/fluxcd/source-controller/api v1.7.2
2121
github.com/fluxcd/source-watcher/api/v2 v2.0.0
22-
github.com/onsi/gomega v1.39.0
22+
github.com/onsi/gomega v1.39.1
2323
github.com/opencontainers/go-digest v1.0.0
2424
github.com/spf13/pflag v1.0.10
25-
golang.org/x/mod v0.32.0
25+
golang.org/x/mod v0.33.0
2626
k8s.io/api v0.35.0
2727
k8s.io/apimachinery v0.35.0
2828
k8s.io/client-go v0.35.0
2929
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
30-
sigs.k8s.io/controller-runtime v0.23.0
30+
sigs.k8s.io/controller-runtime v0.23.1
3131
sigs.k8s.io/yaml v1.6.0
3232
)
3333

@@ -51,15 +51,12 @@ require (
5151
github.com/fluxcd/cli-utils v0.37.1-flux.1 // indirect
5252
github.com/fluxcd/pkg/apis/acl v0.9.0 // indirect
5353
github.com/fluxcd/pkg/lockedfile v0.7.0 // indirect
54-
github.com/fluxcd/pkg/oci v0.59.0 // indirect
55-
github.com/fluxcd/pkg/sourceignore v0.16.0 // indirect
54+
github.com/fluxcd/pkg/oci v0.60.0 // indirect
55+
github.com/fluxcd/pkg/sourceignore v0.17.0 // indirect
5656
github.com/fluxcd/pkg/version v0.12.0 // indirect
5757
github.com/fsnotify/fsnotify v1.9.0 // indirect
5858
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
5959
github.com/go-errors/errors v1.5.1 // indirect
60-
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
61-
github.com/go-git/go-billy/v5 v5.7.0 // indirect
62-
github.com/go-git/go-git/v5 v5.16.4 // indirect
6360
github.com/go-logr/logr v1.4.3 // indirect
6461
github.com/go-logr/zapr v1.3.0 // indirect
6562
github.com/go-openapi/jsonpointer v0.21.1 // indirect
@@ -74,10 +71,9 @@ require (
7471
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
7572
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
7673
github.com/inconshreveable/mousetrap v1.1.0 // indirect
77-
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
7874
github.com/josharian/intern v1.0.0 // indirect
7975
github.com/json-iterator/go v1.1.12 // indirect
80-
github.com/klauspost/compress v1.18.1 // indirect
76+
github.com/klauspost/compress v1.18.4 // indirect
8177
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
8278
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
8379
github.com/mailru/easyjson v0.9.0 // indirect
@@ -108,18 +104,17 @@ require (
108104
go.uber.org/zap v1.27.1 // indirect
109105
go.yaml.in/yaml/v2 v2.4.3 // indirect
110106
go.yaml.in/yaml/v3 v3.0.4 // indirect
111-
golang.org/x/net v0.49.0 // indirect
112-
golang.org/x/oauth2 v0.34.0 // indirect
107+
golang.org/x/net v0.50.0 // indirect
108+
golang.org/x/oauth2 v0.35.0 // indirect
113109
golang.org/x/sync v0.19.0 // indirect
114-
golang.org/x/sys v0.40.0 // indirect
115-
golang.org/x/term v0.39.0 // indirect
116-
golang.org/x/text v0.33.0 // indirect
110+
golang.org/x/sys v0.41.0 // indirect
111+
golang.org/x/term v0.40.0 // indirect
112+
golang.org/x/text v0.34.0 // indirect
117113
golang.org/x/time v0.14.0 // indirect
118114
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
119115
google.golang.org/protobuf v1.36.8 // indirect
120116
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
121117
gopkg.in/inf.v0 v0.9.1 // indirect
122-
gopkg.in/warnings.v0 v0.1.2 // indirect
123118
gopkg.in/yaml.v3 v3.0.1 // indirect
124119
k8s.io/apiextensions-apiserver v0.35.0 // indirect
125120
k8s.io/cli-runtime v0.35.0 // indirect
@@ -128,8 +123,8 @@ require (
128123
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
129124
k8s.io/kubectl v0.35.0 // indirect
130125
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
131-
sigs.k8s.io/kustomize/api v0.21.0 // indirect
132-
sigs.k8s.io/kustomize/kyaml v0.21.0 // indirect
126+
sigs.k8s.io/kustomize/api v0.21.1 // indirect
127+
sigs.k8s.io/kustomize/kyaml v0.21.1 // indirect
133128
sigs.k8s.io/randfill v1.0.0 // indirect
134-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
129+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
135130
)

0 commit comments

Comments
 (0)